From 27b9d6d898d33cdb182847f9f4b8ab2866cd6465 Mon Sep 17 00:00:00 2001 From: Antti Date: Wed, 21 Feb 2018 09:55:25 +0200 Subject: [PATCH] Fix namespace in soap headers of responses --- .../src/main/java/eu/chargetime/ocpp/SOAPCommunicator.java | 5 +++-- .../src/main/java/eu/chargetime/ocpp/WebServiceListener.java | 3 +-- .../src/main/java/eu/chargetime/ocpp/model/SOAPHostInfo.java | 4 ++-- 3 files changed, 6 insertions(+), 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 index a6d291f90..c4350afb8 100644 --- 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 index 395e7aa5b..84ce1c0df 100644 --- 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 index c47ba7a45..cbdccc89b 100644 --- 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;