From 7855f81760ae6625b974f5d9147344026aa1b339 Mon Sep 17 00:00:00 2001 From: J-N-K Date: Wed, 20 Jul 2022 20:40:42 +0200 Subject: [PATCH] Fix build (#13150) * Fix build * fix itest Signed-off-by: Jan N. Klug --- .../internal/config/servlet/CreateBridgeServlet.java | 7 ++++--- .../internal/config/servlet/CreateBridgeServletTest.java | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServlet.java b/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServlet.java index fe8dc9c98..764c016e2 100644 --- a/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServlet.java +++ b/bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServlet.java @@ -127,10 +127,11 @@ public final class CreateBridgeServlet extends AbstractRedirectionServlet { .withProperty(Thing.PROPERTY_MODEL_ID, MIELE_CLOUD_BRIDGE_NAME) .withProperty(MieleCloudBindingConstants.CONFIG_PARAM_LOCALE, locale) .withProperty(MieleCloudBindingConstants.CONFIG_PARAM_EMAIL, email).build(); - if (inbox.add(result)) { - return pairBridge(bridgeUid); - } else { + if (thingRegistry.get(bridgeUid) != null) { return reconfigureBridge(bridgeUid); + } else { + inbox.add(result); + return pairBridge(bridgeUid); } } diff --git a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServletTest.java b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServletTest.java index af39baa31..d86b7224c 100644 --- a/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServletTest.java +++ b/itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/config/servlet/CreateBridgeServletTest.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.openhab.binding.mielecloud.internal.MieleCloudBindingConstants; import org.openhab.binding.mielecloud.internal.auth.OAuthTokenRefresher; import org.openhab.binding.mielecloud.internal.config.MieleCloudConfigService; +import org.openhab.binding.mielecloud.internal.config.exception.BridgeReconfigurationFailedException; import org.openhab.binding.mielecloud.internal.util.AbstractConfigFlowTest; import org.openhab.binding.mielecloud.internal.util.MieleCloudBindingIntegrationTestConstants; import org.openhab.binding.mielecloud.internal.util.Website; @@ -48,7 +49,6 @@ public class CreateBridgeServletTest extends AbstractConfigFlowTest { assertNotNull(createBridgeServlet); Inbox inbox = mock(Inbox.class); - when(inbox.add(any())).thenReturn(true); when(inbox.approve(any(), anyString(), anyString())).thenReturn(null); setPrivate(Objects.requireNonNull(createBridgeServlet), "inbox", inbox); @@ -74,11 +74,10 @@ public class CreateBridgeServletTest extends AbstractConfigFlowTest { assertNotNull(createBridgeServlet); Inbox inbox = mock(Inbox.class); - when(inbox.add(any())).thenReturn(false); setPrivate(Objects.requireNonNull(createBridgeServlet), "inbox", inbox); ThingRegistry thingRegistry = mock(ThingRegistry.class); - when(thingRegistry.get(any())).thenReturn(null); + when(thingRegistry.get(any())).thenThrow(new BridgeReconfigurationFailedException("")); setPrivate(Objects.requireNonNull(createBridgeServlet), "thingRegistry", thingRegistry); // when: @@ -104,7 +103,6 @@ public class CreateBridgeServletTest extends AbstractConfigFlowTest { assertNotNull(createBridgeServlet); Inbox inbox = mock(Inbox.class); - when(inbox.add(any())).thenReturn(false); setPrivate(Objects.requireNonNull(createBridgeServlet), "inbox", inbox); Thing bridge = mock(Thing.class);