Merge pull request #2289 from awsmobilesdk/models-update-iot202012154eQYkQTm970

iot Update models to latest

Author: richardmcclellan

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java

@@ -170,6 +170,14 @@ public class Action implements Serializable {
      */
     private HttpAction http;
 
+    /**
+     * <p>
+     * Send messages to an Amazon Managed Streaming for Apache Kafka (Amazon
+     * MSK) or self-managed Apache Kafka cluster.
+     * </p>
+     */
+    private KafkaAction kafka;
+
     /**
      * <p>
      * Write to a DynamoDB table.
@@ -1112,6 +1120,57 @@ public Action withHttp(HttpAction http) {
         return this;
     }
 
+    /**
+     * <p>
+     * Send messages to an Amazon Managed Streaming for Apache Kafka (Amazon
+     * MSK) or self-managed Apache Kafka cluster.
+     * </p>
+     *
+     * @return <p>
+     *         Send messages to an Amazon Managed Streaming for Apache Kafka
+     *         (Amazon MSK) or self-managed Apache Kafka cluster.
+     *         </p>
+     */
+    public KafkaAction getKafka() {
+        return kafka;
+    }
+
+    /**
+     * <p>
+     * Send messages to an Amazon Managed Streaming for Apache Kafka (Amazon
+     * MSK) or self-managed Apache Kafka cluster.
+     * </p>
+     *
+     * @param kafka <p>
+     *            Send messages to an Amazon Managed Streaming for Apache Kafka
+     *            (Amazon MSK) or self-managed Apache Kafka cluster.
+     *            </p>
+     */
+    public void setKafka(KafkaAction kafka) {
+        this.kafka = kafka;
+    }
+
+    /**
+     * <p>
+     * Send messages to an Amazon Managed Streaming for Apache Kafka (Amazon
+     * MSK) or self-managed Apache Kafka cluster.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     *
+     * @param kafka <p>
+     *            Send messages to an Amazon Managed Streaming for Apache Kafka
+     *            (Amazon MSK) or self-managed Apache Kafka cluster.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     */
+    public Action withKafka(KafkaAction kafka) {
+        this.kafka = kafka;
+        return this;
+    }
+
     /**
      * Returns a string representation of this object; useful for testing and
      * debugging.
@@ -1162,7 +1221,9 @@ public String toString() {
         if (getTimestream() != null)
             sb.append("timestream: " + getTimestream() + ",");
         if (getHttp() != null)
-            sb.append("http: " + getHttp());
+            sb.append("http: " + getHttp() + ",");
+        if (getKafka() != null)
+            sb.append("kafka: " + getKafka());
         sb.append("}");
         return sb.toString();
     }
@@ -1199,6 +1260,7 @@ public int hashCode() {
                 + ((getStepFunctions() == null) ? 0 : getStepFunctions().hashCode());
         hashCode = prime * hashCode + ((getTimestream() == null) ? 0 : getTimestream().hashCode());
         hashCode = prime * hashCode + ((getHttp() == null) ? 0 : getHttp().hashCode());
+        hashCode = prime * hashCode + ((getKafka() == null) ? 0 : getKafka().hashCode());
         return hashCode;
     }
 
@@ -1305,6 +1367,10 @@ public boolean equals(Object obj) {
             return false;
         if (other.getHttp() != null && other.getHttp().equals(this.getHttp()) == false)
             return false;
+        if (other.getKafka() == null ^ this.getKafka() == null)
+            return false;
+        if (other.getKafka() != null && other.getKafka().equals(this.getKafka()) == false)
+            return false;
         return true;
     }
 }

aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIotClient.java

@@ -47,7 +47,7 @@ public class ActiveViolation implements Serializable {
 
     /**
      * <p>
-     * The security profile whose behavior is in violation.
+     * The security profile with the behavior is in violation.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
@@ -58,19 +58,26 @@ public class ActiveViolation implements Serializable {
 
     /**
      * <p>
-     * The behavior which is being violated.
+     * The behavior that is being violated.
      * </p>
      */
     private Behavior behavior;
 
     /**
      * <p>
-     * The value of the metric (the measurement) which caused the most recent
+     * The value of the metric (the measurement) that caused the most recent
      * violation.
      * </p>
      */
     private MetricValue lastViolationValue;
 
+    /**
+     * <p>
+     * The details of a violation event.
+     * </p>
+     */
+    private ViolationEventAdditionalInfo violationEventAdditionalInfo;
+
     /**
      * <p>
      * The time the most recent violation occurred.
@@ -198,15 +205,15 @@ public ActiveViolation withThingName(String thingName) {
 
     /**
      * <p>
-     * The security profile whose behavior is in violation.
+     * The security profile with the behavior is in violation.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 128<br/>
      * <b>Pattern: </b>[a-zA-Z0-9:_-]+<br/>
      *
      * @return <p>
-     *         The security profile whose behavior is in violation.
+     *         The security profile with the behavior is in violation.
      *         </p>
      */
     public String getSecurityProfileName() {
@@ -215,15 +222,15 @@ public String getSecurityProfileName() {
 
     /**
      * <p>
-     * The security profile whose behavior is in violation.
+     * The security profile with the behavior is in violation.
      * </p>
      * <p>
      * <b>Constraints:</b><br/>
      * <b>Length: </b>1 - 128<br/>
      * <b>Pattern: </b>[a-zA-Z0-9:_-]+<br/>
      *
      * @param securityProfileName <p>
-     *            The security profile whose behavior is in violation.
+     *            The security profile with the behavior is in violation.
      *            </p>
      */
     public void setSecurityProfileName(String securityProfileName) {
@@ -232,7 +239,7 @@ public void setSecurityProfileName(String securityProfileName) {
 
     /**
      * <p>
-     * The security profile whose behavior is in violation.
+     * The security profile with the behavior is in violation.
      * </p>
      * <p>
      * Returns a reference to this object so that method calls can be chained
@@ -243,7 +250,7 @@ public void setSecurityProfileName(String securityProfileName) {
      * <b>Pattern: </b>[a-zA-Z0-9:_-]+<br/>
      *
      * @param securityProfileName <p>
-     *            The security profile whose behavior is in violation.
+     *            The security profile with the behavior is in violation.
      *            </p>
      * @return A reference to this updated object so that method calls can be
      *         chained together.
@@ -255,11 +262,11 @@ public ActiveViolation withSecurityProfileName(String securityProfileName) {
 
     /**
      * <p>
-     * The behavior which is being violated.
+     * The behavior that is being violated.
      * </p>
      *
      * @return <p>
-     *         The behavior which is being violated.
+     *         The behavior that is being violated.
      *         </p>
      */
     public Behavior getBehavior() {
@@ -268,11 +275,11 @@ public Behavior getBehavior() {
 
     /**
      * <p>
-     * The behavior which is being violated.
+     * The behavior that is being violated.
      * </p>
      *
      * @param behavior <p>
-     *            The behavior which is being violated.
+     *            The behavior that is being violated.
      *            </p>
      */
     public void setBehavior(Behavior behavior) {
@@ -281,14 +288,14 @@ public void setBehavior(Behavior behavior) {
 
     /**
      * <p>
-     * The behavior which is being violated.
+     * The behavior that is being violated.
      * </p>
      * <p>
      * Returns a reference to this object so that method calls can be chained
      * together.
      *
      * @param behavior <p>
-     *            The behavior which is being violated.
+     *            The behavior that is being violated.
      *            </p>
      * @return A reference to this updated object so that method calls can be
      *         chained together.
@@ -300,12 +307,12 @@ public ActiveViolation withBehavior(Behavior behavior) {
 
     /**
      * <p>
-     * The value of the metric (the measurement) which caused the most recent
+     * The value of the metric (the measurement) that caused the most recent
      * violation.
      * </p>
      *
      * @return <p>
-     *         The value of the metric (the measurement) which caused the most
+     *         The value of the metric (the measurement) that caused the most
      *         recent violation.
      *         </p>
      */
@@ -315,13 +322,13 @@ public MetricValue getLastViolationValue() {
 
     /**
      * <p>
-     * The value of the metric (the measurement) which caused the most recent
+     * The value of the metric (the measurement) that caused the most recent
      * violation.
      * </p>
      *
      * @param lastViolationValue <p>
-     *            The value of the metric (the measurement) which caused the
-     *            most recent violation.
+     *            The value of the metric (the measurement) that caused the most
+     *            recent violation.
      *            </p>
      */
     public void setLastViolationValue(MetricValue lastViolationValue) {
@@ -330,16 +337,16 @@ public void setLastViolationValue(MetricValue lastViolationValue) {
 
     /**
      * <p>
-     * The value of the metric (the measurement) which caused the most recent
+     * The value of the metric (the measurement) that caused the most recent
      * violation.
      * </p>
      * <p>
      * Returns a reference to this object so that method calls can be chained
      * together.
      *
      * @param lastViolationValue <p>
-     *            The value of the metric (the measurement) which caused the
-     *            most recent violation.
+     *            The value of the metric (the measurement) that caused the most
+     *            recent violation.
      *            </p>
      * @return A reference to this updated object so that method calls can be
      *         chained together.
@@ -349,6 +356,53 @@ public ActiveViolation withLastViolationValue(MetricValue lastViolationValue) {
         return this;
     }
 
+    /**
+     * <p>
+     * The details of a violation event.
+     * </p>
+     *
+     * @return <p>
+     *         The details of a violation event.
+     *         </p>
+     */
+    public ViolationEventAdditionalInfo getViolationEventAdditionalInfo() {
+        return violationEventAdditionalInfo;
+    }
+
+    /**
+     * <p>
+     * The details of a violation event.
+     * </p>
+     *
+     * @param violationEventAdditionalInfo <p>
+     *            The details of a violation event.
+     *            </p>
+     */
+    public void setViolationEventAdditionalInfo(
+            ViolationEventAdditionalInfo violationEventAdditionalInfo) {
+        this.violationEventAdditionalInfo = violationEventAdditionalInfo;
+    }
+
+    /**
+     * <p>
+     * The details of a violation event.
+     * </p>
+     * <p>
+     * Returns a reference to this object so that method calls can be chained
+     * together.
+     *
+     * @param violationEventAdditionalInfo <p>
+     *            The details of a violation event.
+     *            </p>
+     * @return A reference to this updated object so that method calls can be
+     *         chained together.
+     */
+    public ActiveViolation withViolationEventAdditionalInfo(
+            ViolationEventAdditionalInfo violationEventAdditionalInfo) {
+        this.violationEventAdditionalInfo = violationEventAdditionalInfo;
+        return this;
+    }
+
     /**
      * <p>
      * The time the most recent violation occurred.
@@ -460,6 +514,8 @@ public String toString() {
             sb.append("behavior: " + getBehavior() + ",");
         if (getLastViolationValue() != null)
             sb.append("lastViolationValue: " + getLastViolationValue() + ",");
+        if (getViolationEventAdditionalInfo() != null)
+            sb.append("violationEventAdditionalInfo: " + getViolationEventAdditionalInfo() + ",");
         if (getLastViolationTime() != null)
             sb.append("lastViolationTime: " + getLastViolationTime() + ",");
         if (getViolationStartTime() != null)
@@ -481,6 +537,10 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getBehavior() == null) ? 0 : getBehavior().hashCode());
         hashCode = prime * hashCode
                 + ((getLastViolationValue() == null) ? 0 : getLastViolationValue().hashCode());
+        hashCode = prime
+                * hashCode
+                + ((getViolationEventAdditionalInfo() == null) ? 0
+                        : getViolationEventAdditionalInfo().hashCode());
         hashCode = prime * hashCode
                 + ((getLastViolationTime() == null) ? 0 : getLastViolationTime().hashCode());
         hashCode = prime * hashCode
@@ -523,6 +583,13 @@ public boolean equals(Object obj) {
         if (other.getLastViolationValue() != null
                 && other.getLastViolationValue().equals(this.getLastViolationValue()) == false)
             return false;
+        if (other.getViolationEventAdditionalInfo() == null
+                ^ this.getViolationEventAdditionalInfo() == null)
+            return false;
+        if (other.getViolationEventAdditionalInfo() != null
+                && other.getViolationEventAdditionalInfo().equals(
+                        this.getViolationEventAdditionalInfo()) == false)
+            return false;
         if (other.getLastViolationTime() == null ^ this.getLastViolationTime() == null)
             return false;
         if (other.getLastViolationTime() != null