[WebThing] If WebThing network connection is crashed, WebThing will n…

…ot be reconnected. (openhab#10579) * Unnecessary NonNull annotations removed Signed-off-by: Gregor Roth <gregor.roth@web.de> Signed-off-by: gregor roth <gregor.roth@web.de> * Bugfix "If network connection is interrupted, WebThing will not be reconnected." Due to the variable webThingURI is unset, re connection fails Signed-off-by: Gregor Roth <gregor.roth@web.de> Signed-off-by: gregor roth <gregor.roth@web.de> * webThingURI will be loaded in a lazy way Signed-off-by: Gregor Roth <gregor.roth@web.de> Signed-off-by: gregor roth <gregor.roth@web.de>
bosch-io · May 9, 2021 · 9c51e73 · 9c51e73
1 parent cab9c9c
commit 9c51e73
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/...binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java b/...binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java
@@ -97,10 +97,9 @@ public void initialize() {
         // perform connect in background
         scheduler.execute(() -> {
             // WebThing URI present?
-            var uri = toUri(getConfigAs(WebThingConfiguration.class).webThingURI);
-            if (uri != null) {
-                logger.debug("try to connect WebThing {}", uri);
-                var connected = tryReconnect(uri);
+            if (getWebThingURI() != null) {
+                logger.debug("try to connect WebThing {}", webThingURI);
+                var connected = tryReconnect();
                 if (connected) {
                     logger.debug("WebThing {} connected", getWebThingLabel());
                 }
@@ -118,6 +117,13 @@ public void initialize() {
                 .ifPresent(future -> future.cancel(true));
     }
 
+    private @Nullable URI getWebThingURI() {
+        if (webThingURI == null) {
+            webThingURI = toUri(getConfigAs(WebThingConfiguration.class).webThingURI);
+        }
+        return webThingURI;
+    }
+
     private @Nullable URI toUri(@Nullable String uri) {
         try {
             if (uri != null) {
@@ -142,10 +148,11 @@ public void dispose() {
         }
     }
 
-    private boolean tryReconnect(@Nullable URI uri) {
+    private boolean tryReconnect() {
         if (isActivated.get()) { // will try reconnect only, if activated
             try {
                 // create the client-side WebThing representation
+                var uri = getWebThingURI();
                 if (uri != null) {
                     var webThing = ConsumedThingFactory.instance().create(webSocketClient, httpClient, uri, scheduler,
                             this::onError);
@@ -258,7 +265,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
             itemChangedListenerMap.getOrDefault(channelUID, EMPTY_ITEM_CHANGED_LISTENER).onItemStateChanged(channelUID,
                     (State) command);
         } else if (command instanceof RefreshType) {
-            tryReconnect(webThingURI);
+            tryReconnect();
         }
     }
 
@@ -282,15 +289,15 @@ private void checkWebThingConnection() {
         // try reconnect, if necessary
         if (isDisconnected() || (isOnline() && !isAlive())) {
             logger.debug("try reconnecting WebThing {}", getWebThingLabel());
-            if (tryReconnect(webThingURI)) {
+            if (tryReconnect()) {
                 logger.debug("WebThing {} reconnected", getWebThingLabel());
             }
 
         } else {
             // force reconnecting periodically, to fix erroneous states that occurs for unknown reasons
             var elapsedSinceLastReconnect = Duration.between(lastReconnect.get(), Instant.now());
             if (isOnline() && (elapsedSinceLastReconnect.getSeconds() > RECONNECT_PERIOD.getSeconds())) {
-                if (tryReconnect(webThingURI)) {
+                if (tryReconnect()) {
                     logger.debug("WebThing {} reconnected. Initiated by periodic reconnect", getWebThingLabel());
                 } else {
                     logger.debug("could not reconnect WebThing {} (periodic reconnect failed). Next trial in {} sec",

diff --git a/...g/src/main/java/org/openhab/binding/webthing/internal/client/WebSocketConnectionImpl.java b/...g/src/main/java/org/openhab/binding/webthing/internal/client/WebSocketConnectionImpl.java
@@ -26,7 +26,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.websocket.api.Session;
@@ -88,7 +87,7 @@ public void close() {
     }
 
     @Override
-    public void observeProperty(@NonNull String propertyName, @NonNull BiConsumer<String, Object> listener) {
+    public void observeProperty(String propertyName, BiConsumer<String, Object> listener) {
         propertyChangedListeners.put(propertyName, listener);
     }
 

diff --git a/...ing.webthing/src/test/java/org/openhab/binding/webthing/internal/client/WebthingTest.java b/...ing.webthing/src/test/java/org/openhab/binding/webthing/internal/client/WebthingTest.java
@@ -34,7 +34,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
@@ -289,8 +288,8 @@ public static class TestWebsocketConnectionFactory implements WebSocketConnectio
         public final AtomicReference<WebSocketImpl> webSocketRef = new AtomicReference<>();
 
         @Override
-        public WebSocketConnection create(@NonNull URI webSocketURI, @NonNull ScheduledExecutorService executor,
-                @NonNull Consumer<String> errorHandler, @NonNull Duration pingPeriod) {
+        public WebSocketConnection create(URI webSocketURI, ScheduledExecutorService executor,
+                Consumer<String> errorHandler, Duration pingPeriod) {
             var webSocketConnection = new WebSocketConnectionImpl(executor, errorHandler, pingPeriod);
             var webSocket = new WebSocketImpl(webSocketConnection);
             webSocketRef.set(webSocket);