Merge pull request #75 from cdapio/feature/add-ssl-enabled-method

Added isSSLEnabled() method to NettyHttpService

Author: chtyim

src/main/java/io/cdap/http/NettyHttpService.java

@@ -214,6 +214,13 @@ public String getServiceName() {
     return serviceName;
   }
 
+  /**
+   * @return {@code true} if SSL is enabled for this service.
+   */
+  public boolean isSSLEnabled() {
+    return sslHandlerFactory != null;
+  }
+
   /**
    * Stops the HTTP service gracefully and release all resources. Same as calling {@link #stop(long, long, TimeUnit)}
    * with {@code 0} second quiet period and {@code 5} seconds timeout.

src/test/java/io/cdap/http/HttpServerTest.java

@@ -110,7 +110,6 @@ public void handle(Throwable t, HttpRequest request, HttpResponder responder) {
   };
 
   protected static NettyHttpService service;
-  protected static URI baseURI;
 
   protected static NettyHttpService.Builder createBaseNettyHttpServiceBuilder() {
     return NettyHttpService.builder("test")
@@ -132,8 +131,6 @@ public void modify(ChannelPipeline pipeline) {
   public static void setup() throws Exception {
     service = createBaseNettyHttpServiceBuilder().build();
     service.start();
-    int port = service.getBindAddress().getPort();
-    baseURI = URI.create(String.format("http://localhost:%d", port));
   }
 
   @AfterClass
@@ -165,11 +162,16 @@ public static void teardown() throws Exception {
     Assert.assertTrue("Some netty threads are still alive. Please see logs above", passed);
   }
 
+  protected final URI getBaseURI() {
+    return URI.create(String.format("%s://localhost:%d", service.isSSLEnabled() ? "https" : "http",
+                                    service.getBindAddress().getPort()));
+  }
+
   @Test
   public void testUploadDisconnect() throws Exception {
     File filePath = new File(tmpFolder.newFolder(), "test.txt");
 
-    URI uri = baseURI.resolve("/test/v1/stream/upload/file");
+    URI uri = getBaseURI().resolve("/test/v1/stream/upload/file");
     try (Socket socket = createRawSocket(uri.toURL())) {
 
       // Make a PUT call through socket, so that we can close it prematurely
@@ -378,7 +380,7 @@ public void testNonExistingMethods() throws IOException {
 
   @Test
   public void testKeepAlive() throws Exception {
-    final URL url = baseURI.resolve("/test/v1/tweets/1").toURL();
+    final URL url = getBaseURI().resolve("/test/v1/tweets/1").toURL();
 
     ThreadFactory threadFactory = new ThreadFactory() {
       private final AtomicInteger id = new AtomicInteger(0);
@@ -639,7 +641,7 @@ public void testDefaultQueryParam() throws IOException {
 
   @Test (timeout = 5000)
   public void testConnectionClose() throws Exception {
-    URL url = baseURI.resolve("/test/v1/connectionClose").toURL();
+    URL url = getBaseURI().resolve("/test/v1/connectionClose").toURL();
 
     // Fire http request using raw socket so that we can verify the connection get closed by the server
     // after the response.
@@ -832,7 +834,7 @@ protected Socket createRawSocket(URL url) throws IOException {
   }
 
   protected HttpURLConnection request(String path, HttpMethod method, boolean keepAlive) throws IOException {
-    URL url = baseURI.resolve(path).toURL();
+    URL url = getBaseURI().resolve(path).toURL();
     HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
     if (method == HttpMethod.POST || method == HttpMethod.PUT) {
       urlConn.setDoOutput(true);

src/test/java/io/cdap/http/HttpsServerTest.java

@@ -68,14 +68,11 @@ public static void setup() throws Exception {
     sslClientContext = new SSLClientContext();
     service = builder.build();
     service.start();
-
-    int port = service.getBindAddress().getPort();
-    baseURI = URI.create(String.format("https://localhost:%d", port));
   }
 
   @Override
   protected HttpURLConnection request(String path, HttpMethod method, boolean keepAlive) throws IOException {
-    URL url = baseURI.resolve(path).toURL();
+    URL url = getBaseURI().resolve(path).toURL();
     HttpsURLConnection.setDefaultSSLSocketFactory(sslClientContext.getClientContext().getSocketFactory());
     HostnameVerifier allHostsValid = new HostnameVerifier() {
       @Override

src/test/java/io/cdap/http/MutualAuthServerTest.java

@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.io.InputStream;
-import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 
@@ -52,8 +51,5 @@ public static void setup() throws Exception {
     setSslClientContext(new SSLClientContext(trustKeyStore, trustKeyStorePassword));
     service = builder.build();
     service.start();
-
-    int port = service.getBindAddress().getPort();
-    baseURI = URI.create(String.format("https://localhost:%d", port));
   }
 }