[innogysmarthome] Remove org.apache.commons (#14407)

Signed-off-by: lsiepel <leosiepel@gmail.com>

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java
index 62c24320ae3a7497cf9ba0d9b2bde189befba966..351db4db727f8320eacd17d0dcc28fe752a68eda 100644 (file)
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java
@@ -15,7 +15,7 @@ package org.openhab.binding.innogysmarthome.internal.client.entity.action;
 /**
  * Special {@link Action} needed to control shutters.
  *
- * @author Marco Mans
+ * @author Marco Mans - Initial contribution
  */
 public class ShutterAction extends Action {
 

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
index 528bfb8831caaa61d3b2e11f3b6a8281f7a531b0..c82b8ae7ffc0cde29cb9c2d03c4107f717df4cb7 100644 (file)
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
@@ -32,7 +32,6 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jetty.client.HttpClient;
@@ -58,6 +57,7 @@ import org.openhab.binding.innogysmarthome.internal.listener.DeviceStatusListene
 import org.openhab.binding.innogysmarthome.internal.listener.EventListener;
 import org.openhab.binding.innogysmarthome.internal.manager.DeviceStructureManager;
 import org.openhab.binding.innogysmarthome.internal.manager.FullDeviceManager;
+import org.openhab.binding.innogysmarthome.internal.util.ExceptionUtils;
 import org.openhab.core.auth.client.oauth2.AccessTokenRefreshListener;
 import org.openhab.core.auth.client.oauth2.AccessTokenResponse;
 import org.openhab.core.auth.client.oauth2.OAuthClientService;
@@ -954,7 +954,7 @@ public class InnogyBridgeHandler extends BaseBridgeHandler
             isReinitialize = false;
             Thread.currentThread().interrupt();
         } else if (e instanceof ExecutionException) {
-            logger.debug("ExecutionException: {}", ExceptionUtils.getRootCauseMessage(e));
+            logger.debug("ExecutionException: {}", ExceptionUtils.getRootThrowable(e).getMessage());
             updateStatus(ThingStatus.OFFLINE);
         } else {
             logger.debug("Unknown exception", e);

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/manager/FullDeviceManager.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/manager/FullDeviceManager.java
index 4628c311cc6d60284e2f330a050573c98d5408f5..a50e428257edeebe22e09d32bbee6baf9f14d56d 100644 (file)
--- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/manager/FullDeviceManager.java
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/manager/FullDeviceManager.java
@@ -56,7 +56,6 @@ public class FullDeviceManager {
      * states. Calling this may take a while...
      */
     public List<Device> getFullDevices() throws IOException, ApiException, AuthenticationException {
-
         final Map<String, Location> locationMap = createLocationMap(client);
         final Map<String, Capability> capabilityMap = createCapabilityMap(client);
         final Map<String, DeviceState> deviceStateMap = createDeviceStateMap(client);
@@ -91,7 +90,6 @@ public class FullDeviceManager {
 
     private void initializeDevice(Device device, @Nullable DeviceState deviceState, Map<String, Location> locationMap,
             Map<String, Capability> capabilityMap, List<Message> messageList) {
-
         device.setDeviceState(deviceState);
 
         if (isBatteryPowered(device)) {
@@ -135,7 +133,6 @@ public class FullDeviceManager {
 
     private static Map<String, Capability> createCapabilityMap(InnogyClient client)
             throws IOException, ApiException, AuthenticationException {
-
         final Map<String, CapabilityState> capabilityStateMap = createCapabilityStateMap(client);
         final List<Capability> capabilityList = client.getCapabilities();
 
@@ -144,7 +141,6 @@ public class FullDeviceManager {
 
     private static Map<String, Capability> createCapabilityMap(String deviceId, InnogyClient client)
             throws IOException, ApiException, AuthenticationException {
-
         final Map<String, CapabilityState> capabilityStateMap = createCapabilityStateMap(client);
         final List<Capability> capabilityList = client.getCapabilitiesForDevice(deviceId);
 
@@ -167,7 +163,6 @@ public class FullDeviceManager {
 
     private static Map<String, Capability> createDeviceCapabilityMap(Device device,
             Map<String, Capability> capabilityMap) {
-
         final HashMap<String, Capability> deviceCapabilityMap = new HashMap<>();
         for (final String capabilityValue : device.getCapabilities()) {
             final Capability capability = capabilityMap.get(Link.getId(capabilityValue));

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/util/ExceptionUtils.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/util/ExceptionUtils.java
new file mode 100644 (file)
index 0000000..6761f5b
--- /dev/null
+++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/util/ExceptionUtils.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2010-2023 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.innogysmarthome.internal.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+
+/**
+ * The {@link ExceptionUtils} class defines static Exception related methods
+ *
+ * @author Leo Siepel - Initial contribution
+ */
+@NonNullByDefault
+public class ExceptionUtils {
+
+    public static Throwable getRootThrowable(Throwable throwable) {
+        List<Throwable> list = new ArrayList<>();
+        while (!list.contains(throwable)) {
+            list.add(throwable);
+            Throwable throwableLocal = throwable.getCause();
+            if (throwableLocal != null) {
+                throwable = throwableLocal;
+            }
+        }
+        return throwable;
+    }
+}

diff --git a/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java b/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java
index a07030a04110d1f4b4cfaf7f42ab944004d9eef6..83847ae0da14f688ea811e6540fd5260b3f2c02b 100644 (file)
--- a/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java
+++ b/bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java
@@ -36,6 +36,11 @@ import org.openhab.core.auth.client.oauth2.OAuthFactory;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ThingUID;
+import org.openhab.core.thing.binding.BaseThingHandler;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
 
 /**
  * @author Sven Strohschein - Initial contribution
@@ -50,6 +55,12 @@ public class InnogyBridgeHandlerTest {
 
     @BeforeEach
     public void before() throws Exception {
+        final Logger loggerBridge = (Logger) LoggerFactory.getLogger(InnogyBridgeHandler.class);
+        loggerBridge.setLevel(Level.OFF);
+
+        final Logger logerBaseHandler = (Logger) LoggerFactory.getLogger(BaseThingHandler.class);
+        logerBaseHandler.setLevel(Level.OFF);
+
         bridgeMock = mock(Bridge.class);
         when(bridgeMock.getUID()).thenReturn(new ThingUID("innogysmarthome", "bridge"));