Merge remote-tracking branch 'origin/master'

Author: danielcaro

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

@@ -0,0 +1,112 @@
+package eu.chargetime.ocpp;
+
+import org.java_websocket.WebSocketImpl;
+import org.java_websocket.drafts.Draft;
+import org.java_websocket.enums.CloseHandshakeType;
+import org.java_websocket.enums.HandshakeState;
+import org.java_websocket.exceptions.InvalidDataException;
+import org.java_websocket.exceptions.InvalidHandshakeException;
+import org.java_websocket.framing.Framedata;
+import org.java_websocket.handshake.*;
+import org.java_websocket.util.Charsetfunctions;
+
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.List;
+
+class HttpHealthCheckDraft extends Draft {
+
+    private Boolean isHttp(ClientHandshake handshakedata) {
+        String upgradeField = handshakedata.getFieldValue("Upgrade");
+        return upgradeField == null || upgradeField == "";
+    }
+
+    @Override
+    public List<ByteBuffer> createHandshake(Handshakedata handshakedata, boolean withcontent) {
+        byte[] content = Charsetfunctions.asciiBytes("<h1>OCPP-J Websocket OK</h1>");
+        byte[] header = Charsetfunctions.asciiBytes(
+                "HTTP/1.0 200 OK\r\n" +
+                        "Mime-Version: 1.0\r\n" +
+                        "Content-Type: text/html\r\n" +
+                        "Content-Length: ${content.size}\r\n" +
+                        "Connection: close\r\n" +
+                        "\r\n"
+        );
+
+        ByteBuffer bytebuffer = ByteBuffer.allocate(content.length + header.length);
+        bytebuffer.put(header);
+        bytebuffer.put(content);
+        bytebuffer.flip();
+        return Collections.singletonList(bytebuffer);
+    }
+
+    @Override
+    public HandshakeState acceptHandshakeAsClient(
+            ClientHandshake request, ServerHandshake response
+    ) throws InvalidHandshakeException {
+        throw new InvalidHandshakeException("This draft can't be used on a client");
+    }
+
+    @Override
+    public HandshakeState acceptHandshakeAsServer(
+            ClientHandshake handshakedata
+    ) throws InvalidHandshakeException {
+        return (isHttp(handshakedata)) ? HandshakeState.MATCHED : HandshakeState.NOT_MATCHED;
+    }
+
+    @Override
+    public ByteBuffer createBinaryFrame(Framedata framedata) {
+        return null;
+    }
+
+    @Override
+    public List<Framedata> createFrames(ByteBuffer binary, boolean mask) {
+        return null;
+    }
+
+    @Override
+    public List<Framedata> createFrames(String text, boolean mask) {
+        return null;
+    }
+
+    @Override
+    public void processFrame(
+            WebSocketImpl webSocketImpl, Framedata frame
+    ) throws InvalidDataException {
+        throw new InvalidDataException(0, "This draft can't be used on a client");
+    }
+
+    @Override
+    public void reset() {
+        // Nothing to Do
+    }
+
+    @Override
+    public ClientHandshakeBuilder postProcessHandshakeRequestAsClient(
+            ClientHandshakeBuilder request
+    ) throws InvalidHandshakeException {
+        throw new InvalidHandshakeException("This draft can't be used on a client");
+    }
+
+    @Override
+    public HandshakeBuilder postProcessHandshakeResponseAsServer(
+            ClientHandshake request, ServerHandshakeBuilder response
+    ) throws InvalidHandshakeException {
+        return response;
+    }
+
+    @Override
+    public List<Framedata> translateFrame(ByteBuffer buffer) throws InvalidDataException {
+        throw new InvalidHandshakeException("This draft doesn't work with frames");
+    }
+
+    @Override
+    public CloseHandshakeType getCloseHandshakeType() {
+        return CloseHandshakeType.NONE;
+    }
+
+    @Override
+    public Draft copyInstance() {
+        return this;
+    }
+}

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

@@ -68,8 +68,8 @@ public JSONServer(ServerCoreProfile coreProfile, JSONConfiguration configuration
     protocols.add(new Protocol("ocpp1.6"));
     protocols.add(new Protocol(""));
     draftOcppOnly = new Draft_6455(Collections.emptyList(), protocols);
-
-    this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly);
+    logger.info("JSONServer 1.6 with HttpHealthCheckDraft");
+    this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly, new HttpHealthCheckDraft());
     server = new Server(this.listener, featureRepository, new PromiseRepository());
     featureRepository.addFeatureProfile(coreProfile);
   }

ocpp-v2_0/src/main/java/eu/chargetime/ocpp/JSONServer.java

@@ -65,7 +65,7 @@ public JSONServer(JSONConfiguration configuration) {
     protocols.add(new Protocol("ocpp1.6"));
     protocols.add(new Protocol(""));
     draftOcppOnly = new Draft_6455(Collections.emptyList(), protocols);
-
+    logger.info("JSONServer 2.0 without HttpHealthCheckDraft");
     this.listener = new WebSocketListener(sessionFactory, configuration, draftOcppOnly);
     server = new Server(this.listener, featureRepository, new PromiseRepository());
   }