Rename getSslSocketFactoryForCertainCert to be newSslSocketFactoryForCa.

Xudong Ma · Xudong Ma · commit 8f51457ee12c · 2015-06-25T14:46:05.000-07:00
Fixes grpc#560
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java
@@ -33,14 +33,12 @@
 
 import com.squareup.okhttp.ConnectionSpec;
 import com.squareup.okhttp.TlsVersion;
-
 import io.grpc.ChannelImpl;
 import io.grpc.testing.TestUtils;
 import io.grpc.transport.netty.GrpcSslContexts;
 import io.grpc.transport.netty.NettyServerBuilder;
 import io.grpc.transport.okhttp.OkHttpChannelBuilder;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
-
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -83,8 +81,8 @@ protected ChannelImpl createChannel() {
             .build())
         .overrideHostForAuthority(TestUtils.TEST_SERVER_HOST);
     try {
-      builder.sslSocketFactory(TestUtils.getSslSocketFactoryForCertainCert(
-              TestUtils.loadCert("ca.pem")));
+      builder.sslSocketFactory(TestUtils.newSslSocketFactoryForCa(
+          TestUtils.loadCert("ca.pem")));
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
diff --git a/testing/src/main/java/io/grpc/testing/TestUtils.java b/testing/src/main/java/io/grpc/testing/TestUtils.java
@@ -220,21 +220,29 @@ public static File loadCert(String name) throws IOException {
   }
 
   /**
-   * Returns a SSLSocketFactory which uses the certificate specified in certChainFile.
+   * Deprecated, please use {@link #newSslSocketFactoryForCa(File)} instead.
    */
+  @Deprecated
   public static SSLSocketFactory getSslSocketFactoryForCertainCert(File certChainFile)
           throws Exception {
+    return newSslSocketFactoryForCa(certChainFile);
+  }
+
+  /**
+   * Creates an SSLSocketFactory which contains {@code certChainFile} as its only root certificate.
+   */
+  public static SSLSocketFactory newSslSocketFactoryForCa(File certChainFile) throws Exception {
     KeyStore ks = KeyStore.getInstance("JKS");
     ks.load(null, null);
     CertificateFactory cf = CertificateFactory.getInstance("X.509");
     X509Certificate cert = (X509Certificate) cf.generateCertificate(
-            new BufferedInputStream(new FileInputStream(certChainFile)));
+        new BufferedInputStream(new FileInputStream(certChainFile)));
     X500Principal principal = cert.getSubjectX500Principal();
     ks.setCertificateEntry(principal.getName("RFC2253"), cert);
 
     // Set up trust manager factory to use our key store.
     TrustManagerFactory trustManagerFactory =
-            TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
     trustManagerFactory.init(ks);
     SSLContext context = SSLContext.getInstance("TLS");
     context.init(null, trustManagerFactory.getTrustManagers(), null);
