From 5b3f859b2e34adaa8b0cfb991ba17d3d3a3a9290 Mon Sep 17 00:00:00 2001
From: David Oguns <38018552+DavidOgunsAWS@users.noreply.github.com>
Date: Fri, 26 Mar 2021 01:05:48 +0000
Subject: [PATCH] Updated Greengrass IPC client (#149)

---
 .../EventStreamRPCConnection.java             |  2 +-
 .../model/CreateDebugPasswordResponse.java    | 40 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
index b8b103d82..e79e81615 100644
--- a/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
+++ b/sdk/greengrass/event-stream-rpc-client/src/main/java/software/amazon/awssdk/eventstreamrpc/EventStreamRPCConnection.java
@@ -39,7 +39,7 @@ protected ConnectionState(Phase phase, ClientConnection connection) {
     private static final Logger LOGGER = Logger.getLogger(EventStreamRPCConnection.class.getName());
 
     private final EventStreamRPCConnectionConfig config;
-    private ConnectionState connectionState;
+    protected ConnectionState connectionState;
 
     public EventStreamRPCConnection(final EventStreamRPCConnectionConfig config) {
         this.config = config;
diff --git a/sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/model/CreateDebugPasswordResponse.java b/sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/model/CreateDebugPasswordResponse.java
index e08c1d632..d3b52323b 100644
--- a/sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/model/CreateDebugPasswordResponse.java
+++ b/sdk/greengrass/greengrass-client/src/event-stream-rpc-java/model/software/amazon/awssdk/aws/greengrass/model/CreateDebugPasswordResponse.java
@@ -41,10 +41,24 @@ public boolean isVoid() {
   )
   private Optional<Instant> passwordExpiration;
 
+  @Expose(
+      serialize = true,
+      deserialize = true
+  )
+  private Optional<String> certificateSHA256Hash;
+
+  @Expose(
+      serialize = true,
+      deserialize = true
+  )
+  private Optional<String> certificateSHA1Hash;
+
   public CreateDebugPasswordResponse() {
     this.password = Optional.empty();
     this.username = Optional.empty();
     this.passwordExpiration = Optional.empty();
+    this.certificateSHA256Hash = Optional.empty();
+    this.certificateSHA1Hash = Optional.empty();
   }
 
   public String getPassword() {
@@ -80,6 +94,28 @@ public void setPasswordExpiration(final Instant passwordExpiration) {
     this.passwordExpiration = Optional.ofNullable(passwordExpiration);
   }
 
+  public String getCertificateSHA256Hash() {
+    if (certificateSHA256Hash.isPresent()) {
+      return certificateSHA256Hash.get();
+    }
+    return null;
+  }
+
+  public void setCertificateSHA256Hash(final String certificateSHA256Hash) {
+    this.certificateSHA256Hash = Optional.ofNullable(certificateSHA256Hash);
+  }
+
+  public String getCertificateSHA1Hash() {
+    if (certificateSHA1Hash.isPresent()) {
+      return certificateSHA1Hash.get();
+    }
+    return null;
+  }
+
+  public void setCertificateSHA1Hash(final String certificateSHA1Hash) {
+    this.certificateSHA1Hash = Optional.ofNullable(certificateSHA1Hash);
+  }
+
   @Override
   public String getApplicationModelType() {
     return APPLICATION_MODEL_TYPE;
@@ -95,11 +131,13 @@ public boolean equals(Object rhs) {
     isEquals = isEquals && this.password.equals(other.password);
     isEquals = isEquals && this.username.equals(other.username);
     isEquals = isEquals && this.passwordExpiration.equals(other.passwordExpiration);
+    isEquals = isEquals && this.certificateSHA256Hash.equals(other.certificateSHA256Hash);
+    isEquals = isEquals && this.certificateSHA1Hash.equals(other.certificateSHA1Hash);
     return isEquals;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(password, username, passwordExpiration);
+    return Objects.hash(password, username, passwordExpiration, certificateSHA256Hash, certificateSHA1Hash);
   }
 }