Merge pull request #116 from robert-s-ubi/master

Make OCPP library compatible with Android 8
ChargeTimeEU · May 7, 2020 · 0a55207 · 0a55207
2 parents 72c0f61 + 5366426
commit 0a55207
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/AsyncPromiseFulfillerDecorator.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/AsyncPromiseFulfillerDecorator.java
@@ -36,7 +36,14 @@ public class AsyncPromiseFulfillerDecorator implements PromiseFulfiller {
   @Override
   public void fulfill(
       CompletableFuture<Confirmation> promise, SessionEvents eventHandler, Request request) {
-    new Thread(() -> promiseFulfiller.fulfill(promise, eventHandler, request)).start();
+    new Thread(
+            new Runnable() {
+              @Override
+              public void run() {
+                promiseFulfiller.fulfill(promise, eventHandler, request);
+              }
+            })
+        .start();
   }
 
   public AsyncPromiseFulfillerDecorator(PromiseFulfiller promiseFulfiller) {

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceListener.java
@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 import com.sun.net.httpserver.HttpServer;
 import eu.chargetime.ocpp.model.SOAPHostInfo;
 import eu.chargetime.ocpp.model.SessionInformation;
+import eu.chargetime.ocpp.utilities.TimeoutHandler;
 import eu.chargetime.ocpp.utilities.TimeoutTimer;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -121,9 +122,12 @@ public SOAPMessage incomingRequest(SOAPMessageInfo messageInfo) {
         TimeoutTimer timeoutTimer =
             new TimeoutTimer(
                 INITIAL_TIMEOUT,
-                () -> {
-                  session.close();
-                  chargeBoxes.remove(identity);
+                new TimeoutHandler() {
+                  @Override
+                  public void timeout() {
+                    session.close();
+                    chargeBoxes.remove(identity);
+                  }
                 });
 
         // TODO: Decorator created but not used

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceReceiver.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceReceiver.java
@@ -89,11 +89,14 @@ void sendRequest(SOAPMessage message) throws NotConnectedException {
     if (!connected) throw new NotConnectedException();
 
     new Thread(
-            () -> {
-              try {
-                events.receivedMessage(soapConnection.call(message, url));
-              } catch (SOAPException e) {
-                disconnect();
+            new Runnable() {
+              @Override
+              public void run() {
+                try {
+                  events.receivedMessage(soapConnection.call(message, url));
+                } catch (SOAPException e) {
+                  disconnect();
+                }
               }
             })
         .start();

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceTransmitter.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebServiceTransmitter.java
@@ -82,13 +82,16 @@ protected void sendRequest(final SOAPMessage message) throws NotConnectedExcepti
     if (!connected) throw new NotConnectedException();
     Thread thread =
         new Thread(
-            () -> {
-              try {
-                SOAPMessage response = soapConnection.call(message, url);
-                events.receivedMessage(response);
-              } catch (SOAPException e) {
-                logger.warn("sendRequest() failed", e);
-                disconnect();
+            new Runnable() {
+              @Override
+              public void run() {
+                try {
+                  SOAPMessage response = soapConnection.call(message, url);
+                  events.receivedMessage(response);
+                } catch (SOAPException e) {
+                  logger.warn("sendRequest() failed", e);
+                  disconnect();
+                }
               }
             });
     thread.start();