Skip to content

Commit

Permalink
Merge pull request #229 from ChargeTimeEU/master
Browse files Browse the repository at this point in the history
Merged recent changes
  • Loading branch information
TVolden authored Feb 8, 2023
2 parents 9fe3b79 + 89afc40 commit 58c0425
Show file tree
Hide file tree
Showing 8 changed files with 103 additions and 23 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions ocpp-common/src/main/java/eu/chargetime/ocpp/Server.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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());
}
}

Expand Down
6 changes: 0 additions & 6 deletions ocpp-v1_6-example/json-client-implementation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 0 additions & 6 deletions ocpp-v1_6-example/json_server_example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 8 additions & 0 deletions ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand All @@ -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));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package eu.chargetime.ocpp.model.core.test;
/*
ChargeTime.eu - Java-OCA-OCPP
MIT License
Copyright (C) 2022 Andreas Fischer <[email protected]>
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);
}
}

0 comments on commit 58c0425

Please sign in to comment.