Merge pull request #25 from indigo-dc/devel

Merge Devel

Author: alpegon

SUMMARY.md

@@ -0,0 +1,3 @@
+# Summary
+
+* [Manual im-java-api](README.md)

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>es.upv.i3m.grycap</groupId>
   <artifactId>im-java-api</artifactId>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <name>IM Java API</name>
   <description>Java client for the REST API of the IM</description>
 
@@ -19,6 +19,7 @@
     <java.version>7</java.version>
     <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
     <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
+    <mockserver-netty.version>3.10.4</mockserver-netty.version>
   </properties>
 
   <dependencies>
@@ -64,6 +65,13 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- mockserver -->
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <version>${mockserver-netty.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <profiles>

src/main/java/es/upv/i3m/grycap/im/lang/ImMessages.java

@@ -60,5 +60,7 @@ public final class ImMessages {
       "REST call with empty body content";
 
   private ImMessages() {
+    // It is not allowed to instantiate this class
+    throw new UnsupportedOperationException();
   }
 }

src/main/java/es/upv/i3m/grycap/im/rest/client/ssl/SslClient.java

@@ -28,16 +28,8 @@
 
 public class SslClient implements RestClient {
 
-  private SSLContext ctx;
-  private HostnameVerifier verifier;
-
-  public SslClient() {
-    this.ctx = SslConfigurator.newInstance(true).createSSLContext();
-  }
-
-  public SslClient(final SSLContext ctx) {
-    this.ctx = ctx;
-  }
+  private final SSLContext ctx;
+  private final HostnameVerifier verifier;
 
   public SslClient(final SSLContext ctx, final HostnameVerifier verifier) {
     this.ctx = ctx;
@@ -51,14 +43,16 @@ public SslClient(final SSLContext ctx, final HostnameVerifier verifier) {
    */
   @Override
   public Client createClient() {
-    if (ctx == null) {
+    SSLContext context = ctx;
+    if (context == null) {
       // Generate generic SSL context
-      ctx = SslConfigurator.newInstance(true).createSSLContext();
+      context = SslConfigurator.newInstance(true).createSSLContext();
     }
     return verifier == null
-        ? ClientBuilder.newBuilder().sslContext(ctx)
+        ? ClientBuilder.newBuilder().sslContext(context)
             .register(ImResponsesReader.class).build()
-        : ClientBuilder.newBuilder().sslContext(ctx).hostnameVerifier(verifier)
-            .register(ImResponsesReader.class).build();
+        : ClientBuilder.newBuilder().sslContext(context)
+            .hostnameVerifier(verifier).register(ImResponsesReader.class)
+            .build();
   }
 }

src/test/java/es/upv/i3m/grycap/im/lang/ImMessagesTest.java

@@ -0,0 +1,13 @@
+package es.upv.i3m.grycap.im.lang;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ImMessagesTest {
+
+  @Test
+  public void testMessages() {
+    Assert.assertEquals("REST call with empty body content",
+        ImMessages.INFO_EMPTY_BODY_CONTENT);
+  }
+}

src/test/java/es/upv/i3m/grycap/im/rest/client/ssl/SslClientTest.java

@@ -0,0 +1,43 @@
+package es.upv.i3m.grycap.im.rest.client.ssl;
+
+import es.upv.i3m.grycap.im.exceptions.ImClientException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockserver.integration.ClientAndServer;
+
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.core.MediaType;
+
+public class SslClientTest {
+
+  private ClientAndServer mockServer;
+  private final String target = "https://127.0.0.1:1080";
+
+  @Before
+  public void startServer() {
+    mockServer = ClientAndServer.startClientAndServer(1080);
+  }
+
+  @After
+  public void stopServer() {
+    mockServer.stop();
+  }
+
+  @Test(expected = ProcessingException.class)
+  public void testSslClient() throws ImClientException {
+    SslClient sslClient = new SslClient(null, null);
+    Client client = sslClient.createClient();
+    client.target(target).path("").request(MediaType.TEXT_PLAIN).get();
+  }
+
+  @Test
+  public void testSslTrustAllClients() throws ImClientException {
+    SslTrustAllClient sslClient = new SslTrustAllClient();
+    Client client = sslClient.createClient();
+    client.target(target).path("").request(MediaType.TEXT_PLAIN).get();
+  }
+
+}