diff --git a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java b/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java index aaaaba6..24f903c 100644 --- a/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java +++ b/RISE-V2G-EVCC/src/main/java/org/v2gclarity/risev2g/evcc/states/ClientState.java @@ -41,7 +41,6 @@ import org.v2gclarity.risev2g.shared.misc.State; import org.v2gclarity.risev2g.shared.utils.ByteUtils; import org.v2gclarity.risev2g.shared.utils.MiscUtils; import org.v2gclarity.risev2g.shared.utils.SecurityUtils; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVSEStatusType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationReqType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.AuthorizationResType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; @@ -59,7 +58,6 @@ import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandReqType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CurrentDemandResType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.DCEVPowerDeliveryParameterType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EVSENotificationType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EnergyTransferModeType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MessageHeaderType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.MeteringReceiptResType; diff --git a/RISE-V2G-SECC/SECCConfig.properties b/RISE-V2G-SECC/SECCConfig.properties index 962aaaf..abbeb19 100644 --- a/RISE-V2G-SECC/SECCConfig.properties +++ b/RISE-V2G-SECC/SECCConfig.properties @@ -118,4 +118,4 @@ SignatureVerificationLog = true # - exificient # - open_exi # If no correct value is provided here, 'exificient' will be used -EXICodec = open_exi +EXICodec = exificient diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java index 7da6163..bbeca07 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java +++ b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/backend/IBackendInterface.java @@ -28,7 +28,6 @@ import java.security.interfaces.ECPrivateKey; import java.util.HashMap; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.CertificateChainType; -import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.EMAIDType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.SAScheduleListType; public interface IBackendInterface { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java index 1c495a1..cc7245c 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java +++ b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargeParameterDiscoveryReq.java @@ -33,9 +33,6 @@ import org.v2gclarity.risev2g.secc.evseController.IDCEVSEController; import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; -import org.v2gclarity.risev2g.shared.messageHandling.TerminateSession; -import org.v2gclarity.risev2g.shared.misc.TimeRestrictions; -import org.v2gclarity.risev2g.shared.utils.SleepUtils; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ACEVChargeParameterType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.BodyBaseType; import org.v2gclarity.risev2g.shared.v2gMessages.msgDef.ChargeParameterDiscoveryReqType; diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java index c092aa4..a78094b 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java +++ b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForChargingStatusReq.java @@ -23,7 +23,6 @@ *******************************************************************************/ package org.v2gclarity.risev2g.secc.states; -import org.v2gclarity.risev2g.secc.evseController.IACEVSEController; import org.v2gclarity.risev2g.secc.session.V2GCommunicationSessionSECC; import org.v2gclarity.risev2g.shared.enumerations.V2GMessages; import org.v2gclarity.risev2g.shared.messageHandling.ReactionToIncomingMessage; diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java index 25b6d23..9d13124 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java +++ b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/states/WaitForMeteringReceiptReq.java @@ -53,7 +53,6 @@ public class WaitForMeteringReceiptReq extends ServerState { meteringReceiptRes = new MeteringReceiptResType(); } - @SuppressWarnings("unchecked") @Override public ReactionToIncomingMessage processIncomingMessage(Object message) { if (isIncomingMessageValid(message, MeteringReceiptReqType.class, meteringReceiptRes)) { diff --git a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java index 6d19f6f..ad90377 100644 --- a/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java +++ b/RISE-V2G-SECC/src/main/java/org/v2gclarity/risev2g/secc/transportLayer/TLSServer.java @@ -25,7 +25,6 @@ package org.v2gclarity.risev2g.secc.transportLayer; import java.io.IOException; import java.net.SocketException; - import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocket; @@ -59,8 +58,9 @@ public final class TLSServer extends StatefulTransportLayerServer { * - System.setProperty("javax.net.ssl.keyStore", [filePath given as a String]) * - System.setProperty("javax.net.ssl.trustStore", [filePath given as a String]) * does not work in a JAR file since only getResourceAsStream works there (which on the other - * hand only returns an InputStream, not a file resource). Thus use setSSLFactories() + * hand only returns an InputStream, not a file resource). Thus use setSSLContext() */ + SecurityUtils.setSSLContext( GlobalValues.SECC_KEYSTORE_FILEPATH.toString(), GlobalValues.SECC_TRUSTSTORE_FILEPATH.toString(), diff --git a/RISE-V2G-Shared/libs/exificient.jar b/RISE-V2G-Shared/libs/exificient.jar deleted file mode 100644 index 33a19bb..0000000 Binary files a/RISE-V2G-Shared/libs/exificient.jar and /dev/null differ diff --git a/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar b/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar deleted file mode 100644 index 6c3700d..0000000 Binary files a/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena-rta/0000.0002.0052.0/nagasena-rta-0000.0002.0052.0.jar and /dev/null differ diff --git a/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar b/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar deleted file mode 100644 index 827d56b..0000000 Binary files a/RISE-V2G-Shared/libs/net/sourceforge/openexi/nagasena/0000.0002.0052.0/nagasena-0000.0002.0052.0.jar and /dev/null differ diff --git a/RISE-V2G-Shared/libs/xercesImpl.jar b/RISE-V2G-Shared/libs/xercesImpl.jar deleted file mode 100644 index 0aaa990..0000000 Binary files a/RISE-V2G-Shared/libs/xercesImpl.jar and /dev/null differ diff --git a/RISE-V2G-Shared/libs/xml-apis.jar b/RISE-V2G-Shared/libs/xml-apis.jar deleted file mode 100644 index 4673346..0000000 Binary files a/RISE-V2G-Shared/libs/xml-apis.jar and /dev/null differ diff --git a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java b/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java index d10c410..5af03df 100644 --- a/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java +++ b/RISE-V2G-Shared/src/main/java/org/v2gclarity/risev2g/shared/messageHandling/MessageHandler.java @@ -264,6 +264,9 @@ public class MessageHandler { case "ContractSignatureEncryptedPrivateKey": messageName = "ContractSignatureEncryptedPrivateKey"; break; + case "SalesTariff": // SalesTariff is not defined in MsgBody XSD schema, but MsgDataTypes XSD schema + namespace = GlobalValues.V2G_CI_MSG_DATATYPES_NAMESPACE.toString(); + break; default: break; }