identity() --> getIdentity().

rmehta19 · rmehta19 · commit f94cc100cbaf · 2024-04-29T15:30:40.000-07:00
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/GetAuthenticationMechanisms.java b/s2a/src/main/java/io/grpc/s2a/handshaker/GetAuthenticationMechanisms.java
@@ -49,7 +49,7 @@ static Optional<AuthenticationMechanism> getAuthMechanism(Optional<S2AIdentity>
       authMechanism =
           Optional.of(
               AuthenticationMechanism.newBuilder()
-                  .setIdentity(localIdentity.get().identity())
+                  .setIdentity(localIdentity.get().getIdentity())
                   .setToken(manager.getToken(localIdentity.get()))
                   .build());
     }
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/S2AIdentity.java b/s2a/src/main/java/io/grpc/s2a/handshaker/S2AIdentity.java
@@ -56,7 +56,7 @@ private S2AIdentity(Identity identity) {
   }
 
   /** Returns the proto {@link Identity} representation of this identity instance. */
-  public Identity identity() {
+  public Identity getIdentity() {
     return identity;
   }
 }
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/S2APrivateKeyMethod.java b/s2a/src/main/java/io/grpc/s2a/handshaker/S2APrivateKeyMethod.java
@@ -119,7 +119,7 @@ public byte[] sign(SSLEngine engine, int signatureAlgorithm, byte[] input)
                     .setSignatureAlgorithm(s2aSignatureAlgorithm)
                     .setRawBytes(ByteString.copyFrom(input)));
     if (localIdentity.isPresent()) {
-      reqBuilder.setLocalIdentity(localIdentity.get().identity());
+      reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());
     }
 
     SessionResp resp = stub.send(reqBuilder.build());
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java b/s2a/src/main/java/io/grpc/s2a/handshaker/S2ATrustManager.java
@@ -114,7 +114,7 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC
     SessionReq.Builder reqBuilder =
         SessionReq.newBuilder().setValidatePeerCertificateChainReq(validatePeerCertificateChainReq);
     if (localIdentity.isPresent()) {
-      reqBuilder.setLocalIdentity(localIdentity.get().identity());
+      reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());
     }
 
     SessionResp resp;
diff --git a/s2a/src/main/java/io/grpc/s2a/handshaker/SslContextFactory.java b/s2a/src/main/java/io/grpc/s2a/handshaker/SslContextFactory.java
@@ -102,7 +102,7 @@ private static GetTlsConfigurationResp.ClientTlsConfiguration getClientTlsConfig
     checkNotNull(stub, "stub should not be null.");
     SessionReq.Builder reqBuilder = SessionReq.newBuilder();
     if (localIdentity.isPresent()) {
-      reqBuilder.setLocalIdentity(localIdentity.get().identity());
+      reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());
     }
     Optional<AuthenticationMechanism> authMechanism =
         GetAuthenticationMechanisms.getAuthMechanism(localIdentity);
diff --git a/s2a/src/test/java/io/grpc/s2a/handshaker/GetAuthenticationMechanismsTest.java b/s2a/src/test/java/io/grpc/s2a/handshaker/GetAuthenticationMechanismsTest.java
@@ -57,7 +57,7 @@ public void getAuthMechanisms_nonEmptyIdentity_success() {
         .isEqualTo(
             Optional.of(
                 AuthenticationMechanism.newBuilder()
-                    .setIdentity(fakeIdentity.identity())
+                    .setIdentity(fakeIdentity.getIdentity())
                     .setToken("access_token")
                     .build()));
   }
diff --git a/s2a/src/test/java/io/grpc/s2a/handshaker/S2APrivateKeyMethodTest.java b/s2a/src/test/java/io/grpc/s2a/handshaker/S2APrivateKeyMethodTest.java
@@ -163,7 +163,7 @@ public void fakelocalIdentity_signWithSha256_success() throws Exception {
         S2APrivateKeyMethod.create(mockStub, Optional.of(fakeIdentity));
     SessionReq req =
         SessionReq.newBuilder()
-            .setLocalIdentity(fakeIdentity.identity())
+            .setLocalIdentity(fakeIdentity.getIdentity())
             .setOffloadPrivateKeyOperationReq(
                 OffloadPrivateKeyOperationReq.newBuilder()
                     .setOperation(OffloadPrivateKeyOperationReq.PrivateKeyOperation.SIGN)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ static Optional<AuthenticationMechanism> getAuthMechanism(Optional<S2AIdentity>`
`49`	`49`	`authMechanism =`
`50`	`50`	`Optional.of(`
`51`	`51`	`AuthenticationMechanism.newBuilder()`
`52`		`- .setIdentity(localIdentity.get().identity())`
	`52`	`+ .setIdentity(localIdentity.get().getIdentity())`
`53`	`53`	`.setToken(manager.getToken(localIdentity.get()))`
`54`	`54`	`.build());`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private S2AIdentity(Identity identity) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/** Returns the proto {@link Identity} representation of this identity instance. */`
`59`		`- public Identity identity() {`
	`59`	`+ public Identity getIdentity() {`
`60`	`60`	`return identity;`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public byte[] sign(SSLEngine engine, int signatureAlgorithm, byte[] input)`
`119`	`119`	`.setSignatureAlgorithm(s2aSignatureAlgorithm)`
`120`	`120`	`.setRawBytes(ByteString.copyFrom(input)));`
`121`	`121`	`if (localIdentity.isPresent()) {`
`122`		`- reqBuilder.setLocalIdentity(localIdentity.get().identity());`
	`122`	`+ reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`SessionResp resp = stub.send(reqBuilder.build());`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC`
`114`	`114`	`SessionReq.Builder reqBuilder =`
`115`	`115`	`SessionReq.newBuilder().setValidatePeerCertificateChainReq(validatePeerCertificateChainReq);`
`116`	`116`	`if (localIdentity.isPresent()) {`
`117`		`- reqBuilder.setLocalIdentity(localIdentity.get().identity());`
	`117`	`+ reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`SessionResp resp;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private static GetTlsConfigurationResp.ClientTlsConfiguration getClientTlsConfig`
`102`	`102`	`checkNotNull(stub, "stub should not be null.");`
`103`	`103`	`SessionReq.Builder reqBuilder = SessionReq.newBuilder();`
`104`	`104`	`if (localIdentity.isPresent()) {`
`105`		`- reqBuilder.setLocalIdentity(localIdentity.get().identity());`
	`105`	`+ reqBuilder.setLocalIdentity(localIdentity.get().getIdentity());`
`106`	`106`	`}`
`107`	`107`	`Optional<AuthenticationMechanism> authMechanism =`
`108`	`108`	`GetAuthenticationMechanisms.getAuthMechanism(localIdentity);`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void getAuthMechanisms_nonEmptyIdentity_success() {`
`57`	`57`	`.isEqualTo(`
`58`	`58`	`Optional.of(`
`59`	`59`	`AuthenticationMechanism.newBuilder()`
`60`		`- .setIdentity(fakeIdentity.identity())`
	`60`	`+ .setIdentity(fakeIdentity.getIdentity())`
`61`	`61`	`.setToken("access_token")`
`62`	`62`	`.build()));`
`63`	`63`	`}`