Merge pull request #229 from ChargeTimeEU/master

TVolden · web-flow · commit 58c04255f161 · 2023-02-08T09:00:47.000+01:00
Merged recent changes
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -19,7 +19,9 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        # TODO: Revert to '11'.
+        # See https://github.com/ChargeTimeEU/Java-OCA-OCPP/pull/223#issuecomment-1328048028
+        java-version: '11.0.16+8'
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
diff --git a/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java b/OCPP-J/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java
@@ -152,6 +152,9 @@ byte[] joinByteArrays(byte[] a, byte[] b) {
   }
 
   void configure() {
+    if (client == null) {
+      return;
+    }
     client.setReuseAddr(configuration.getParameter(JSONConfiguration.REUSE_ADDR_PARAMETER, false));
     client.setTcpNoDelay(
         configuration.getParameter(JSONConfiguration.TCP_NO_DELAY_PARAMETER, false));
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/Server.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/Server.java
@@ -117,8 +117,8 @@ public Confirmation handleRequest(Request request)
                             .handleRequest(sessionIdOptional.get(), request);
                       } else {
                         logger.error(
-                            "Unable to handle request ({}), the active session was not found.",
-                            request);
+                            "Unable to handle request ({}), the active session was not found for {}.",
+                            request, session.getSessionId());
                         throw new IllegalStateException("Active session not found");
                       }
                     } else {
@@ -154,7 +154,7 @@ public void handleConnectionClosed() {
                       serverEvents.lostSession(sessionIdOptional.get());
                       sessions.remove(sessionIdOptional.get());
                     } else {
-                      logger.warn("Active session not found");
+                      logger.warn("Active session not found for {}", session.getSessionId());
                     }
                   }
 
diff --git a/ocpp-v1_6-example/json-client-implementation/pom.xml b/ocpp-v1_6-example/json-client-implementation/pom.xml
@@ -48,12 +48,6 @@
 			<artifactId>v1_6</artifactId>
 			<version>1.0.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>RELEASE</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/ocpp-v1_6-example/json_server_example/pom.xml b/ocpp-v1_6-example/json_server_example/pom.xml
@@ -48,12 +48,6 @@
 			<artifactId>v1_6</artifactId>
 			<version>1.0.1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>RELEASE</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java
@@ -144,6 +144,14 @@ public JSONClient enableWSS(WssSocketBuilder wssSocketBuilder) {
     return this;
   }
 
