0.5 cleanup

ocpp-common/src/main/java/eu/chargetime/ocpp/ListenerEvents.java

@@ -1,4 +1,5 @@
-package eu.chargetime.ocpp;/*
+package eu.chargetime.ocpp;
+/*
     ChargeTime.eu - Java-OCA-OCPP
 
     MIT License

ocpp-common/src/main/java/eu/chargetime/ocpp/ServerEvents.java

@@ -1,4 +1,5 @@
-package eu.chargetime.ocpp;/*
+package eu.chargetime.ocpp;
+/*
     ChargeTime.eu - Java-OCA-OCPP
 
     MIT License

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/IServerAPI.java

@@ -43,5 +43,5 @@ public interface IServerAPI {
 
     boolean isClosed();
 
-    CompletionStage<Confirmation> send(UUID session, Request request) throws OccurenceConstraintException, UnsupportedFeatureException, NotConnectedException;
+    CompletionStage<Confirmation> send(UUID sessionIndex, Request request) throws OccurenceConstraintException, UnsupportedFeatureException, NotConnectedException;
 }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java

@@ -50,9 +50,7 @@ public class JSONClient implements IClientAPI {
 
     private static final Logger logger = LoggerFactory.getLogger(JSONClient.class);
 
-    public final Draft draftOcppOnly =
-            new Draft_6455(Collections.emptyList(),
-                    Collections.singletonList(new Protocol("ocpp1.6")));
+    public final Draft draftOcppOnly;
     private final WebSocketTransmitter transmitter;
     private final FeatureRepository featureRepository;
     private final Client client;
@@ -71,6 +69,8 @@ public JSONClient(ClientCoreProfile coreProfile) {
      */
     public JSONClient(ClientCoreProfile coreProfile, String identity) {
         this.identity = identity;
+        draftOcppOnly = new Draft_6455(Collections.emptyList(),
+                Collections.singletonList(new Protocol("ocpp1.6")));
         transmitter = new WebSocketTransmitter(draftOcppOnly);
         JSONCommunicator communicator = new JSONCommunicator(transmitter);
         AsyncPromiseFulfilerDecorator promiseFulfiler = new AsyncPromiseFulfilerDecorator(new SimplePromiseFulfiller());

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java

@@ -47,9 +47,7 @@ public class JSONServer implements IServerAPI {
 
     private static final Logger logger = LoggerFactory.getLogger(JSONServer.class);
 
-    public final Draft draftOcppOnly =
-            new Draft_6455(Collections.emptyList(),
-                    Collections.singletonList(new Protocol("ocpp1.6")));
+    public final Draft draftOcppOnly;
     private final WebSocketListener listener;
     private final Server server;
     private final FeatureRepository featureRepository;
@@ -63,6 +61,8 @@ public class JSONServer implements IServerAPI {
     public JSONServer(ServerCoreProfile coreProfile) {
         featureRepository = new FeatureRepository();
         ServerSessionFactory sessionFactory = new ServerSessionFactory(featureRepository);
+        draftOcppOnly = new Draft_6455(Collections.emptyList(),
+                Collections.singletonList(new Protocol("ocpp1.6")));
         this.listener = new WebSocketListener(sessionFactory, draftOcppOnly);
         server = new Server(this.listener, featureRepository, new PromiseRepository());
         featureRepository.addFeatureProfile(coreProfile);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java

@@ -129,9 +129,7 @@ public SOAPMessage incomingRequest(SOAPMessageInfo messageInfo) {
             SOAPMessage confirmation = null;
             try {
                 confirmation = chargeBoxes.get(identity).relay(message).get();
-            } catch (InterruptedException e) {
-                logger.warn("incomingRequest() chargeBoxes.relay failed", e);
-            } catch (ExecutionException e) {
+            } catch (InterruptedException | ExecutionException e) {
                 logger.warn("incomingRequest() chargeBoxes.relay failed", e);
             }
 

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceReceiver.java

@@ -38,7 +38,7 @@ public class WebServiceReceiver extends SOAPSyncHelper implements Receiver {
     private static final Logger logger = LoggerFactory.getLogger(WebServiceReceiver.class);
 
     private RadioEvents events;
-    SOAPConnection soapConnection;
+    private SOAPConnection soapConnection;
     private String url;
     private WebServiceReceiverEvents receiverEvents;
     private boolean connected;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceTransmitter.java

@@ -38,10 +38,10 @@ of this software and associated documentation files (the "Software"), to deal
 public class WebServiceTransmitter extends SOAPSyncHelper implements Transmitter {
     private static final Logger logger = LoggerFactory.getLogger(WebServiceTransmitter.class);
 
-    SOAPConnection soapConnection;
+    private SOAPConnection soapConnection;
     private String url;
     private RadioEvents events;
-    boolean connected;
+    private boolean connected;
 
     public WebServiceTransmitter() {
         connected = false;
@@ -85,8 +85,7 @@ protected void sendRequest(final SOAPMessage message) throws NotConnectedExcepti
             throw new NotConnectedException();
         Thread thread = new Thread(() -> {
             try {
-                SOAPMessage soapMessage = message;
-                SOAPMessage response = soapConnection.call(soapMessage, url);
+                SOAPMessage response = soapConnection.call(message, url);
                 events.receivedMessage(response);
             } catch (SOAPException e) {
             	logger.warn("sendRequest() failed", e);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebSocketListener.java

@@ -139,7 +139,7 @@ public void enableWSS(WssFactoryBuilder wssFactoryBuilder) {
     }
 
     public void setPingInterval(int interval) {
-        this.pingInterval = pingInterval;
+        this.pingInterval = interval;
 
         if(server != null) {
             server.setConnectionLostTimeout(interval);

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

@@ -126,7 +126,7 @@ public void enableWSS(WssSocketBuilder wssSocketBuilder) {
     }
 
     public void setPingInterval(int interval) {
-        this.pingInterval = pingInterval;
+        this.pingInterval = interval;
 
         if(client != null) {
             client.setConnectionLostTimeout(interval);