Style fix

grpc · Jul 8, 2024 · c284229 · c284229
1 parent ad0bfab
commit c284229
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/netty/src/test/java/io/grpc/netty/AdvancedTlsTest.java b/netty/src/test/java/io/grpc/netty/AdvancedTlsTest.java
@@ -381,7 +381,7 @@ public void onFileReloadingKeyManagerTrustManagerTest() throws Exception {
   public void onFileLoadingKeyManagerTrustManagerTest() throws Exception {
     // Create & start a server.
     AdvancedTlsX509KeyManager serverKeyManager = new AdvancedTlsX509KeyManager();
-    serverKeyManager.updateIdentityCredentialsFromFile(serverKey0File, serverCert0File);
+    serverKeyManager.updateIdentityCredentials(serverCert0File, serverKey0File);
     AdvancedTlsX509TrustManager serverTrustManager = AdvancedTlsX509TrustManager.newBuilder()
         .setVerification(Verification.CERTIFICATE_ONLY_VERIFICATION)
         .build();
@@ -393,7 +393,7 @@ public void onFileLoadingKeyManagerTrustManagerTest() throws Exception {
         new SimpleServiceImpl()).build().start();
     // Create a client to connect.
     AdvancedTlsX509KeyManager clientKeyManager = new AdvancedTlsX509KeyManager();
-    clientKeyManager.updateIdentityCredentialsFromFile(clientKey0File, clientCert0File);
+    clientKeyManager.updateIdentityCredentials(clientCert0File, clientKey0File);
     AdvancedTlsX509TrustManager clientTrustManager = AdvancedTlsX509TrustManager.newBuilder()
         .setVerification(Verification.CERTIFICATE_AND_HOST_NAME_VERIFICATION)
         .build();

diff --git a/util/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java b/util/src/main/java/io/grpc/util/AdvancedTlsX509KeyManager.java
@@ -162,7 +162,7 @@ public Closeable updateIdentityCredentials(File certFile, File keyFile,
   public Closeable updateIdentityCredentialsFromFile(File keyFile, File certFile,
       long period, TimeUnit unit, ScheduledExecutorService executor) throws IOException,
       GeneralSecurityException {
-    return updateIdentityCredentials(certFile, keyFile, period, unit, executor);
+    return this.updateIdentityCredentials(certFile, keyFile, period, unit, executor);
   }
 
   /**
@@ -173,7 +173,7 @@ public Closeable updateIdentityCredentialsFromFile(File keyFile, File certFile,
    */
   public void updateIdentityCredentials(File certFile, File keyFile) throws IOException,
       GeneralSecurityException {
-    UpdateResult newResult = readAndUpdate(keyFile, certFile, 0, 0);
+    UpdateResult newResult = readAndUpdate(certFile, keyFile, 0, 0);
     if (!newResult.success) {
       throw new GeneralSecurityException(
           "Files were unmodified before their initial update. Probably a bug.");
@@ -190,7 +190,7 @@ public void updateIdentityCredentials(File certFile, File keyFile) throws IOExce
   @Deprecated
   public void updateIdentityCredentialsFromFile(File keyFile, File certFile) throws IOException,
       GeneralSecurityException {
-    updateIdentityCredentials(certFile, keyFile);
+    this.updateIdentityCredentials(certFile, keyFile);
   }
 
   private static class KeyInfo {