Added MeterValues feature to core profile.

Author: TVolden

ocpp-common/src/test/java/eu/chargetime/ocpp/test/SessionTest.java

@@ -137,10 +137,11 @@ public void open_connectsViaCommunicator() {
     }
 
     @Test
-    public void onCall_unhandledCallback_callSendCallError() {
+    public void onCall_unhandledCallback_callSendCallError() throws Exception {
         // Given
         String someId = "Some id";
         when(sessionEvents.handleRequest(any())).thenReturn(null);
+        when(communicator.unpackPayload(any(), any())).thenReturn(new TestRequest());
 
         // When
         eventHandler.onCall(someId, null, null);

ocpp-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java

@@ -122,6 +122,10 @@ public boolean hasReceivedAuthorizeRequest()
         return receivedMessage != null && "Authorize".equals(getAction());
     }
 
+    public boolean hasReceivedMeterValuesRequest() {
+        return receivedMessage != null && "MeterValues".equals(getAction());
+    }
+
     private JSONObject getCallPayload()
     {
         return (JSONObject)receivedMessage[3];
@@ -214,11 +218,12 @@ public enum AvailabilityType {
         Inoperative, Operative
     }
 
-    public void sendChangeAvailability(int connectorId, AvailabilityType type)
+    public void sendChangeAvailabilityRequest(int connectorId, AvailabilityType type)
     {
         String payload = "\"connectorId\":%d,\"type\":\"%s\"";
         sendRequest("ChangeAvailability", String.format(payload, connectorId, type));
     }
+
     public enum RegistrationStatus {
         Accepted, Pending, Rejected
     }
@@ -228,6 +233,10 @@ public void sendHeartbeatConfirmation() {
         sendConfirmation(String.format(payload, now()));
     }
 
+    public void sendMeterValuesConfirmation() {
+        sendConfirmation("");
+    }
+
     public void sendBootConfirmation(RegistrationStatus status) {
         String payload = "\"currentTime\": \"%s\", \"interval\": %d, \"status\": \"%s\"";
         sendConfirmation(String.format(payload, now(), 300, status));

ocpp-test/src/main/java/eu/chargetime/ocpp/test/FakeChargePoint.java

@@ -1,14 +1,14 @@
 package eu.chargetime.ocpp.test;
 
 import eu.chargetime.ocpp.*;
-import eu.chargetime.ocpp.model.*;
 import eu.chargetime.ocpp.feature.profile.ClientCoreEventHandler;
 import eu.chargetime.ocpp.feature.profile.CoreProfile;
+import eu.chargetime.ocpp.model.*;
+
+import java.util.Calendar;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.*;
 
 /**
  ChargeTime.eu - Java-OCA-OCPP
@@ -107,8 +107,12 @@ public void sendHeartbeatRequest() {
     }
 
     public void sendMeterValuesRequest() {
-        Request request = core.createMeterValuesRequest();
-        send(request);
+        try {
+            Request request = core.createMeterValuesRequest(42, Calendar.getInstance(), "42");
+            send(request);
+        } catch (PropertyConstraintException ex) {
+            ex.printStackTrace();
+        }
     }
 
     public void sendDataTransferRequest(String vendorId, String messageId, String data) {
@@ -146,6 +150,10 @@ public void hasReceivedHeartbeatConfirmation() {
         assertThat(receivedConfirmation, instanceOf(HeartbeatConfirmation.class));
     }
 
+    public void hasReceivedMeterValuesConfirmation() {
+        assertThat(receivedConfirmation, instanceOf(MeterValuesConfirmation.class));
+    }
+
     public void disconnect() {
         client.disconnect();
     }

ocpp-v1_6/src/it/groovy/core_features/ChangeAvailability.groovy

@@ -2,8 +2,9 @@ package core_features
 
 import eu.chargetime.ocpp.test.FakeCentralSystem
 import eu.chargetime.ocpp.test.FakeChargePoint
-import spock.lang.*
-import spock.util.concurrent.PollingConditions;
+import spock.lang.Shared
+import spock.lang.Specification
+import spock.util.concurrent.PollingConditions
 
 class ChangeAvailability extends Specification
 {
@@ -26,7 +27,7 @@ class ChangeAvailability extends Specification
     def "Central System sends a ChangeAvailability request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:
-        centralSystem.sendChangeAvailability(0, FakeCentralSystem.AvailabilityType.Inoperative);
+        centralSystem.sendChangeAvailabilityRequest(0, FakeCentralSystem.AvailabilityType.Inoperative);
 
         then:
         conditions.eventually {

ocpp-v1_6/src/it/groovy/core_features/MeterValues.groovy

@@ -29,10 +29,9 @@ class MeterValues extends Specification
         when:
         chargePoint.sendMeterValuesRequest();
 
-
         then:
         conditions.eventually {
-            centralSystem.hasReceivedMeterValues();
+            centralSystem.hasReceivedMeterValuesRequest();
         }
 
         when:

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/MeterValuesFeature.java

@@ -0,0 +1,53 @@
+package eu.chargetime.ocpp.feature;
+
+import eu.chargetime.ocpp.feature.profile.Profile;
+import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.model.MeterValuesConfirmation;
+import eu.chargetime.ocpp.model.MeterValuesRequest;
+import eu.chargetime.ocpp.model.Request;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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.
+ */
+public class MeterValuesFeature extends Feature {
+    public MeterValuesFeature(Profile ownerProfile) {
+        super(ownerProfile);
+    }
+
+    @Override
+    public Class<? extends Request> getRequestType() {
+        return MeterValuesRequest.class;
+    }
+
+    @Override
+    public Class<? extends Confirmation> getConfirmationType() {
+        return MeterValuesConfirmation.class;
+    }
+
+    @Override
+    public String getAction() {
+        return "MeterValues";
+    }
+}

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/CoreProfile.java

@@ -5,6 +5,7 @@
 import eu.chargetime.ocpp.model.*;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 
 /**
  ChargeTime.eu - Java-OCA-OCPP
@@ -49,6 +50,7 @@ public CoreProfile(ClientCoreEventHandler handler) {
         features.add(new ClearCacheFeature(this));
         features.add(new DataTransferFeature(this));
         features.add(new HeartbeatFeature(this));
+        features.add(new MeterValuesFeature(this));
     }
 
     public AuthorizeRequest createAuthorizeRequest(String idToken) throws PropertyConstraintException {
@@ -67,8 +69,24 @@ public HeartbeatRequest createHeartbeatRequest() {
         return new HeartbeatRequest();
     }
 
-    public MeterValuesRequest createMeterValuesRequest() {
-        return null;
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, String value) throws PropertyConstraintException {
+        SampledValue sampledValue = new SampledValue();
+        sampledValue.setValue(value);
+        return createMeterValuesRequest(connectorId, timestamp, sampledValue);
+    }
+
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, SampledValue... sampledValues) throws PropertyConstraintException {
+        MeterValue meterValue = new MeterValue();
+        meterValue.setTimestamp(timestamp);
+        meterValue.setSampledValue(sampledValues);
+        return createMeterValuesRequest(connectorId, meterValue);
+    }
+
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, MeterValue... meterValues) throws PropertyConstraintException {
+        MeterValuesRequest request = new MeterValuesRequest();
+        request.setConnectorId(connectorId);
+        request.setMeterValue(meterValues);
+        return request;
     }
 
     @Override

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/MeterValue.java

@@ -2,7 +2,9 @@
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.TimeZone;
 
 /**
  * ChargeTime.eu - Java-OCA-OCPP
@@ -51,7 +53,13 @@ public void setTimestamp(Calendar timestamp) throws PropertyConstraintException
         this.timestamp = timestamp;
     }
 
-    public Calendar getTimestamp() {
+    public String getTimestamp() {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        formatter.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
+        return formatter.format(timestamp.getTime());
+    }
+
+    public Calendar objTimestamp() {
         return timestamp;
     }
 

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/MeterValuesConfirmation.java

@@ -0,0 +1,33 @@
+package eu.chargetime.ocpp.model;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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.
+ */
+public class MeterValuesConfirmation implements Confirmation {
+    @Override
+    public boolean validate() {
+        return true;
+    }
+}