+  /**
+   * Applies JSONConfiguration changes when already connected. Specifically, the WebSocket ping
+   * interval can be changed without reconnecting by calling this method.
+   */
+  public void reconfigure() {
+    transmitter.configure();
+  }
+
   @Override
   public void addFeatureProfile(Profile profile) {
     featureRepository.addFeatureProfile(profile);
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationRequest.java
@@ -160,7 +160,7 @@ public String getChargeBoxSerialNumber() {
    */
   @Deprecated()
   public void setChargeBoxSerialNumber(String chargeBoxSerialNumber) {
-    if (!ModelUtil.validate(chargeBoxSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
+    if (chargeBoxSerialNumber != null && !ModelUtil.validate(chargeBoxSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           chargeBoxSerialNumber.length(), validationErrorMessage(STRING_25_CHAR_MAX_LENGTH));
     }
@@ -184,7 +184,7 @@ public String getChargePointSerialNumber() {
    */
   @XmlElement
   public void setChargePointSerialNumber(String chargePointSerialNumber) {
-    if (!ModelUtil.validate(chargePointSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
+    if (chargePointSerialNumber != null && !ModelUtil.validate(chargePointSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           chargePointSerialNumber.length(), validationErrorMessage(STRING_25_CHAR_MAX_LENGTH));
     }
@@ -208,7 +208,7 @@ public String getFirmwareVersion() {
    */
   @XmlElement
   public void setFirmwareVersion(String firmwareVersion) {
-    if (!ModelUtil.validate(firmwareVersion, STRING_50_CHAR_MAX_LENGTH)) {
+    if (firmwareVersion != null && !ModelUtil.validate(firmwareVersion, STRING_50_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           firmwareVersion.length(), validationErrorMessage(STRING_50_CHAR_MAX_LENGTH));
     }
@@ -232,7 +232,7 @@ public String getIccid() {
    */
   @XmlElement
   public void setIccid(String iccid) {
-    if (!ModelUtil.validate(iccid, STRING_20_CHAR_MAX_LENGTH)) {
+    if (iccid != null && !ModelUtil.validate(iccid, STRING_20_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           iccid.length(), validationErrorMessage(STRING_20_CHAR_MAX_LENGTH));
     }
@@ -256,7 +256,7 @@ public String getImsi() {
    */
   @XmlElement
   public void setImsi(String imsi) {
-    if (!ModelUtil.validate(imsi, STRING_20_CHAR_MAX_LENGTH)) {
+    if (imsi != null && !ModelUtil.validate(imsi, STRING_20_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           imsi.length(), validationErrorMessage(STRING_20_CHAR_MAX_LENGTH));
     }
@@ -280,7 +280,7 @@ public String getMeterSerialNumber() {
    */
   @XmlElement
   public void setMeterSerialNumber(String meterSerialNumber) {
-    if (!ModelUtil.validate(meterSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
+    if (meterSerialNumber != null && !ModelUtil.validate(meterSerialNumber, STRING_25_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           meterSerialNumber.length(), validationErrorMessage(STRING_25_CHAR_MAX_LENGTH));
     }
@@ -304,7 +304,7 @@ public String getMeterType() {
    */
   @XmlElement
   public void setMeterType(String meterType) {
-    if (!ModelUtil.validate(meterType, STRING_25_CHAR_MAX_LENGTH)) {
+    if (meterType != null && !ModelUtil.validate(meterType, STRING_25_CHAR_MAX_LENGTH)) {
       throw new PropertyConstraintException(
           meterType.length(), validationErrorMessage(STRING_25_CHAR_MAX_LENGTH));
     }
diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/core/test/BootNotificationRequestTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/core/test/BootNotificationRequestTest.java
@@ -0,0 +1,79 @@
+package eu.chargetime.ocpp.model.core.test;
+/*
+   ChargeTime.eu - Java-OCA-OCPP
+
+   MIT License
+
+   Copyright (C) 2022 Andreas Fischer <andreas.fischer@innocharge.de>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in all
+   copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+   SOFTWARE.
+*/
+
+import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class BootNotificationRequestTest {
+
+  @Rule public ExpectedException thrownException = ExpectedException.none();
+
+  private BootNotificationRequest request;
+
+  @Before
+  public void setup() {
+    request = new BootNotificationRequest();
+  }
+
+  @Test()
+  public void validate_setChargeBoxSerialNumber_onNull_doesNotThrowNPE() {
+    request.setChargeBoxSerialNumber(null);
+  }
+
+  @Test()
+  public void validate_setChargePointSerialNumber_onNull_doesNotThrowNPE() {
+    request.setChargePointSerialNumber(null);
+  }
+
+  @Test()
+  public void validate_setFirmwareVersion_onNull_doesNotThrowNPE() {
+    request.setFirmwareVersion(null);
+  }
+
+  @Test()
+  public void validate_setIccid_onNull_doesNotThrowNPE() {
+    request.setIccid(null);
+  }
+
+  @Test()
+  public void validate_setImsi_onNull_doesNotThrowNPE() {
+    request.setImsi(null);
+  }
+
+  @Test()
+  public void validate_setMeterSerialNumber_onNull_doesNotThrowNPE() {
+    request.setMeterSerialNumber(null);
+  }
+
+  @Test()
+  public void validate_setMeterType_onNull_doesNotThrowNPE() {
+    request.setMeterType(null);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ byte[] joinByteArrays(byte[] a, byte[] b) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`void configure() {`
	`155`	`+ if (client == null) {`
	`156`	`+ return;`
	`157`	`+ }`
`155`	`158`	`client.setReuseAddr(configuration.getParameter(JSONConfiguration.REUSE_ADDR_PARAMETER, false));`
`156`	`159`	`client.setTcpNoDelay(`
`157`	`160`	`configuration.getParameter(JSONConfiguration.TCP_NO_DELAY_PARAMETER, false));`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ public Confirmation handleRequest(Request request)`
`117`	`117`	`.handleRequest(sessionIdOptional.get(), request);`
`118`	`118`	`} else {`
`119`	`119`	`logger.error(`
`120`		`- "Unable to handle request ({}), the active session was not found.",`
`121`		`- request);`
	`120`	`+ "Unable to handle request ({}), the active session was not found for {}.",`
	`121`	`+ request, session.getSessionId());`
`122`	`122`	`throw new IllegalStateException("Active session not found");`
`123`	`123`	`}`
`124`	`124`	`} else {`
`@@ -154,7 +154,7 @@ public void handleConnectionClosed() {`
`154`	`154`	`serverEvents.lostSession(sessionIdOptional.get());`
`155`	`155`	`sessions.remove(sessionIdOptional.get());`
`156`	`156`	`} else {`
`157`		`- logger.warn("Active session not found");`
	`157`	`+ logger.warn("Active session not found for {}", session.getSessionId());`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`