Merge pull request #32 from lahnaoja/namespace

Fix namespace in soap headers of responses
ChargeTimeEU · Feb 21, 2018 · f8df205 · f8df205
2 parents 4363bd8 + 27b9d6d
commit f8df205
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/SOAPCommunicator.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/SOAPCommunicator.java
@@ -171,8 +171,9 @@ private Object createMessage(String uniqueId, String action, Document payload, b
 
             createMessageHeader(uniqueId, action, isResponse, message);
 
-            if (isResponse)
-                payload = setNamespace(payload, hostInfo.isClient() ? SOAPHostInfo.NAMESPACE_CENTRALSYSTEM: SOAPHostInfo.NAMESPACE_CHARGEBOX);
+            if (isResponse) {
+                payload = setNamespace(payload, hostInfo.isClient() ? SOAPHostInfo.NAMESPACE_CHARGEBOX : SOAPHostInfo.NAMESPACE_CENTRALSYSTEM);
+            }
 
             message.getSOAPBody().addDocument(payload);
         } catch (Exception e) {

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java
@@ -40,8 +40,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 public class WebServiceListener implements Listener {
     private static final Logger logger = LogManager.getLogger(WebServiceListener.class);
-	private static final String WSDL_CENTRAL_SYSTEM = "eu/chargetime/ocpp/OCPP_CentralSystemService_1.6.wsdl";
-    private static final String NAMESPACE = "urn://Ocpp/Cp/2015/10";
+    private static final String WSDL_CENTRAL_SYSTEM = "eu/chargetime/ocpp/OCPP_CentralSystemService_1.6.wsdl";
     private final IServerSessionFactory sessionFactory;
 
     private ListenerEvents events;

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/SOAPHostInfo.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/SOAPHostInfo.java
@@ -25,8 +25,8 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 public class SOAPHostInfo {
-    public static final String NAMESPACE_CHARGEBOX = "urn://Ocpp/Cs/2015/10";
-    public static final String NAMESPACE_CENTRALSYSTEM = "urn://Ocpp/Cp/2015/10";
+    public static final String NAMESPACE_CHARGEBOX = "urn://Ocpp/Cp/2015/10/";
+    public static final String NAMESPACE_CENTRALSYSTEM =  "urn://Ocpp/Cs/2015/10/";
 
     private String chargeBoxIdentity;
     private String fromUrl;