Fix all compiler warnings in ocpp-json

Author: robert-s-ubi

ocpp-json/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java

@@ -29,12 +29,15 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.wss.WssSocketBuilder;
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.InetAddress;
 import java.net.Proxy;
+import java.net.Socket;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
+import javax.net.SocketFactory;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft;
 import org.java_websocket.exceptions.WebsocketNotConnectedException;
@@ -125,11 +128,32 @@ public void onError(Exception ex) {
             "wssSocketBuilder must be set to support " + WSS_SCHEME + " scheme");
       }
 
-      try {
-        client.setSocket(wssSocketBuilder.uri(resource).build());
-      } catch (IOException ex) {
-        logger.error("SSL socket creation failed", ex);
-      }
+      SocketFactory socketFactory =
+          new SocketFactory() {
+            public Socket createSocket() throws IOException {
+              return wssSocketBuilder.uri(resource).build();
+            }
+
+            public Socket createSocket(String host, int port) {
+              throw new UnsupportedOperationException();
+            }
+
+            public Socket createSocket(
+                String host, int port, InetAddress clientAddress, int clientPort) {
+              throw new UnsupportedOperationException();
+            }
+
+            public Socket createSocket(InetAddress address, int port) {
+              throw new UnsupportedOperationException();
+            }
+
+            public Socket createSocket(
+                InetAddress address, int port, InetAddress clientAddress, int clientPort) {
+              throw new UnsupportedOperationException();
+            }
+          };
+
+      client.setSocketFactory(socketFactory);
     }
 
     configure();

ocpp-json/src/test/java/eu/chargetime/ocpp/wss/test/BaseWssFactoryBuilderTest.java

@@ -1,13 +1,15 @@
 package eu.chargetime.ocpp.wss.test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import eu.chargetime.ocpp.wss.BaseWssFactoryBuilder;
 import eu.chargetime.ocpp.wss.CustomSSLWebSocketServerFactory;
+import java.util.Collections;
 import java.util.List;
 import javax.net.ssl.SSLContext;
 import org.hamcrest.CoreMatchers;
 import org.java_websocket.WebSocketServerFactory;
 import org.java_websocket.server.DefaultSSLWebSocketServerFactory;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -17,7 +19,7 @@ public class BaseWssFactoryBuilderTest {
   @Test
   public void builder_returnsBuilder() {
     BaseWssFactoryBuilder builder = BaseWssFactoryBuilder.builder();
-    Assert.assertThat(builder, CoreMatchers.is(CoreMatchers.any(BaseWssFactoryBuilder.class)));
+    assertThat(builder, CoreMatchers.is(CoreMatchers.any(BaseWssFactoryBuilder.class)));
   }
 
   @Test
@@ -29,11 +31,11 @@ public void builder_withSSLContextSet_throwsNoException() {
   @Test
   public void builder_builtWithCiphers_returnsCustomSSLWebSocketServerFactory() {
     SSLContext sslContext = Mockito.mock(SSLContext.class);
-    List<String> cihpers = Mockito.mock(List.class);
+    List<String> ciphers = Collections.emptyList();
     WebSocketServerFactory factory =
-        BaseWssFactoryBuilder.builder().sslContext(sslContext).ciphers(cihpers).build();
+        BaseWssFactoryBuilder.builder().sslContext(sslContext).ciphers(ciphers).build();
 
-    Assert.assertThat(
+    assertThat(
         factory, CoreMatchers.is(CoreMatchers.instanceOf(CustomSSLWebSocketServerFactory.class)));
   }
 
@@ -42,7 +44,7 @@ public void builder_builtWithoutCiphers_returnsDefaultSSLWebSocketServerFactory(
     SSLContext sslContext = Mockito.mock(SSLContext.class);
     WebSocketServerFactory factory = BaseWssFactoryBuilder.builder().sslContext(sslContext).build();
 
-    Assert.assertThat(
+    assertThat(
         factory, CoreMatchers.is(CoreMatchers.instanceOf(DefaultSSLWebSocketServerFactory.class)));
   }
 

ocpp-json/src/test/java/eu/chargetime/ocpp/wss/test/BaseWssSocketBuilderTest.java

@@ -1,7 +1,7 @@
 package eu.chargetime.ocpp.wss.test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 

ocpp-json/src/test/java/eu/chargetime/ocpp/wss/test/CustomSSLWebSocketServerFactoryTest.java

@@ -1,15 +1,14 @@
 package eu.chargetime.ocpp.wss.test;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.*;
 
 import eu.chargetime.ocpp.wss.CustomSSLWebSocketServerFactory;
 import java.io.IOException;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
-import java.security.KeyManagementException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
@@ -54,16 +53,15 @@ protected TestSSLContext(SSLContextSpi sslContextSpi) {
 
   static class TestSSLContextSpi extends SSLContextSpi {
 
-    private SSLEngine sslEngine;
+    private final SSLEngine sslEngine;
 
     public TestSSLContextSpi(SSLEngine sslEngine) {
       this.sslEngine = sslEngine;
     }
 
     @Override
     protected void engineInit(
-        KeyManager[] keyManagers, TrustManager[] trustManagers, SecureRandom secureRandom)
-        throws KeyManagementException {
+        KeyManager[] keyManagers, TrustManager[] trustManagers, SecureRandom secureRandom) {
       throw new UnsupportedOperationException();
     }