demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-02-26 10:24:46 +01:00 committed by GitHub
parent ec3f5369be
commit 6c7354b49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java
View File

@ -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 {

4
bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java
View File

@ -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);

5
bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/manager/FullDeviceManager.java
View File

@ -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));

39
bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/util/ExceptionUtils.java Normal file
View File

@ -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;
}
}

11
bundles/org.openhab.binding.innogysmarthome/src/test/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandlerTest.java
View File

@ -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"));