Fixed test, removed dead code. Fixed periodic fail in integration.

Author: TVolden

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/soap/SOAPDataTransferSpec.groovy

@@ -19,7 +19,6 @@ class SOAPDataTransferSpec extends Specification {
 
     def setup() {
         chargePoint.connect()
-        chargePoint.sendBootNotification("VendorX", "SingleSocketCharger")
     }
 
     def cleanup() {
@@ -29,6 +28,7 @@ class SOAPDataTransferSpec extends Specification {
     def "Central System sends a DataTransfer request and receives a response"() {
         def conditions = new PollingConditions(timeout: 2)
         given:
+        chargePoint.sendBootNotification("VendorX", "SingleSocketCharger")
         conditions.eventually {
             assert centralSystem.connected()
         }

ocpp-v1_6/pom.xml

@@ -89,6 +89,7 @@
               <executions>
                 <execution>
                   <id>attach-sources</id>
+                    <phase>verify</phase>
                   <goals>
                     <goal>jar-no-fork</goal>
                   </goals>

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONCommunicator.java

@@ -144,7 +144,7 @@ protected Message parse(Object json) {
 
         if (array.get(INDEX_MESSAGEID).getAsInt() == TYPENUMBER_CALL) {
             message = new CallMessage();
-            ((CallMessage) message).setAction(array.get(INDEX_CALL_ACTION).getAsString());
+            message.setAction(array.get(INDEX_CALL_ACTION).getAsString());
             message.setPayload(array.get(INDEX_CALL_PAYLOAD).toString());
         } else if (array.get(INDEX_MESSAGEID).getAsInt() == TYPENUMBER_CALLRESULT) {
             message = new CallResultMessage();
@@ -160,131 +160,4 @@ protected Message parse(Object json) {
         return message;
     }
 
-    /*
-    private <T> T parseJSON(JSONObject json, Class<T> type) throws Exception {
-        T object = type.newInstance();
-
-        for (Method method: type.getDeclaredMethods()) {
-            String key;
-            if ((key = extractKey(method)) == null)
-                continue; // Skip non-setter method
-
-            if (json.has(key)) {
-                method.invoke(object, parseValue(key, json, method));
-            }
-        }
-        return object;
-    }
-
-    private Object parseValue(String key, JSONObject json, Method method) throws Exception
-    {
-        Class<?> type = setterParameterType(method);
-        Type genericType = setterGenericParameterType(method);
-
-        return parseValue(key, json, type, genericType);
-    }
-
-    private Object parseValue(String key, JSONObject json, Class<?> type, Type genericType) throws Exception {
-        Object output;
-
-        if (type.isArray()) {
-            output = parseArray(json.getJSONArray(key), type.getComponentType());
-        }
-        else if (type == String.class) {
-            output = json.getString(key);
-        }
-        else if (type == Calendar.class) {
-            output = DatatypeConverter.parseDateTime(json.getString(key));
-        }
-        else if (type == Integer.class || genericType == Integer.TYPE) {
-            output = json.getInt(key);
-        }
-        else if (type == Long.class || genericType == Long.TYPE) {
-            output = json.getLong(key);
-        }
-        else if (type == Double.class || genericType == Double.TYPE) {
-            output = json.getDouble(key);
-        }
-        else if (type == Boolean.class || genericType == Boolean.TYPE) {
-            output = json.getBoolean(key);
-        } else if (type.isEnum()) {
-            output = Enum.valueOf((Class<Enum>) type, json.getString(key));
-        }
-        else {
-            output = parseJSON(json.optJSONObject(key), type);
-        }
-
-        return output;
-    }
-
-    private <T> T[] parseArray(JSONArray array, Class<?> type) throws Exception {
-        T[] output = (T[]) Array.newInstance(type, array.length());
-        for(int i = 0; i < array.length(); i++)
-            output[i] = (T)parseArrayItem(array, i, type);
-        return output;
-    }
-
-    private Object parseArrayItem(JSONArray array, int index, Class<?> type) throws Exception {
-        Object output;
-
-        if (type == String.class) {
-            output = array.getString(index);
-        }
-        else if (type == Calendar.class) {
-            output = DatatypeConverter.parseDateTime(array.getString(index));
-        }
-        else if (type == Integer.class || type == Integer.TYPE) {
-            output = array.getInt(index);
-        }
-        else if (type == Long.class || type == Long.TYPE) {
-            output = array.getLong(index);
-        }
-        else if (type == Double.class || type == Double.TYPE) {
-            output = array.getDouble(index);
-        }
-        else if (type == Boolean.class || type == Boolean.TYPE) {
-            output = array.getBoolean(index);
-        }
-        else {
-            output = parseJSON(array.optJSONObject(index), type);
-        }
-
-        return output;
-    }
-
-    private Type setterGenericParameterType(Method method) {
-        Type[] types = method.getGenericParameterTypes();
-        return types.length > 0 ? types[0]: null;
-    }
-
-    private Class<?> setterParameterType(Method method) {
-        Class<?>[] types = method.getParameterTypes();
-        return types.length > 0 ? types[0]: null;
-    }
-
-    private String extractKey(Method method) {
-        String key = null;
-        if (methodIsSetter(method)) {
-            key = method.getName().substring(3);
-            key = key.substring(0, 1).toLowerCase() + key.substring(1);
-        }
-        return key;
-    }
-
-    private boolean methodIsSetter(Method method) {
-        boolean isSetter;
-        String methodName = method.getName();
-
-        // Setter must take one parameter and no return type
-        isSetter =  method.getParameterCount() == 1;
-        isSetter &= method.getReturnType().equals(Void.TYPE);
-
-        // Name convention must be set<ValueName>
-        isSetter &= methodName.length() > 3;
-        isSetter &= methodName.startsWith("set");
-        isSetter &= Character.isUpperCase(methodName.charAt(3));
-
-        return isSetter;
-    }
-    */
 }

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/test/JSONCommunicatorTest.java

@@ -268,7 +268,7 @@ public void pack_bootNotificationRequest_returnsBootNotificationRequestPayload()
     @Test
     public void pack_bootNotificationConfirmation_returnsBootNotificationConfirmationPayload() throws Exception {
         // Given
-        String expected = "{\"currentTime\":\"2016-04-28T06:41:13.720Z\",\"interval\":300,\"status\":\"Accepted\"}";
+        String expected = "{\"currentTime\":\"2016-04-28T06:41:13Z\",\"interval\":300,\"status\":\"Accepted\"}";
         BootNotificationConfirmation confirmation = new BootNotificationConfirmation();
         confirmation.setCurrentTime(createDateTimeInMillis(1461825673720L));
         confirmation.setInterval(300);