Remove SOAP dependency from ocpp-common

Author: robert-s-ubi

OCPP-J/src/main/java/eu/chargetime/ocpp/JSONCommunicator.java

@@ -155,7 +155,9 @@ protected Object makeCallResult(String uniqueId, String action, Object payload)
 
   @Override
   protected Object makeCall(String uniqueId, String action, Object payload) {
-    return String.format(CALL_FORMAT, uniqueId, action, payload);
+    String message = String.format(CALL_FORMAT, uniqueId, action, payload);
+    logger.trace("Send a message: {}", message);
+    return message;
   }
 
   @Override
@@ -200,6 +202,7 @@ protected Message parse(Object json) {
 
     message.setId(messageId);
 
+    logger.trace("Receive a message: {}", message);
     return message;
   }
 }

ocpp-common/build.gradle

@@ -2,8 +2,7 @@
 dependencies {
     compile 'org.slf4j:slf4j-api:2.0.17'
     compile 'ch.qos.logback:logback-classic:1.3.16'
-    compile group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
-    compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.1'
+    compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
 
     testCompile 'junit:junit:4.13.2'
     testCompile 'org.mockito:mockito-core:4.11.0'

ocpp-common/pom.xml

@@ -51,11 +51,6 @@
           <artifactId>jaxb-api</artifactId>
           <version>2.3.1</version>
         </dependency>
-        <dependency>
-          <groupId>javax.xml.soap</groupId>
-          <artifactId>javax.xml.soap-api</artifactId>
-          <version>1.4.0</version>
-        </dependency>
 
         <!-- Logging -->
         <dependency>

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

@@ -28,12 +28,9 @@ of this software and associated documentation files (the "Software"), to deal
 */
 
 import eu.chargetime.ocpp.model.*;
-import eu.chargetime.ocpp.utilities.SugarUtil;
 import java.util.ArrayDeque;
-import javax.xml.soap.SOAPMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
 
 /**
  * Abstract class. Handles basic communication: Pack and send messages. Receive and unpack messages.
@@ -165,14 +162,6 @@ public void accept(CommunicatorEvents events) {
   public synchronized void sendCall(String uniqueId, String action, Request request) {
     Object call = makeCall(uniqueId, action, packPayload(request));
 
-    if (call != null) {
-      if (call instanceof SOAPMessage) {
-        logger.trace("Send a message: {}", SugarUtil.soapMessageToString((SOAPMessage) call));
-      } else {
-        logger.trace("Send a message: {}", call);
-      }
-    }
-
     try {
       if (radio.isClosed()) {
         if (request.transactionRelated() && transactionQueue != null) {
@@ -298,14 +287,6 @@ public void connected() {
     @Override
     public void receivedMessage(Object input) {
       Message message = parse(input);
-      if (message != null) {
-        Object payload = message.getPayload();
-        if (payload instanceof Document) {
-          logger.trace("Receive a message: {}", SugarUtil.docToString((Document) payload));
-        } else {
-          logger.trace("Receive a message: {}", message);
-        }
-      }
       if (message instanceof CallResultMessage) {
         events.onCallResult(message.getId(), message.getAction(), message.getPayload());
       } else if (message instanceof CallErrorMessage) {

ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/MoreObjects.java

@@ -900,7 +900,7 @@ private ToStringHelperImpl addHolder(String name, Object value) {
 
     private ToStringHelperImpl addHolder(String name, ZonedDateTime value) {
       ValueHolder valueHolder = addHolder();
-      valueHolder.value = "\"" + SugarUtil.zonedDateTimeToString(value) + "\"";
+      valueHolder.value = "\"" + zonedDateTimeToString(value) + "\"";
       valueHolder.name = name;
       return this;
     }
@@ -911,4 +911,9 @@ private static final class ValueHolder {
       ValueHolder next;
     }
   }
+
+  public static String zonedDateTimeToString(ZonedDateTime zonedDateTime) {
+    if (zonedDateTime == null) return "";
+    return zonedDateTime.toString();
+  }
 }

ocpp-v1_6-soap/src/main/java/eu/chargetime/ocpp/SOAPCommunicator.java

@@ -27,6 +27,7 @@ of this software and associated documentation files (the "Software"), to deal
 */
 
 import eu.chargetime.ocpp.model.*;
+import eu.chargetime.ocpp.utilities.SugarUtil;
 import javax.xml.bind.*;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -125,7 +126,11 @@ protected Object makeCallResult(String uniqueId, String action, Object payload)
 
   @Override
   protected Object makeCall(String uniqueId, String action, Object payload) {
-    return createMessage(uniqueId, action, (Document) payload, false);
+    SOAPMessage message = createMessage(uniqueId, action, (Document) payload, false);
+    if (message != null) {
+      logger.trace("Send a message: {}", SugarUtil.soapMessageToString(message));
+    }
+    return message;
   }
 
   private QName blameSomeone(String errorCode) {
@@ -161,7 +166,7 @@ protected Object makeCallError(
     return message;
   }
 
-  private Object createMessage(
+  private SOAPMessage createMessage(
       String uniqueId, String action, Document payload, boolean isResponse) {
     SOAPMessage message = null;
 
@@ -252,6 +257,15 @@ protected Message parse(Object message) {
 
     if (soapParser.isAddressedToMe()) output = soapParser.parseMessage();
 
+    if (output != null) {
+      Object payload = output.getPayload();
+      if (payload instanceof Document) {
+        logger.trace("Receive a message: {}", SugarUtil.docToString((Document) payload));
+      } else {
+        logger.trace("Receive a message: {}", message);
+      }
+    }
+
     return output;
   }
 

…chargetime/ocpp/utilities/SugarUtil.java …chargetime/ocpp/utilities/SugarUtil.javaocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java renamed to ocpp-v1_6-soap/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java renamed to ocpp-v1_6-soap/src/main/java/eu/chargetime/ocpp/utilities/SugarUtil.java

@@ -30,7 +30,6 @@ of this software and associated documentation files (the "Software"), to deal
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.time.ZonedDateTime;
 import javax.xml.XMLConstants;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
@@ -42,11 +41,6 @@ of this software and associated documentation files (the "Software"), to deal
 
 public class SugarUtil {
 
-  public static String zonedDateTimeToString(ZonedDateTime zonedDateTime) {
-    if (zonedDateTime == null) return "";
-    return zonedDateTime.toString();
-  }
-
   public static String docToString(Document doc) {
     try {
       StringWriter sw = new StringWriter();

ocpp-v1_6/build.gradle

@@ -5,8 +5,6 @@
 dependencies {
     compile project(':common')
     compile project(':OCPP-J')
-    compile 'org.java-websocket:Java-WebSocket:1.6.0'
-    compile group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
 
     testCompile 'junit:junit:4.13.2'
     testCompile 'org.mockito:mockito-core:4.11.0'