diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java index d80f87208..4ed6d58ee 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AccountServlet.java @@ -20,7 +20,9 @@ import java.net.URISyntaxException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import javax.net.ssl.HttpsURLConnection; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoControlHandlerFactory.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoControlHandlerFactory.java index 01ba2c4e7..e67effdd5 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoControlHandlerFactory.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoControlHandlerFactory.java @@ -14,7 +14,14 @@ package org.openhab.binding.amazonechocontrol.internal; import static org.openhab.binding.amazonechocontrol.internal.AmazonEchoControlBindingConstants.*; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoDynamicStateDescriptionProvider.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoDynamicStateDescriptionProvider.java index f753873dd..fcf6933a8 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoDynamicStateDescriptionProvider.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/AmazonEchoDynamicStateDescriptionProvider.java @@ -14,7 +14,10 @@ package org.openhab.binding.amazonechocontrol.internal; import static org.openhab.binding.amazonechocontrol.internal.AmazonEchoControlBindingConstants.*; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java index 50ac5c8c7..5878e5d8b 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/Connection.java @@ -26,7 +26,20 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Random; +import java.util.Scanner; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java index 8615ef193..b25cdb286 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/discovery/SmartHomeDevicesDiscovery.java @@ -14,7 +14,12 @@ package org.openhab.binding.amazonechocontrol.internal.discovery; import static org.openhab.binding.amazonechocontrol.internal.AmazonEchoControlBindingConstants.*; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java index 19077a583..9929c2ddf 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/AccountHandler.java @@ -17,7 +17,15 @@ import java.net.URISyntaxException; import java.net.URLEncoder; import java.net.UnknownHostException; import java.time.ZonedDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledFuture; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java index 342ecb323..fbe63f086 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/EchoHandler.java @@ -21,7 +21,12 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/SmartHomeDeviceHandler.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/SmartHomeDeviceHandler.java index c2bba5ad7..4a814a26b 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/SmartHomeDeviceHandler.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/handler/SmartHomeDeviceHandler.java @@ -15,7 +15,16 @@ package org.openhab.binding.amazonechocontrol.internal.handler; import static org.openhab.binding.amazonechocontrol.internal.AmazonEchoControlBindingConstants.DEVICE_PROPERTY_ID; import static org.openhab.binding.amazonechocontrol.internal.smarthome.Constants.SUPPORTED_INTERFACES; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.function.Function; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -50,7 +59,11 @@ import org.openhab.core.types.StateDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; /** * @author Lukas Knoeller - Initial contribution diff --git a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerBase.java b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerBase.java index 7bd685fa5..1f110191f 100644 --- a/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerBase.java +++ b/bundles/org.openhab.binding.amazonechocontrol/src/main/java/org/openhab/binding/amazonechocontrol/internal/smarthome/HandlerBase.java @@ -13,7 +13,12 @@ package org.openhab.binding.amazonechocontrol.internal.smarthome; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java index 1ddb6e642..ece2a86e9 100644 --- a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java +++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDevice.java @@ -12,7 +12,9 @@ */ package org.openhab.binding.androiddebugbridge.internal; -import java.io.*; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; import java.net.InetSocketAddress; import java.net.Socket; import java.net.URLEncoder; @@ -22,7 +24,11 @@ import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; import java.util.Arrays; import java.util.Base64; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -98,8 +104,9 @@ public class AndroidDebugBridgeDevice { public void startPackage(String packageName) throws InterruptedException, AndroidDebugBridgeDeviceException, TimeoutException, ExecutionException { var out = runAdbShell("monkey", "--pct-syskeys", "0", "-p", packageName, "-v", "1"); - if (out.contains("monkey aborted")) + if (out.contains("monkey aborted")) { throw new AndroidDebugBridgeDeviceException("Unable to open package"); + } } public void stopPackage(String packageName) @@ -114,8 +121,9 @@ public class AndroidDebugBridgeDevice { var lineParts = targetLine.split(" "); if (lineParts.length >= 2) { var packageActivityName = lineParts[lineParts.length - 2]; - if (packageActivityName.contains("/")) + if (packageActivityName.contains("/")) { return packageActivityName.split("/")[0]; + } } throw new AndroidDebugBridgeDeviceReadException("Unable to read package name"); } @@ -222,8 +230,9 @@ public class AndroidDebugBridgeDevice { String volumeResp = runAdbShell("media", "volume", "--show", "--stream", String.valueOf(stream), "--get", "|", "grep", "volume"); Matcher matcher = VOLUME_PATTERN.matcher(volumeResp); - if (!matcher.find()) + if (!matcher.find()) { throw new AndroidDebugBridgeDeviceReadException("Unable to get volume info"); + } var volumeInfo = new VolumeInfo(Integer.parseInt(matcher.group("current")), Integer.parseInt(matcher.group("min")), Integer.parseInt(matcher.group("max"))); logger.debug("Device {}:{} VolumeInfo: current {}, min {}, max {}", this.ip, this.port, volumeInfo.current, diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDiscoveryService.java b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDiscoveryService.java index d5aad994b..837716b21 100644 --- a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeDiscoveryService.java @@ -19,7 +19,11 @@ import java.net.Inet4Address; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; -import java.util.*; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import java.util.function.Function; diff --git a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java index 410e4887e..a88daa25e 100644 --- a/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java +++ b/bundles/org.openhab.binding.androiddebugbridge/src/main/java/org/openhab/binding/androiddebugbridge/internal/AndroidDebugBridgeHandler.java @@ -23,7 +23,13 @@ import java.util.concurrent.TimeoutException; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.NextPreviousType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.PlayPauseType; +import org.openhab.core.library.types.RewindFastforwardType; +import org.openhab.core.library.types.StringType; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingStatus; @@ -271,8 +277,9 @@ public class AndroidDebugBridgeHandler extends BaseThingHandler { public void checkConnection() { var currentConfig = config; - if (currentConfig == null) + if (currentConfig == null) { return; + } try { logger.debug("Refresh device {} status", currentConfig.ip); if (adbConnection.isConnected()) { diff --git a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java index de705216a..ebca1fee9 100644 --- a/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java +++ b/bundles/org.openhab.binding.automower/src/main/java/org/openhab/binding/automower/internal/things/AutomowerHandler.java @@ -14,7 +14,8 @@ package org.openhab.binding.automower.internal.things; import static org.openhab.binding.automower.internal.AutomowerBindingConstants.*; -import java.time.*; +import java.time.Instant; +import java.time.ZonedDateTime; import java.util.Collection; import java.util.Collections; import java.util.Map; @@ -335,7 +336,7 @@ public class AutomowerHandler extends BaseThingHandler { * Timestamp returned by the API doesn't have offset and it always in the current time zone - it can be treated as * UTC. * Method builds a ZonedDateTime with same hour value but in the current system timezone. - * + * * @param timestamp - Automower API timestamp * @return ZonedDateTime in system timezone */ diff --git a/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/airbase/AirbaseZoneInfo.java b/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/airbase/AirbaseZoneInfo.java index 9c000667e..9cc630973 100644 --- a/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/airbase/AirbaseZoneInfo.java +++ b/bundles/org.openhab.binding.daikin/src/main/java/org/openhab/binding/daikin/internal/api/airbase/AirbaseZoneInfo.java @@ -50,8 +50,9 @@ public class AirbaseZoneInfo { String[] zones = zoneinfo.split("%3b"); - for (int i = 1; i < 9; i++) + for (int i = 1; i < 9; i++) { info.zone[i] = "1".equals(zones[i - 1]); + } return info; } diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/DeconzHandlerFactory.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/DeconzHandlerFactory.java index 6693f61fd..93f5b974f 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/DeconzHandlerFactory.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/DeconzHandlerFactory.java @@ -18,9 +18,20 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.deconz.internal.handler.*; +import org.openhab.binding.deconz.internal.handler.DeconzBridgeHandler; +import org.openhab.binding.deconz.internal.handler.GroupThingHandler; +import org.openhab.binding.deconz.internal.handler.LightThingHandler; +import org.openhab.binding.deconz.internal.handler.SensorThermostatThingHandler; +import org.openhab.binding.deconz.internal.handler.SensorThingHandler; import org.openhab.binding.deconz.internal.netutils.AsyncHttpClient; -import org.openhab.binding.deconz.internal.types.*; +import org.openhab.binding.deconz.internal.types.GroupType; +import org.openhab.binding.deconz.internal.types.GroupTypeDeserializer; +import org.openhab.binding.deconz.internal.types.LightType; +import org.openhab.binding.deconz.internal.types.LightTypeDeserializer; +import org.openhab.binding.deconz.internal.types.ResourceType; +import org.openhab.binding.deconz.internal.types.ResourceTypeDeserializer; +import org.openhab.binding.deconz.internal.types.ThermostatMode; +import org.openhab.binding.deconz.internal.types.ThermostatModeGsonTypeAdapter; import org.openhab.core.io.net.http.HttpClientFactory; import org.openhab.core.io.net.http.WebSocketFactory; import org.openhab.core.thing.Bridge; diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java index 3301aaa11..a844b6b63 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/DeconzBridgeHandler.java @@ -16,7 +16,12 @@ import static org.openhab.binding.deconz.internal.BindingConstants.*; import static org.openhab.binding.deconz.internal.Util.buildUrl; import java.net.SocketTimeoutException; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.ScheduledFuture; diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/GroupThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/GroupThingHandler.java index 2763893ff..b3b455a9a 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/GroupThingHandler.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/GroupThingHandler.java @@ -26,7 +26,11 @@ import org.openhab.binding.deconz.internal.dto.GroupAction; import org.openhab.binding.deconz.internal.dto.GroupMessage; import org.openhab.binding.deconz.internal.dto.GroupState; import org.openhab.binding.deconz.internal.types.ResourceType; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.StringType; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingStatus; diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java index 81cce1704..a25c62af9 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java @@ -16,7 +16,10 @@ import static org.openhab.binding.deconz.internal.BindingConstants.*; import static org.openhab.binding.deconz.internal.Util.*; import java.math.BigDecimal; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; @@ -28,7 +31,15 @@ import org.openhab.binding.deconz.internal.dto.DeconzBaseMessage; import org.openhab.binding.deconz.internal.dto.LightMessage; import org.openhab.binding.deconz.internal.dto.LightState; import org.openhab.binding.deconz.internal.types.ResourceType; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.IncreaseDecreaseType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StopMoveType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.library.types.UpDownType; import org.openhab.core.library.unit.Units; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; @@ -37,7 +48,13 @@ import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.binding.builder.ChannelBuilder; import org.openhab.core.thing.binding.builder.ThingBuilder; -import org.openhab.core.types.*; +import org.openhab.core.types.Command; +import org.openhab.core.types.CommandDescriptionBuilder; +import org.openhab.core.types.CommandOption; +import org.openhab.core.types.RefreshType; +import org.openhab.core.types.StateDescription; +import org.openhab.core.types.StateDescriptionFragmentBuilder; +import org.openhab.core.types.UnDefType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java index cf04565a5..78179b424 100644 --- a/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java +++ b/bundles/org.openhab.binding.deconz/src/test/java/org/openhab/binding/deconz/DeconzTest.java @@ -38,7 +38,14 @@ import org.openhab.binding.deconz.internal.Util; import org.openhab.binding.deconz.internal.discovery.ThingDiscoveryService; import org.openhab.binding.deconz.internal.dto.BridgeFullState; import org.openhab.binding.deconz.internal.handler.DeconzBridgeHandler; -import org.openhab.binding.deconz.internal.types.*; +import org.openhab.binding.deconz.internal.types.GroupType; +import org.openhab.binding.deconz.internal.types.GroupTypeDeserializer; +import org.openhab.binding.deconz.internal.types.LightType; +import org.openhab.binding.deconz.internal.types.LightTypeDeserializer; +import org.openhab.binding.deconz.internal.types.ResourceType; +import org.openhab.binding.deconz.internal.types.ResourceTypeDeserializer; +import org.openhab.binding.deconz.internal.types.ThermostatMode; +import org.openhab.binding.deconz.internal.types.ThermostatModeGsonTypeAdapter; import org.openhab.core.config.discovery.DiscoveryListener; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.thing.Bridge; diff --git a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java index 7e4287dc3..acd443df9 100644 --- a/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java +++ b/bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java @@ -29,7 +29,12 @@ import org.openhab.binding.enigma2.internal.Enigma2Client; import org.openhab.binding.enigma2.internal.Enigma2Configuration; import org.openhab.binding.enigma2.internal.Enigma2RemoteKey; import org.openhab.binding.enigma2.internal.actions.Enigma2Actions; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.NextPreviousType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.PlayPauseType; +import org.openhab.core.library.types.StringType; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingStatus; @@ -293,7 +298,7 @@ public class Enigma2Handler extends BaseThingHandler { /** * Getter for Test-Injection - * + * * @return Enigma2Client. */ Optional getEnigma2Client() { diff --git a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_12/A5_12.java b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_12/A5_12.java index 9e8c57566..7cf749e21 100644 --- a/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_12/A5_12.java +++ b/bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_12/A5_12.java @@ -122,8 +122,9 @@ public abstract class A5_12 extends _4BSMessage { Function getCurrentStateFunc, Configuration config) { EnOceanChannelTariffInfoConfig c = config.as(EnOceanChannelTariffInfoConfig.class); - if (c.tariff != getTariffInfo()) + if (c.tariff != getTariffInfo()) { return UnDefType.UNDEF; + } switch (channelTypeId) { case CHANNEL_INSTANTPOWER: diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java index 972ec3fd7..cc6d38e78 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartImpl.java @@ -12,8 +12,19 @@ */ package org.openhab.binding.gardena.internal; -import java.util.*; -import java.util.concurrent.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -31,7 +42,13 @@ import org.openhab.binding.gardena.internal.exception.GardenaDeviceNotFoundExcep import org.openhab.binding.gardena.internal.exception.GardenaException; import org.openhab.binding.gardena.internal.model.DataItemDeserializer; import org.openhab.binding.gardena.internal.model.dto.Device; -import org.openhab.binding.gardena.internal.model.dto.api.*; +import org.openhab.binding.gardena.internal.model.dto.api.CreateWebSocketRequest; +import org.openhab.binding.gardena.internal.model.dto.api.DataItem; +import org.openhab.binding.gardena.internal.model.dto.api.LocationDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.LocationResponse; +import org.openhab.binding.gardena.internal.model.dto.api.LocationsResponse; +import org.openhab.binding.gardena.internal.model.dto.api.PostOAuth2Response; +import org.openhab.binding.gardena.internal.model.dto.api.WebSocketCreatedResponse; import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommand; import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommandRequest; import org.openhab.core.io.net.http.HttpClientFactory; @@ -263,6 +280,7 @@ public class GardenaSmartImpl implements GardenaSmart, GardenaSmartWebSocketList /** * Stops the client. */ + @Override public void dispose() { logger.debug("Disposing GardenaSmart"); diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java index f003a8bf9..75a484b02 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/GardenaSmartWebSocket.java @@ -24,7 +24,12 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.websocket.api.Session; -import org.eclipse.jetty.websocket.api.annotations.*; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketFrame; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage; +import org.eclipse.jetty.websocket.api.annotations.WebSocket; import org.eclipse.jetty.websocket.api.extensions.Frame; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.common.WebSocketSession; diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java index 79b73c29f..4343e8440 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaAccountHandler.java @@ -28,7 +28,13 @@ import org.openhab.binding.gardena.internal.model.dto.Device; import org.openhab.binding.gardena.internal.util.UidUtils; import org.openhab.core.io.net.http.HttpClientFactory; import org.openhab.core.io.net.http.WebSocketFactory; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingUID; import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.thing.binding.ThingHandlerService; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaThingHandler.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaThingHandler.java index 2be774a0b..94f21fab9 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaThingHandler.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/handler/GardenaThingHandler.java @@ -13,10 +13,6 @@ package org.openhab.binding.gardena.internal.handler; import static org.openhab.binding.gardena.internal.GardenaBindingConstants.*; -import static org.openhab.binding.gardena.internal.model.dto.command.MowerCommand.MowerControl; -import static org.openhab.binding.gardena.internal.model.dto.command.PowerSocketCommand.PowerSocketControl; -import static org.openhab.binding.gardena.internal.model.dto.command.ValveCommand.ValveControl; -import static org.openhab.binding.gardena.internal.model.dto.command.ValveSetCommand.ValveSetControl; import java.time.ZonedDateTime; import java.util.Date; @@ -32,13 +28,30 @@ import org.openhab.binding.gardena.internal.exception.GardenaDeviceNotFoundExcep import org.openhab.binding.gardena.internal.exception.GardenaException; import org.openhab.binding.gardena.internal.model.dto.Device; import org.openhab.binding.gardena.internal.model.dto.api.DataItem; -import org.openhab.binding.gardena.internal.model.dto.command.*; +import org.openhab.binding.gardena.internal.model.dto.command.GardenaCommand; +import org.openhab.binding.gardena.internal.model.dto.command.MowerCommand; +import org.openhab.binding.gardena.internal.model.dto.command.MowerCommand.MowerControl; +import org.openhab.binding.gardena.internal.model.dto.command.PowerSocketCommand; +import org.openhab.binding.gardena.internal.model.dto.command.PowerSocketCommand.PowerSocketControl; +import org.openhab.binding.gardena.internal.model.dto.command.ValveCommand; +import org.openhab.binding.gardena.internal.model.dto.command.ValveCommand.ValveControl; +import org.openhab.binding.gardena.internal.model.dto.command.ValveSetCommand; +import org.openhab.binding.gardena.internal.model.dto.command.ValveSetCommand.ValveSetControl; import org.openhab.binding.gardena.internal.util.PropertyUtils; import org.openhab.binding.gardena.internal.util.StringUtils; import org.openhab.binding.gardena.internal.util.UidUtils; import org.openhab.core.i18n.TimeZoneProvider; -import org.openhab.core.library.types.*; -import org.openhab.core.thing.*; +import org.openhab.core.library.types.DateTimeType; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.thing.binding.ThingHandler; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemDeserializer.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemDeserializer.java index 7c512cfa0..7c738bda0 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemDeserializer.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemDeserializer.java @@ -19,7 +19,13 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.gardena.internal.exception.GardenaException; import org.openhab.binding.gardena.internal.model.dto.api.DataItem; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; /** * Custom deserializer for Gardena DataItems. diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemFactory.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemFactory.java index dfd68b33a..afb8d5ae8 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemFactory.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/DataItemFactory.java @@ -14,7 +14,15 @@ package org.openhab.binding.gardena.internal.model; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.gardena.internal.exception.GardenaException; -import org.openhab.binding.gardena.internal.model.dto.api.*; +import org.openhab.binding.gardena.internal.model.dto.api.CommonServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.DataItem; +import org.openhab.binding.gardena.internal.model.dto.api.DeviceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.LocationDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.MowerServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.PowerSocketServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.SensorServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.ValveServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.ValveSetServiceDataItem; /** * Creates the dataItem object based on the device type. diff --git a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java index 8d8dea835..0ef9b2ceb 100644 --- a/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java +++ b/bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java @@ -19,7 +19,15 @@ import java.util.HashMap; import java.util.Map; import org.openhab.binding.gardena.internal.exception.GardenaException; -import org.openhab.binding.gardena.internal.model.dto.api.*; +import org.openhab.binding.gardena.internal.model.dto.api.CommonServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.DataItem; +import org.openhab.binding.gardena.internal.model.dto.api.DeviceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.LocationDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.MowerServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.PowerSocketServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.SensorServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.ValveServiceDataItem; +import org.openhab.binding.gardena.internal.model.dto.api.ValveSetServiceDataItem; import org.openhab.binding.gardena.internal.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bundles/org.openhab.binding.gpio/src/main/java/org/openhab/binding/gpio/internal/handler/PigpioRemoteHandler.java b/bundles/org.openhab.binding.gpio/src/main/java/org/openhab/binding/gpio/internal/handler/PigpioRemoteHandler.java index 2880fe845..993b66dc3 100644 --- a/bundles/org.openhab.binding.gpio/src/main/java/org/openhab/binding/gpio/internal/handler/PigpioRemoteHandler.java +++ b/bundles/org.openhab.binding.gpio/src/main/java/org/openhab/binding/gpio/internal/handler/PigpioRemoteHandler.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.gpio.internal.handler; -import static org.openhab.binding.gpio.internal.GPIOBindingConstants.CHANNEL_TYPE_DIGITAL_INPUT; -import static org.openhab.binding.gpio.internal.GPIOBindingConstants.CHANNEL_TYPE_DIGITAL_OUTPUT; +import static org.openhab.binding.gpio.internal.GPIOBindingConstants.*; import java.util.HashMap; import java.util.Map; @@ -23,7 +22,10 @@ import org.openhab.binding.gpio.internal.NoGpioIdException; import org.openhab.binding.gpio.internal.configuration.GPIOInputConfiguration; import org.openhab.binding.gpio.internal.configuration.GPIOOutputConfiguration; import org.openhab.binding.gpio.internal.configuration.PigpioConfiguration; -import org.openhab.core.thing.*; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.thing.type.ChannelTypeUID; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerProfileFactory.java b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerProfileFactory.java index 0f8dc3d58..0b37f984f 100644 --- a/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerProfileFactory.java +++ b/bundles/org.openhab.binding.gpstracker/src/main/java/org/openhab/binding/gpstracker/internal/profile/GPSTrackerProfileFactory.java @@ -24,7 +24,16 @@ import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.gpstracker.internal.GPSTrackerBindingConstants; import org.openhab.core.library.CoreItemFactory; import org.openhab.core.thing.Channel; -import org.openhab.core.thing.profiles.*; +import org.openhab.core.thing.profiles.Profile; +import org.openhab.core.thing.profiles.ProfileAdvisor; +import org.openhab.core.thing.profiles.ProfileCallback; +import org.openhab.core.thing.profiles.ProfileContext; +import org.openhab.core.thing.profiles.ProfileFactory; +import org.openhab.core.thing.profiles.ProfileType; +import org.openhab.core.thing.profiles.ProfileTypeBuilder; +import org.openhab.core.thing.profiles.ProfileTypeProvider; +import org.openhab.core.thing.profiles.ProfileTypeUID; +import org.openhab.core.thing.profiles.TriggerProfileType; import org.openhab.core.thing.type.ChannelType; import org.openhab.core.thing.type.ChannelTypeUID; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/api/ShadePosition.java b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/api/ShadePosition.java index 615bfc401..a61d04c37 100644 --- a/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/api/ShadePosition.java +++ b/bundles/org.openhab.binding.hdpowerview/src/main/java/org/openhab/binding/hdpowerview/internal/api/ShadePosition.java @@ -17,7 +17,8 @@ import static org.openhab.binding.hdpowerview.internal.api.CoordinateSystem.*; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.core.library.types.PercentType; -import org.openhab.core.types.*; +import org.openhab.core.types.State; +import org.openhab.core.types.UnDefType; /** * The position of a single shade, as returned by the HD PowerView hub @@ -35,7 +36,7 @@ public class ShadePosition { /** * Secondary actuator position - * + * * here we have to use Integer objects rather than just int primitives because * these are secondary optional position elements in the JSON payload, so the * GSON de-serializer might leave them as null @@ -46,7 +47,7 @@ public class ShadePosition { /** * Create a ShadePosition position instance with just a primary actuator * position - * + * * @param coordSys the Coordinate System to be used * @param percent the percentage position within that Coordinate System * @return the ShadePosition instance @@ -58,7 +59,7 @@ public class ShadePosition { /** * Create a ShadePosition position instance with both a primary and a secondary * actuator position - * + * * @param primaryCoordSys the Coordinate System to be used for the primary * position * @param primaryPercent the percentage position for primary position @@ -75,7 +76,7 @@ public class ShadePosition { /** * Constructor for ShadePosition position with both a primary and a secondary * actuator position - * + * * @param primaryCoordSys the Coordinate System to be used for the primary * position * @param primaryPercent the percentage position for primary position @@ -92,7 +93,7 @@ public class ShadePosition { /** * For a given Actuator Class and Coordinate System, map the ShadePosition's * state to an OpenHAB State - * + * * @param actuatorClass the requested Actuator Class * @param coordSys the requested Coordinate System * @return the corresponding OpenHAB State @@ -110,7 +111,7 @@ public class ShadePosition { /** * Determine the Coordinate System used for the given Actuator Class (if any) - * + * * @param actuatorClass the requested Actuator Class * @return the Coordinate System used for that Actuator Class, or ERROR_UNKNOWN * if the Actuator Class is not implemented @@ -170,7 +171,7 @@ public class ShadePosition { * * All these types use the same coordinate system; which is inverted in relation * to that of OpenHAB - * + * * If the slats have a defined position then the shade position must by * definition be 100% */ @@ -180,11 +181,11 @@ public class ShadePosition { case VANE_COORDS: /* * Vane angle of the primary rail of a bottom-up single action shade - * + * * If the shades are not open, the vane position is undefined; if the the shades * are exactly open then the vanes are at zero; otherwise return the actual vane * position itself - * + * * note: sometimes the hub may return a value of position1 > MAX_VANE (seems to * be a bug in the hub) so we avoid an out of range exception via the Math.min() * function below.. @@ -207,7 +208,7 @@ public class ShadePosition { case ZERO_IS_OPEN: /* * Secondary, upper, top-down rail of a dual action shade - * + * * Uses a coordinate system that is NOT inverted in relation to OpenHAB */ position2 = Integer.valueOf((int) Math.round(percent.doubleValue() / 100 * MAX_SHADE)); @@ -231,7 +232,7 @@ public class ShadePosition { case ZERO_IS_OPEN: /* * Secondary, upper, top-down rail of a dual action shade - * + * * Uses a coordinate system that is NOT inverted in relation to OpenHAB */ if (posKind2.intValue() != 3) { diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/HeosChannelHandlerFactory.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/HeosChannelHandlerFactory.java index bba43620c..dbed9ec2a 100644 --- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/HeosChannelHandlerFactory.java +++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/HeosChannelHandlerFactory.java @@ -19,7 +19,26 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.heos.internal.handler.*; +import org.openhab.binding.heos.internal.handler.HeosBridgeHandler; +import org.openhab.binding.heos.internal.handler.HeosChannelHandler; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerBuildGroup; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerClearQueue; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerControl; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerFavorite; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerGrouping; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerInputs; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerMute; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerNowPlaying; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerPlayURL; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerPlayerSelect; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerPlaylist; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerQueue; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerRawCommand; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerReboot; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerRepeatMode; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerShuffleMode; +import org.openhab.binding.heos.internal.handler.HeosChannelHandlerVolume; +import org.openhab.binding.heos.internal.handler.HeosDynamicStateDescriptionProvider; import org.openhab.binding.heos.internal.resources.HeosEventListener; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.type.ChannelTypeUID; diff --git a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosSystem.java b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosSystem.java index 7a7c083b7..864f91fa0 100644 --- a/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosSystem.java +++ b/bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/api/HeosSystem.java @@ -16,7 +16,11 @@ import static org.openhab.binding.heos.internal.handler.FutureUtil.cancel; import java.beans.PropertyChangeListener; import java.io.IOException; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/CommonRpcParser.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/CommonRpcParser.java index 1c2179e42..792637428 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/CommonRpcParser.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/parser/CommonRpcParser.java @@ -181,8 +181,9 @@ public abstract class CommonRpcParser implements RpcParser { dp.setUnit("dBm"); } // Bypass: For at least one device the CCU does not send a unit together with the value - if (dp.getUnit() == null && dp.getName().startsWith(HomematicConstants.DATAPOINT_NAME_OPERATING_VOLTAGE)) + if (dp.getUnit() == null && dp.getName().startsWith(HomematicConstants.DATAPOINT_NAME_OPERATING_VOLTAGE)) { dp.setUnit("V"); + } HmValueType valueType = HmValueType.parse(type); if (valueType == null || valueType == HmValueType.UNKNOWN) { diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java index ae09a2d2b..7b749f276 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/handler/HomematicThingHandler.java @@ -417,8 +417,9 @@ public class HomematicThingHandler extends BaseThingHandler { loadHomematicChannelValues(device.getChannel(0)); ThingStatus oldStatus = thing.getStatus(); - if (oldStatus == ThingStatus.UNINITIALIZED) + if (oldStatus == ThingStatus.UNINITIALIZED) { return; + } ThingStatus newStatus = ThingStatus.ONLINE; ThingStatusDetail newDetail = ThingStatusDetail.NONE; diff --git a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java index f288b8396..490ce8293 100644 --- a/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java +++ b/bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/MetadataUtils.java @@ -332,8 +332,9 @@ public class MetadataUtils { case "m3": return ITEM_TYPE_NUMBER + ":Volume"; case "": - if (dpName.startsWith(DATAPOINT_NAME_OPERATING_VOLTAGE)) + if (dpName.startsWith(DATAPOINT_NAME_OPERATING_VOLTAGE)) { return ITEM_TYPE_NUMBER + ":ElectricPotential"; + } case "s": case "min": case "minutes": diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpThingHandler.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpThingHandler.java index ba5c3c069..d845cee71 100644 --- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpThingHandler.java +++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/HttpThingHandler.java @@ -15,7 +15,11 @@ package org.openhab.binding.http.internal; import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; -import java.util.*; +import java.util.Base64; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -33,8 +37,21 @@ import org.eclipse.jetty.http.HttpMethod; import org.openhab.binding.http.internal.config.HttpChannelConfig; import org.openhab.binding.http.internal.config.HttpChannelMode; import org.openhab.binding.http.internal.config.HttpThingConfig; -import org.openhab.binding.http.internal.converter.*; -import org.openhab.binding.http.internal.http.*; +import org.openhab.binding.http.internal.converter.AbstractTransformingItemConverter; +import org.openhab.binding.http.internal.converter.ColorItemConverter; +import org.openhab.binding.http.internal.converter.DimmerItemConverter; +import org.openhab.binding.http.internal.converter.FixedValueMappingItemConverter; +import org.openhab.binding.http.internal.converter.GenericItemConverter; +import org.openhab.binding.http.internal.converter.ImageItemConverter; +import org.openhab.binding.http.internal.converter.ItemValueConverter; +import org.openhab.binding.http.internal.converter.NumberItemConverter; +import org.openhab.binding.http.internal.converter.PlayerItemConverter; +import org.openhab.binding.http.internal.converter.RollershutterItemConverter; +import org.openhab.binding.http.internal.http.Content; +import org.openhab.binding.http.internal.http.HttpAuthException; +import org.openhab.binding.http.internal.http.HttpResponseListener; +import org.openhab.binding.http.internal.http.RateLimitedHttpClient; +import org.openhab.binding.http.internal.http.RefreshingUrlCache; import org.openhab.binding.http.internal.transform.ValueTransformationProvider; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.PointType; diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/Util.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/Util.java index 34e057b1b..be65715c1 100644 --- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/Util.java +++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/Util.java @@ -12,7 +12,11 @@ */ package org.openhab.binding.http.internal; -import java.net.*; +import java.net.IDN; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; import java.util.stream.StreamSupport; diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RateLimitedHttpClient.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RateLimitedHttpClient.java index 000703b30..7f73ccbdc 100644 --- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RateLimitedHttpClient.java +++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RateLimitedHttpClient.java @@ -13,7 +13,13 @@ package org.openhab.binding.http.internal.http; import java.net.URI; -import java.util.concurrent.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -54,7 +60,7 @@ public class RateLimitedHttpClient { /** * Set a new delay - * + * * @param delay in ms between to requests */ public void setDelay(int delay) { diff --git a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RefreshingUrlCache.java b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RefreshingUrlCache.java index 4ef2cb504..785c283c0 100644 --- a/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RefreshingUrlCache.java +++ b/bundles/org.openhab.binding.http/src/main/java/org/openhab/binding/http/internal/http/RefreshingUrlCache.java @@ -12,12 +12,19 @@ */ package org.openhab.binding.http.internal.http; -import java.net.*; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; import java.util.Date; import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.concurrent.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import org.eclipse.jdt.annotation.NonNullByDefault; diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/device/Device.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/device/Device.java index 8a0f2014e..1f658dca2 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/device/Device.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/client/entity/device/Device.java @@ -14,7 +14,10 @@ package org.openhab.binding.innogysmarthome.internal.client.entity.device; import static org.openhab.binding.innogysmarthome.internal.InnogyBindingConstants.*; -import java.util.*; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.openhab.binding.innogysmarthome.internal.client.entity.capability.Capability; import org.openhab.binding.innogysmarthome.internal.client.entity.location.Location; diff --git a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java index e3fc306b0..3a02da363 100644 --- a/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java +++ b/bundles/org.openhab.binding.innogysmarthome/src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyDeviceHandler.java @@ -28,7 +28,13 @@ import org.openhab.binding.innogysmarthome.internal.client.entity.capability.Cap import org.openhab.binding.innogysmarthome.internal.client.entity.device.Device; import org.openhab.binding.innogysmarthome.internal.client.entity.event.Event; import org.openhab.binding.innogysmarthome.internal.listener.DeviceStatusListener; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.OpenClosedType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.StopMoveType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.library.types.UpDownType; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Channel; import org.openhab.core.thing.ChannelUID; 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 09acbd946..d2b7fb96a 100644 --- 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 @@ -15,7 +15,12 @@ package org.openhab.binding.innogysmarthome.internal.manager; import static org.openhab.binding.innogysmarthome.internal.InnogyBindingConstants.BATTERY_POWERED_DEVICES; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceFeature.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceFeature.java index 03a2a52f7..b3d96188b 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceFeature.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/DeviceFeature.java @@ -16,7 +16,12 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java index 2cc0047c0..6185d70e1 100644 --- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java +++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java @@ -14,7 +14,14 @@ package org.openhab.binding.insteon.internal.handler; import java.lang.reflect.Type; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/discovery/JablotronDiscoveryService.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/discovery/JablotronDiscoveryService.java index e68acc110..f1d3543e3 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/discovery/JablotronDiscoveryService.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/discovery/JablotronDiscoveryService.java @@ -25,7 +25,9 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.jablotron.internal.handler.JablotronBridgeHandler; import org.openhab.binding.jablotron.internal.model.JablotronDiscoveredService; -import org.openhab.core.config.discovery.*; +import org.openhab.core.config.discovery.AbstractDiscoveryService; +import org.openhab.core.config.discovery.DiscoveryResultBuilder; +import org.openhab.core.config.discovery.DiscoveryService; import org.openhab.core.thing.ThingStatus; import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.ThingUID; diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronAlarmHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronAlarmHandler.java index c2d50e780..dcc4503b8 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronAlarmHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronAlarmHandler.java @@ -25,11 +25,22 @@ import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; import org.openhab.binding.jablotron.internal.config.JablotronDeviceConfig; -import org.openhab.binding.jablotron.internal.model.*; +import org.openhab.binding.jablotron.internal.model.JablotronControlResponse; +import org.openhab.binding.jablotron.internal.model.JablotronDataUpdateResponse; +import org.openhab.binding.jablotron.internal.model.JablotronDiscoveredService; +import org.openhab.binding.jablotron.internal.model.JablotronHistoryDataEvent; +import org.openhab.binding.jablotron.internal.model.JablotronService; +import org.openhab.binding.jablotron.internal.model.JablotronServiceData; +import org.openhab.binding.jablotron.internal.model.JablotronServiceDetail; +import org.openhab.binding.jablotron.internal.model.JablotronServiceDetailSegment; import org.openhab.core.cache.ExpiringCache; import org.openhab.core.library.types.DateTimeType; import org.openhab.core.library.types.StringType; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingStatusInfo; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.types.State; import org.slf4j.Logger; diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java index e44f15e49..57c5ca1d7 100644 --- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java +++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronBridgeHandler.java @@ -32,10 +32,20 @@ import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpMethod; import org.openhab.binding.jablotron.internal.config.JablotronBridgeConfig; import org.openhab.binding.jablotron.internal.discovery.JablotronDiscoveryService; -import org.openhab.binding.jablotron.internal.model.*; +import org.openhab.binding.jablotron.internal.model.JablotronControlResponse; +import org.openhab.binding.jablotron.internal.model.JablotronDataUpdateResponse; +import org.openhab.binding.jablotron.internal.model.JablotronDiscoveredService; +import org.openhab.binding.jablotron.internal.model.JablotronGetEventHistoryResponse; +import org.openhab.binding.jablotron.internal.model.JablotronGetServiceResponse; +import org.openhab.binding.jablotron.internal.model.JablotronHistoryDataEvent; +import org.openhab.binding.jablotron.internal.model.JablotronLoginResponse; import org.openhab.binding.jablotron.internal.model.ja100f.JablotronGetPGResponse; import org.openhab.binding.jablotron.internal.model.ja100f.JablotronGetSectionsResponse; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.thing.binding.ThingHandlerService; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java index b92f56129..2d0da6dad 100644 --- a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java +++ b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputDiscoveryService.java @@ -16,7 +16,11 @@ import static org.openhab.binding.linuxinput.internal.LinuxInputBindingConstants import java.io.File; import java.io.IOException; -import java.nio.file.*; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.nio.file.StandardWatchEventKinds; +import java.nio.file.WatchKey; +import java.nio.file.WatchService; import java.time.Duration; import java.util.Collections; import java.util.concurrent.Future; diff --git a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java index b1ac0c6ca..13b3bee08 100644 --- a/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java +++ b/bundles/org.openhab.binding.linuxinput/src/main/java/org/openhab/binding/linuxinput/internal/LinuxInputHandler.java @@ -17,7 +17,13 @@ import static org.openhab.binding.linuxinput.internal.LinuxInputBindingConstants import java.io.IOException; import java.nio.channels.SelectionKey; import java.nio.channels.Selector; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -26,7 +32,12 @@ import org.openhab.binding.linuxinput.internal.evdev4j.jnr.EvdevLibrary; import org.openhab.core.library.CoreItemFactory; import org.openhab.core.library.types.OpenClosedType; import org.openhab.core.library.types.StringType; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.CommonTriggerEvents; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.builder.ChannelBuilder; import org.openhab.core.thing.binding.builder.ThingBuilder; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ConnectionDeserializer.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ConnectionDeserializer.java index 70f738364..7383b4d7c 100644 --- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ConnectionDeserializer.java +++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ConnectionDeserializer.java @@ -14,7 +14,11 @@ package org.openhab.binding.mqtt.homeassistant.internal; import java.lang.reflect.Type; -import com.google.gson.*; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonParseException; /** * The {@link ConnectionDeserializer} will de-serialize a connection-list diff --git a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java index 6e8775b1e..52381ba11 100644 --- a/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java +++ b/bundles/org.openhab.binding.mqtt/src/main/java/org/openhab/binding/mqtt/handler/AbstractBrokerHandler.java @@ -28,7 +28,11 @@ import org.openhab.core.io.transport.mqtt.MqttBrokerConnection; import org.openhab.core.io.transport.mqtt.MqttConnectionObserver; import org.openhab.core.io.transport.mqtt.MqttConnectionState; import org.openhab.core.io.transport.mqtt.MqttService; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.thing.binding.ThingHandlerService; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java index a72b79990..ca5630490 100644 --- a/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java +++ b/bundles/org.openhab.binding.neato/src/main/java/org/openhab/binding/neato/internal/NeatoRobot.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.neato.internal; -import static org.openhab.binding.neato.internal.classes.Category.HOUSE; -import static org.openhab.binding.neato.internal.classes.Category.MAP; +import static org.openhab.binding.neato.internal.classes.Category.*; import static org.openhab.binding.neato.internal.classes.Mode.TURBO; import static org.openhab.binding.neato.internal.classes.NavigationMode.DEEP; @@ -34,7 +33,10 @@ import java.util.TimeZone; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import org.openhab.binding.neato.internal.classes.*; +import org.openhab.binding.neato.internal.classes.ErrorMessage; +import org.openhab.binding.neato.internal.classes.NeatoGeneralInfo; +import org.openhab.binding.neato.internal.classes.NeatoRobotInfo; +import org.openhab.binding.neato.internal.classes.NeatoState; import org.openhab.binding.neato.internal.config.NeatoRobotConfig; import org.openhab.core.io.net.http.HttpUtil; import org.openhab.core.util.HexUtils; diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/discovery/NetatmoModuleDiscoveryService.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/discovery/NetatmoModuleDiscoveryService.java index c0001b536..7454cb92a 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/discovery/NetatmoModuleDiscoveryService.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/discovery/NetatmoModuleDiscoveryService.java @@ -34,7 +34,12 @@ import org.openhab.core.thing.ThingUID; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; -import io.swagger.client.model.*; +import io.swagger.client.model.NAHealthyHomeCoach; +import io.swagger.client.model.NAMain; +import io.swagger.client.model.NAPlug; +import io.swagger.client.model.NAStationModule; +import io.swagger.client.model.NAWelcomeCamera; +import io.swagger.client.model.NAWelcomeHome; /** * The {@link NetatmoModuleDiscoveryService} searches for available Netatmo diff --git a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java index 815856797..6494814be 100644 --- a/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java +++ b/bundles/org.openhab.binding.nuvo/src/main/java/org/openhab/binding/nuvo/internal/handler/NuvoHandler.java @@ -239,7 +239,7 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis * * @param channelUID the channel sending the command * @param command the command received - * + * */ @Override public void handleCommand(ChannelUID channelUID, Command command) { @@ -306,8 +306,9 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis int value = ((DecimalType) command).intValue(); if (value >= MIN_EQ && value <= MAX_EQ) { // device can only accept even values - if (value % 2 == 1) + if (value % 2 == 1) { value++; + } logger.debug("Got treble command {} zone {}", value, target); connector.sendCfgCommand(target, NuvoCommand.TREBLE, String.valueOf(value)); } @@ -317,8 +318,9 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis if (command instanceof DecimalType) { int value = ((DecimalType) command).intValue(); if (value >= MIN_EQ && value <= MAX_EQ) { - if (value % 2 == 1) + if (value % 2 == 1) { value++; + } logger.debug("Got bass command {} zone {}", value, target); connector.sendCfgCommand(target, NuvoCommand.BASS, String.valueOf(value)); } @@ -328,8 +330,9 @@ public class NuvoHandler extends BaseThingHandler implements NuvoMessageEventLis if (command instanceof DecimalType) { int value = ((DecimalType) command).intValue(); if (value >= MIN_EQ && value <= MAX_EQ) { - if (value % 2 == 1) + if (value % 2 == 1) { value++; + } logger.debug("Got balance command {} zone {}", value, target); connector.sendCfgCommand(target, NuvoCommand.BALANCE, NuvoStatusCodes.getBalanceFromInt(value)); diff --git a/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/handler/NZWaterAlertsHandler.java b/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/handler/NZWaterAlertsHandler.java index ef3f444c7..2813f5482 100644 --- a/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/handler/NZWaterAlertsHandler.java +++ b/bundles/org.openhab.binding.nzwateralerts/src/main/java/org/openhab/binding/nzwateralerts/internal/handler/NZWaterAlertsHandler.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.nzwateralerts.internal.handler; -import static org.openhab.binding.nzwateralerts.internal.NZWaterAlertsBindingConstants.*; +import static org.openhab.binding.nzwateralerts.internal.NZWaterAlertsBindingConstants.CHANNEL_ALERTLEVEL; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; @@ -54,8 +54,9 @@ public class NZWaterAlertsHandler extends BaseThingHandler implements NZWaterAle final NZWaterAlertsBinder localBinder = binder; if (CHANNEL_ALERTLEVEL.equals(channelUID.getId())) { if (command instanceof RefreshType) { - if (localBinder != null) + if (localBinder != null) { localBinder.update(); + } } } } diff --git a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/handler/BasicThingHandler.java b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/handler/BasicThingHandler.java index 8833c0944..9df6e3e99 100644 --- a/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/handler/BasicThingHandler.java +++ b/bundles/org.openhab.binding.onewire/src/main/java/org/openhab/binding/onewire/internal/handler/BasicThingHandler.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.onewire.internal.handler; -import static org.openhab.binding.onewire.internal.OwBindingConstants.CHANNEL_DIGITAL; -import static org.openhab.binding.onewire.internal.OwBindingConstants.THING_TYPE_BASIC; +import static org.openhab.binding.onewire.internal.OwBindingConstants.*; import java.util.Collections; import java.util.Set; @@ -22,7 +21,14 @@ import java.util.stream.Stream; import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.onewire.internal.OwDynamicStateDescriptionProvider; -import org.openhab.binding.onewire.internal.device.*; +import org.openhab.binding.onewire.internal.device.AbstractDigitalOwDevice; +import org.openhab.binding.onewire.internal.device.DS18x20; +import org.openhab.binding.onewire.internal.device.DS2401; +import org.openhab.binding.onewire.internal.device.DS2405; +import org.openhab.binding.onewire.internal.device.DS2406_DS2413; +import org.openhab.binding.onewire.internal.device.DS2408; +import org.openhab.binding.onewire.internal.device.DS2423; +import org.openhab.binding.onewire.internal.device.OwSensorType; import org.openhab.core.library.types.OnOffType; import org.openhab.core.thing.Bridge; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/handler/OpenWeatherMapOneCallHistoryHandler.java b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/handler/OpenWeatherMapOneCallHistoryHandler.java index ccf7ddafa..ecac85bd6 100644 --- a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/handler/OpenWeatherMapOneCallHistoryHandler.java +++ b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/handler/OpenWeatherMapOneCallHistoryHandler.java @@ -13,9 +13,7 @@ package org.openhab.binding.openweathermap.internal.handler; import static org.openhab.binding.openweathermap.internal.OpenWeatherMapBindingConstants.*; -import static org.openhab.core.library.unit.MetricPrefix.HECTO; -import static org.openhab.core.library.unit.MetricPrefix.KILO; -import static org.openhab.core.library.unit.MetricPrefix.MILLI; +import static org.openhab.core.library.unit.MetricPrefix.*; import static org.openhab.core.library.unit.SIUnits.*; import static org.openhab.core.library.unit.Units.*; @@ -28,8 +26,10 @@ import org.openhab.binding.openweathermap.internal.config.OpenWeatherMapOneCallH import org.openhab.binding.openweathermap.internal.connection.OpenWeatherMapCommunicationException; import org.openhab.binding.openweathermap.internal.connection.OpenWeatherMapConfigurationException; import org.openhab.binding.openweathermap.internal.connection.OpenWeatherMapConnection; -import org.openhab.binding.openweathermap.internal.dto.onecallhist.*; +import org.openhab.binding.openweathermap.internal.dto.onecallhist.Hourly; import org.openhab.binding.openweathermap.internal.dto.onecallhist.OpenWeatherMapOneCallHistAPIData; +import org.openhab.binding.openweathermap.internal.dto.onecallhist.Rain; +import org.openhab.binding.openweathermap.internal.dto.onecallhist.Snow; import org.openhab.core.i18n.TimeZoneProvider; import org.openhab.core.library.types.QuantityType; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/PilightConnector.java b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/PilightConnector.java index 75fca4f9c..d28bd4c50 100644 --- a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/PilightConnector.java +++ b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/PilightConnector.java @@ -12,14 +12,28 @@ */ package org.openhab.binding.pilight.internal; -import java.io.*; +import java.io.BufferedReader; +import java.io.Closeable; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintStream; import java.net.Socket; import java.util.Collections; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.binding.pilight.internal.dto.*; +import org.openhab.binding.pilight.internal.dto.Action; +import org.openhab.binding.pilight.internal.dto.AllStatus; +import org.openhab.binding.pilight.internal.dto.Identification; +import org.openhab.binding.pilight.internal.dto.Message; +import org.openhab.binding.pilight.internal.dto.Options; +import org.openhab.binding.pilight.internal.dto.Response; +import org.openhab.binding.pilight.internal.dto.Status; +import org.openhab.binding.pilight.internal.dto.Version; import org.openhab.core.thing.ThingStatus; import org.openhab.core.thing.ThingStatusDetail; import org.slf4j.Logger; @@ -148,6 +162,7 @@ public class PilightConnector implements Runnable, Closeable { /** * Stops the listener */ + @Override public void close() { disconnect(); Thread.currentThread().interrupt(); diff --git a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightBridgeDiscoveryService.java b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightBridgeDiscoveryService.java index 67cb46bd8..84dca1636 100644 --- a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightBridgeDiscoveryService.java +++ b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightBridgeDiscoveryService.java @@ -12,10 +12,22 @@ */ package org.openhab.binding.pilight.internal.discovery; -import java.io.*; -import java.net.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.NetworkInterface; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; diff --git a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightDeviceDiscoveryService.java b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightDeviceDiscoveryService.java index c735a976e..a5038f2d2 100644 --- a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightDeviceDiscoveryService.java +++ b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/discovery/PilightDeviceDiscoveryService.java @@ -14,7 +14,11 @@ package org.openhab.binding.pilight.internal.discovery; import static org.openhab.binding.pilight.internal.PilightBindingConstants.*; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; diff --git a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBaseHandler.java b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBaseHandler.java index aeb1e4845..e122c34e1 100644 --- a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBaseHandler.java +++ b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBaseHandler.java @@ -19,7 +19,10 @@ import org.openhab.binding.pilight.internal.dto.Action; import org.openhab.binding.pilight.internal.dto.Config; import org.openhab.binding.pilight.internal.dto.Device; import org.openhab.binding.pilight.internal.dto.Status; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.thing.binding.BridgeHandler; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBridgeHandler.java b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBridgeHandler.java index dfcfd9fdf..cadf4c654 100644 --- a/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBridgeHandler.java +++ b/bundles/org.openhab.binding.pilight/src/main/java/org/openhab/binding/pilight/internal/handler/PilightBridgeHandler.java @@ -27,9 +27,17 @@ import org.openhab.binding.pilight.internal.IPilightCallback; import org.openhab.binding.pilight.internal.PilightBridgeConfiguration; import org.openhab.binding.pilight.internal.PilightConnector; import org.openhab.binding.pilight.internal.discovery.PilightDeviceDiscoveryService; -import org.openhab.binding.pilight.internal.dto.*; +import org.openhab.binding.pilight.internal.dto.Action; +import org.openhab.binding.pilight.internal.dto.Config; +import org.openhab.binding.pilight.internal.dto.DeviceType; +import org.openhab.binding.pilight.internal.dto.Status; +import org.openhab.binding.pilight.internal.dto.Version; import org.openhab.core.common.NamedThreadFactory; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.thing.binding.ThingHandler; import org.openhab.core.thing.binding.ThingHandlerService; diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryRawResponseDTO.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryRawResponseDTO.java index 80ba0d225..95c5d525f 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryRawResponseDTO.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryRawResponseDTO.java @@ -46,10 +46,12 @@ public class DiscoveryRawResponseDTO { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } DiscoveryRawResponseDTO that = (DiscoveryRawResponseDTO) o; return response == that.response && data.equals(that.data) && Objects.equals(ipAddress, that.ipAddress); } diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryResponseDTO.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryResponseDTO.java index 0170fb1c6..cc9388e3b 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryResponseDTO.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/DiscoveryResponseDTO.java @@ -76,10 +76,12 @@ public class DiscoveryResponseDTO { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } DiscoveryResponseDTO that = (DiscoveryResponseDTO) o; return serialNumber.equals(that.serialNumber) && regId.equals(that.regId) && sak.equals(that.sak) && name.equals(that.name) && macAddress.equals(that.macAddress) && version.equals(that.version); diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchResponseDTO.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchResponseDTO.java index 9e240675a..fd5d00987 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchResponseDTO.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/api/SwitchResponseDTO.java @@ -38,10 +38,12 @@ public class SwitchResponseDTO { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } SwitchResponseDTO that = (SwitchResponseDTO) o; return response == that.response && code == that.code; } diff --git a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/udp/UdpResponseDTO.java b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/udp/UdpResponseDTO.java index 960d2e62a..5ee8be0b8 100644 --- a/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/udp/UdpResponseDTO.java +++ b/bundles/org.openhab.binding.revogi/src/main/java/org/openhab/binding/revogi/internal/udp/UdpResponseDTO.java @@ -38,10 +38,12 @@ public class UdpResponseDTO { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } UdpResponseDTO that = (UdpResponseDTO) o; return answer.equals(that.answer) && ipAddress.equals(that.ipAddress); } diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsCloudHandler.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsCloudHandler.java index 8e4b67be2..1fab0300f 100644 --- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsCloudHandler.java +++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/internal/RdsCloudHandler.java @@ -34,7 +34,7 @@ import com.google.gson.JsonParseException; * also known as the Climatix IC server account ) * * @author Andrew Fiddian-Green - Initial contribution - * + * */ @NonNullByDefault public class RdsCloudHandler extends BaseBridgeHandler { @@ -68,8 +68,9 @@ public class RdsCloudHandler extends BaseBridgeHandler { return; } - if (logger.isDebugEnabled()) + if (logger.isDebugEnabled()) { logger.debug("polling interval={}", config.pollingInterval); + } if (config.pollingInterval < FAST_POLL_INTERVAL || config.pollingInterval > LAZY_POLL_INTERVAL) { updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.CONFIGURATION_ERROR, diff --git a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/PointDeserializer.java b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/PointDeserializer.java index b1b2b9d1b..17037a290 100644 --- a/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/PointDeserializer.java +++ b/bundles/org.openhab.binding.siemensrds/src/main/java/org/openhab/binding/siemensrds/points/PointDeserializer.java @@ -76,8 +76,9 @@ public class PointDeserializer implements JsonDeserializer { if (valueIsPrimitive) { JsonPrimitive primitiveType = value.getAsJsonPrimitive(); pointType = primitiveType.isString() ? PointType.STRING : PointType.NUMBER; - } else + } else { pointType = PointType.NESTED_NUMBER; + } } BasePoint point; diff --git a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java index 05e971bc3..e051b0f55 100644 --- a/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java +++ b/bundles/org.openhab.binding.smartthings/src/main/java/org/openhab/binding/smartthings/internal/discovery/SmartthingsDiscoveryService.java @@ -12,7 +12,11 @@ */ package org.openhab.binding.smartthings.internal.discovery; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; diff --git a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiHandler.java b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiHandler.java index 131aee457..905fb2a0f 100644 --- a/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiHandler.java +++ b/bundles/org.openhab.binding.smhi/src/main/java/org/openhab/binding/smhi/internal/SmhiHandler.java @@ -17,7 +17,9 @@ import static org.openhab.binding.smhi.internal.SmhiBindingConstants.*; import java.math.BigDecimal; import java.time.ZoneOffset; import java.time.ZonedDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -130,7 +132,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Update channels with new forecast data. - * + * * @param timeSeries A {@link TimeSeries} object containing forecasts. */ private void updateChannels(TimeSeries timeSeries) { @@ -246,6 +248,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Dispose the {@link org.openhab.core.thing.binding.ThingHandler}. Cancel scheduled jobs */ + @Override public void dispose() { cancelPolling(); } @@ -284,7 +287,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Checks if it is a new hour. - * + * * @return true if the current time is more than one hour after currentHour, otherwise false. */ private boolean isItNewHour() { @@ -293,7 +296,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Call Smhi's endpoint to check for the time of the last forecast, to see if a new one is available. - * + * * @return true if the time of the latest forecast is equal to or after currentHour, otherwise false */ private boolean isForecastUpdated() { @@ -344,7 +347,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Get the current time rounded down to hour - * + * * @return A {@link ZonedDateTime} corresponding to the last even hour */ private ZonedDateTime calculateCurrentHour() { @@ -358,7 +361,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Get the current time rounded down to day - * + * * @return A {@link ZonedDateTime} corresponding to the last even day. */ private ZonedDateTime calculateCurrentDay() { @@ -371,7 +374,7 @@ public class SmhiHandler extends BaseThingHandler { /** * Creates channels based on selections in thing configuration - * + * * @return */ private List createChannels() { diff --git a/bundles/org.openhab.binding.teleinfo/src/main/java/org/openhab/binding/teleinfo/internal/serial/TeleinfoReceiveThread.java b/bundles/org.openhab.binding.teleinfo/src/main/java/org/openhab/binding/teleinfo/internal/serial/TeleinfoReceiveThread.java index 90b4a3318..a3eee6052 100644 --- a/bundles/org.openhab.binding.teleinfo/src/main/java/org/openhab/binding/teleinfo/internal/serial/TeleinfoReceiveThread.java +++ b/bundles/org.openhab.binding.teleinfo/src/main/java/org/openhab/binding/teleinfo/internal/serial/TeleinfoReceiveThread.java @@ -55,8 +55,9 @@ public class TeleinfoReceiveThread extends Thread { if (listener != null) { try { Frame nextFrame = teleinfoStream.readNextFrame(); - if (nextFrame != null) + if (nextFrame != null) { listener.onFrameReceived(nextFrame); + } } catch (InvalidFrameException e) { logger.warn("Got invalid frame. Detail: \"{}\"", e.getLocalizedMessage()); listener.onInvalidFrameReceived(this, e); diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064ChannelTypeProvider.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064ChannelTypeProvider.java index 190c0e02a..2652d8e82 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064ChannelTypeProvider.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064ChannelTypeProvider.java @@ -21,7 +21,11 @@ import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; -import org.openhab.core.thing.type.*; +import org.openhab.core.thing.type.ChannelType; +import org.openhab.core.thing.type.ChannelTypeBuilder; +import org.openhab.core.thing.type.ChannelTypeProvider; +import org.openhab.core.thing.type.ChannelTypeUID; +import org.openhab.core.thing.type.StateChannelTypeBuilder; import org.openhab.core.types.StateDescriptionFragmentBuilder; import org.osgi.service.component.annotations.Component; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064DiscoveryService.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064DiscoveryService.java index e2f1f5c11..953f2e40b 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064DiscoveryService.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064DiscoveryService.java @@ -12,10 +12,14 @@ */ package org.openhab.binding.tr064.internal; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_SUBDEVICE; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_SUBDEVICE_LAN; +import static org.openhab.binding.tr064.internal.Tr064BindingConstants.*; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064HandlerFactory.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064HandlerFactory.java index 2e33ec944..92d71bbb6 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064HandlerFactory.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064HandlerFactory.java @@ -14,7 +14,7 @@ package org.openhab.binding.tr064.internal; import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_FRITZBOX; -import java.util.*; +import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064RootHandler.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064RootHandler.java index ff9df9b23..c130f386f 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064RootHandler.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064RootHandler.java @@ -12,13 +12,19 @@ */ package org.openhab.binding.tr064.internal; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_FRITZBOX; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_GENERIC; +import static org.openhab.binding.tr064.internal.Tr064BindingConstants.*; import java.net.URI; import java.net.URISyntaxException; import java.time.Duration; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -48,7 +54,12 @@ import org.openhab.binding.tr064.internal.soap.SOAPValueConverter; import org.openhab.binding.tr064.internal.util.SCPDUtil; import org.openhab.binding.tr064.internal.util.Util; import org.openhab.core.cache.ExpiringCacheMap; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingTypeUID; +import org.openhab.core.thing.ThingUID; import org.openhab.core.thing.binding.BaseBridgeHandler; import org.openhab.core.thing.binding.ThingHandlerService; import org.openhab.core.thing.binding.builder.ThingBuilder; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064SubHandler.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064SubHandler.java index 9a3c34c35..51543a5a7 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064SubHandler.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/Tr064SubHandler.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.tr064.internal; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_SUBDEVICE; -import static org.openhab.binding.tr064.internal.Tr064BindingConstants.THING_TYPE_SUBDEVICE_LAN; +import static org.openhab.binding.tr064.internal.Tr064BindingConstants.*; import java.util.HashMap; import java.util.Map; @@ -30,7 +29,13 @@ import org.openhab.binding.tr064.internal.soap.SOAPConnector; import org.openhab.binding.tr064.internal.util.SCPDUtil; import org.openhab.binding.tr064.internal.util.Util; import org.openhab.core.cache.ExpiringCacheMap; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Bridge; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingStatusInfo; +import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.thing.binding.builder.ThingBuilder; import org.openhab.core.types.Command; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookActions.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookActions.java index 55fa7d078..74493647c 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookActions.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookActions.java @@ -12,7 +12,8 @@ */ package org.openhab.binding.tr064.internal.phonebook; -import java.util.*; +import java.util.Collection; +import java.util.Optional; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileFactory.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileFactory.java index f10359f76..779331554 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileFactory.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/phonebook/PhonebookProfileFactory.java @@ -15,7 +15,13 @@ package org.openhab.binding.tr064.internal.phonebook; import static java.util.Comparator.comparing; import java.net.URI; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPConnector.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPConnector.java index 15d7de746..5cdc29ba1 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPConnector.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPConnector.java @@ -27,7 +27,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; -import javax.xml.soap.*; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.MimeHeader; +import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.soap.SOAPPart; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; diff --git a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPRequest.java b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPRequest.java index c8d1befbd..6a4f6a8ac 100644 --- a/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPRequest.java +++ b/bundles/org.openhab.binding.tr064/src/main/java/org/openhab/binding/tr064/internal/soap/SOAPRequest.java @@ -42,17 +42,21 @@ public class SOAPRequest { @Override public boolean equals(@Nullable Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } SOAPRequest that = (SOAPRequest) o; - if (!service.equals(that.service)) + if (!service.equals(that.service)) { return false; - if (!soapAction.equals(that.soapAction)) + } + if (!soapAction.equals(that.soapAction)) { return false; + } return arguments.equals(that.arguments); } diff --git a/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteDiscoveryService.java b/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteDiscoveryService.java index da2661c09..29787e975 100644 --- a/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteDiscoveryService.java +++ b/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteDiscoveryService.java @@ -15,7 +15,11 @@ package org.openhab.binding.unifiedremote.internal; import static org.openhab.binding.unifiedremote.internal.UnifiedRemoteBindingConstants.*; import java.io.IOException; -import java.net.*; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.InetAddress; +import java.net.SocketException; +import java.net.SocketTimeoutException; import java.text.ParseException; import java.util.Arrays; import java.util.HashMap; @@ -107,8 +111,9 @@ public class UnifiedRemoteDiscoveryService extends AbstractDiscoveryService { String host = receivePacket.getAddress().getHostAddress(); String reply = new String(receivePacket.getData()).replaceAll("[\\p{C}]", NON_PRINTABLE_CHARTS_REPLACEMENT) .replaceAll("[^\\x00-\\x7F]", NON_PRINTABLE_CHARTS_REPLACEMENT); - if (!reply.startsWith(DISCOVERY_RESPONSE_PREFIX)) + if (!reply.startsWith(DISCOVERY_RESPONSE_PREFIX)) { throw new ParseException("Bad discovery response prefix", 0); + } String[] parts = Arrays .stream(reply.replace(DISCOVERY_RESPONSE_PREFIX, "").split(NON_PRINTABLE_CHARTS_REPLACEMENT)) .filter((String e) -> e.length() != 0).toArray(String[]::new); diff --git a/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteHandler.java b/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteHandler.java index 377bd196d..a7b0257c3 100644 --- a/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteHandler.java +++ b/bundles/org.openhab.binding.unifiedremote/src/main/java/org/openhab/binding/unifiedremote/internal/UnifiedRemoteHandler.java @@ -12,8 +12,7 @@ */ package org.openhab.binding.unifiedremote.internal; -import static org.openhab.binding.unifiedremote.internal.UnifiedRemoteBindingConstants.MOUSE_CHANNEL; -import static org.openhab.binding.unifiedremote.internal.UnifiedRemoteBindingConstants.SEND_KEY_CHANNEL; +import static org.openhab.binding.unifiedremote.internal.UnifiedRemoteBindingConstants.*; import java.net.ConnectException; import java.net.NoRouteToHostException; @@ -54,8 +53,9 @@ public class UnifiedRemoteHandler extends BaseThingHandler { @Override public void handleCommand(ChannelUID channelUID, Command command) { String channelId = channelUID.getId(); - if (!isLinked(channelId)) + if (!isLinked(channelId)) { return; + } String stringCommand = command.toFullString(); UnifiedRemoteConnection urConnection = connection; try { @@ -107,8 +107,9 @@ public class UnifiedRemoteHandler extends BaseThingHandler { connectionCheckerSchedule = scheduler.scheduleWithFixedDelay(() -> { try { UnifiedRemoteConnection urConnection = connection; - if (urConnection == null) + if (urConnection == null) { return; + } ThingStatus status = thing.getStatus(); if ((status == ThingStatus.OFFLINE || status == ThingStatus.UNKNOWN) && connection != null) { urConnection.authenticate(); diff --git a/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVHandler.java b/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVHandler.java index 368d381b6..aaa539dbc 100644 --- a/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVHandler.java +++ b/bundles/org.openhab.binding.valloxmv/src/main/java/org/openhab/binding/valloxmv/internal/ValloxMVHandler.java @@ -159,12 +159,14 @@ public class ValloxMVHandler extends BaseThingHandler { } private void scheduleReadDataJob(int initialDelay) { - if (initialDelay < 0) + if (initialDelay < 0) { initialDelay = 0; + } readDataInterval = getConfigAs(ValloxMVConfig.class).getUpdateinterval(); - if (readDataInterval < 15) + if (readDataInterval < 15) { readDataInterval = 60; + } logger.debug("Data table request interval {} seconds, Request in {} seconds", readDataInterval, initialDelay); diff --git a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java index d2b38d959..fb79da740 100644 --- a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java +++ b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/VDRHandler.java @@ -311,7 +311,8 @@ public class VDRHandler extends BaseThingHandler { */ private void stopRefreshThread(boolean force) { ScheduledFuture refreshThread = refreshThreadFuture; - if (refreshThread != null) + if (refreshThread != null) { refreshThread.cancel(force); + } } } diff --git a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPClientImpl.java b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPClientImpl.java index ce633b5eb..5b1432520 100644 --- a/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPClientImpl.java +++ b/bundles/org.openhab.binding.vdr/src/main/java/org/openhab/binding/vdr/internal/svdrp/SVDRPClientImpl.java @@ -101,10 +101,12 @@ public class SVDRPClientImpl implements SVDRPClient { } catch (IOException e) { // cleanup after timeout try { - if (localOut != null) + if (localOut != null) { localOut.close(); - if (localIn != null) + } + if (localIn != null) { localIn.close(); + } localSocket.close(); } catch (IOException ex) { } diff --git a/bundles/org.openhab.binding.vektiva/src/main/java/org/openhab/binding/vektiva/internal/handler/VektivaSmarwiHandler.java b/bundles/org.openhab.binding.vektiva/src/main/java/org/openhab/binding/vektiva/internal/handler/VektivaSmarwiHandler.java index 3ac39d9c6..e4b1bb68f 100644 --- a/bundles/org.openhab.binding.vektiva/src/main/java/org/openhab/binding/vektiva/internal/handler/VektivaSmarwiHandler.java +++ b/bundles/org.openhab.binding.vektiva/src/main/java/org/openhab/binding/vektiva/internal/handler/VektivaSmarwiHandler.java @@ -17,7 +17,11 @@ import static org.openhab.binding.vektiva.internal.VektivaBindingConstants.*; import java.io.IOException; import java.net.URI; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java index 53406da83..8e1c7cc61 100644 --- a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java +++ b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/WebThingHandler.java @@ -16,7 +16,8 @@ import java.io.IOException; import java.net.URI; import java.time.Duration; import java.time.Instant; -import java.util.*; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -28,11 +29,15 @@ import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.openhab.binding.webthing.internal.channel.Channels; -import org.openhab.binding.webthing.internal.client.*; +import org.openhab.binding.webthing.internal.client.ConsumedThing; +import org.openhab.binding.webthing.internal.client.ConsumedThingFactory; import org.openhab.binding.webthing.internal.link.ChannelToPropertyLink; import org.openhab.binding.webthing.internal.link.PropertyToChannelLink; import org.openhab.binding.webthing.internal.link.UnknownPropertyException; -import org.openhab.core.thing.*; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.types.Command; import org.openhab.core.types.RefreshType; diff --git a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/discovery/WebthingDiscoveryService.java b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/discovery/WebthingDiscoveryService.java index 0e056221e..9fed42b0b 100644 --- a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/discovery/WebthingDiscoveryService.java +++ b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/discovery/WebthingDiscoveryService.java @@ -12,15 +12,25 @@ */ package org.openhab.binding.webthing.internal.discovery; -import static org.openhab.binding.webthing.internal.WebThingBindingConstants.MDNS_SERVICE_TYPE; -import static org.openhab.binding.webthing.internal.WebThingBindingConstants.THING_TYPE_UID; +import static org.openhab.binding.webthing.internal.WebThingBindingConstants.*; import java.io.IOException; import java.net.URI; import java.time.Duration; import java.time.Instant; -import java.util.*; -import java.util.concurrent.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import javax.jmdns.ServiceEvent; import javax.jmdns.ServiceInfo; diff --git a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/link/TypeConverters.java b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/link/TypeConverters.java index b7665f5fc..15c314adb 100644 --- a/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/link/TypeConverters.java +++ b/bundles/org.openhab.binding.webthing/src/main/java/org/openhab/binding/webthing/internal/link/TypeConverters.java @@ -12,13 +12,18 @@ */ package org.openhab.binding.webthing.internal.link; -import java.awt.*; +import java.awt.Color; import java.math.BigDecimal; import java.util.Collection; import java.util.Locale; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.OpenClosedType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.StringType; import org.openhab.core.types.Command; import org.openhab.core.types.State; @@ -32,7 +37,7 @@ class TypeConverters { /** * create a TypeConverter for a given Item type and property type - * + * * @param itemType the item type * @param propertyType the property type * @return the type converter diff --git a/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/client/Mocks.java b/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/client/Mocks.java index 92f386167..daf414212 100644 --- a/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/client/Mocks.java +++ b/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/client/Mocks.java @@ -12,14 +12,12 @@ */ package org.openhab.binding.webthing.internal.client; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import java.util.concurrent.*; +import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; diff --git a/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/link/WebthingChannelLinkTest.java b/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/link/WebthingChannelLinkTest.java index cbdd63497..149810d87 100644 --- a/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/link/WebthingChannelLinkTest.java +++ b/bundles/org.openhab.binding.webthing/src/test/java/org/openhab/binding/webthing/internal/link/WebthingChannelLinkTest.java @@ -12,7 +12,7 @@ */ package org.openhab.binding.webthing.internal.link; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.*; import java.net.URI; @@ -29,8 +29,14 @@ import org.openhab.binding.webthing.internal.channel.Channels; import org.openhab.binding.webthing.internal.client.Mocks; import org.openhab.binding.webthing.internal.client.WebthingTest; import org.openhab.binding.webthing.internal.client.dto.PropertyStatusMessage; -import org.openhab.core.library.types.*; -import org.openhab.core.thing.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.OpenClosedType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.ThingUID; import org.openhab.core.types.Command; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandler.java index 3a8bacc56..5300e580b 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoHandler.java @@ -28,7 +28,11 @@ import org.eclipse.jetty.client.api.Authentication; import org.eclipse.jetty.client.api.AuthenticationStore; import org.eclipse.jetty.client.util.DigestAuthentication; import org.eclipse.jetty.client.util.StringContentProvider; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.types.Command; import org.openhab.core.types.RefreshType; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoUtil.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoUtil.java index d6ff83750..f85155f42 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoUtil.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/WlanThermoUtil.java @@ -46,8 +46,9 @@ public class WlanThermoUtil { } public static T requireNonNull(@Nullable T obj) throws WlanThermoInputException { - if (obj == null) + if (obj == null) { throw new WlanThermoInputException(); + } return obj; } } diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandler.java index cf72a89eb..d5a8f3fc4 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandler.java @@ -31,7 +31,11 @@ import org.openhab.binding.wlanthermo.internal.api.esp32.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.data.Pm; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.data.System; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.settings.Settings; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.ImperialUnits; import org.openhab.core.library.unit.SIUnits; import org.openhab.core.library.unit.Units; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32Handler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32Handler.java index b42c882c0..3d20422a2 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32Handler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32Handler.java @@ -18,10 +18,16 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; -import org.openhab.binding.wlanthermo.internal.*; +import org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants; +import org.openhab.binding.wlanthermo.internal.WlanThermoException; +import org.openhab.binding.wlanthermo.internal.WlanThermoHandler; +import org.openhab.binding.wlanthermo.internal.WlanThermoInputException; +import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.settings.Settings; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; import org.openhab.core.types.Command; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandler.java index ccdb04462..38f3f2d72 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandler.java @@ -15,7 +15,7 @@ package org.openhab.binding.wlanthermo.internal.api.mini; import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.*; import static org.openhab.binding.wlanthermo.internal.WlanThermoUtil.requireNonNull; -import java.awt.*; +import java.awt.Color; import javax.measure.Unit; import javax.measure.quantity.Temperature; @@ -24,8 +24,15 @@ import org.eclipse.jdt.annotation.NonNullByDefault; import org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants; import org.openhab.binding.wlanthermo.internal.WlanThermoInputException; import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException; -import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.*; -import org.openhab.core.library.types.*; +import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.App; +import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.Channel; +import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.Data; +import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.Pit; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.ImperialUnits; import org.openhab.core.library.unit.SIUnits; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniHandler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniHandler.java index b5a57c737..a56f1fdbd 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniHandler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniHandler.java @@ -16,9 +16,14 @@ import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; -import org.openhab.binding.wlanthermo.internal.*; +import org.openhab.binding.wlanthermo.internal.WlanThermoException; +import org.openhab.binding.wlanthermo.internal.WlanThermoHandler; +import org.openhab.binding.wlanthermo.internal.WlanThermoInputException; +import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException; import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.App; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; import org.openhab.core.types.Command; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandler.java index a8b6a04c4..9c30f4bf8 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandler.java @@ -15,7 +15,7 @@ package org.openhab.binding.wlanthermo.internal.api.nano; import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.*; import static org.openhab.binding.wlanthermo.internal.WlanThermoUtil.requireNonNull; -import java.awt.*; +import java.awt.Color; import java.math.BigInteger; import java.util.List; @@ -30,7 +30,11 @@ import org.openhab.binding.wlanthermo.internal.api.nano.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.nano.dto.data.Pm; import org.openhab.binding.wlanthermo.internal.api.nano.dto.data.System; import org.openhab.binding.wlanthermo.internal.api.nano.dto.settings.Settings; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.ImperialUnits; import org.openhab.core.library.unit.SIUnits; import org.openhab.core.library.unit.Units; diff --git a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1Handler.java b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1Handler.java index 0232ccc9d..a346c57b3 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1Handler.java +++ b/bundles/org.openhab.binding.wlanthermo/src/main/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1Handler.java @@ -16,10 +16,15 @@ import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jetty.client.HttpClient; -import org.openhab.binding.wlanthermo.internal.*; +import org.openhab.binding.wlanthermo.internal.WlanThermoException; +import org.openhab.binding.wlanthermo.internal.WlanThermoHandler; +import org.openhab.binding.wlanthermo.internal.WlanThermoInputException; +import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException; import org.openhab.binding.wlanthermo.internal.api.nano.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.nano.dto.settings.Settings; -import org.openhab.core.thing.*; +import org.openhab.core.thing.Channel; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; import org.openhab.core.types.Command; import org.openhab.core.types.State; diff --git a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandlerTest.java b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandlerTest.java index 6184268f5..edc38c87f 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandlerTest.java +++ b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/esp32/WlanThermoEsp32CommandHandlerTest.java @@ -13,9 +13,8 @@ package org.openhab.binding.wlanthermo.internal.api.esp32; import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.*; -import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.TRIGGER_NONE; -import java.awt.*; +import java.awt.Color; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -35,7 +34,11 @@ import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException import org.openhab.binding.wlanthermo.internal.WlanThermoUtil; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.esp32.dto.settings.Settings; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.SIUnits; import org.openhab.core.library.unit.Units; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandlerTest.java b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandlerTest.java index 214571132..234a3365f 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandlerTest.java +++ b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/mini/WlanThermoMiniCommandHandlerTest.java @@ -14,7 +14,7 @@ package org.openhab.binding.wlanthermo.internal.api.mini; import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.*; -import java.awt.*; +import java.awt.Color; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -33,7 +33,11 @@ import org.openhab.binding.wlanthermo.internal.WlanThermoException; import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException; import org.openhab.binding.wlanthermo.internal.WlanThermoUtil; import org.openhab.binding.wlanthermo.internal.api.mini.dto.builtin.App; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.ImperialUnits; import org.openhab.core.thing.ChannelUID; import org.openhab.core.thing.ThingUID; diff --git a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandlerTest.java b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandlerTest.java index 1d32bde30..f5b1e2231 100644 --- a/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandlerTest.java +++ b/bundles/org.openhab.binding.wlanthermo/src/test/java/org/openhab/binding/wlanthermo/internal/api/nano/WlanThermoNanoV1CommandHandlerTest.java @@ -14,7 +14,7 @@ package org.openhab.binding.wlanthermo.internal.api.nano; import static org.openhab.binding.wlanthermo.internal.WlanThermoBindingConstants.*; -import java.awt.*; +import java.awt.Color; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; @@ -34,7 +34,11 @@ import org.openhab.binding.wlanthermo.internal.WlanThermoUnknownChannelException import org.openhab.binding.wlanthermo.internal.WlanThermoUtil; import org.openhab.binding.wlanthermo.internal.api.nano.dto.data.Data; import org.openhab.binding.wlanthermo.internal.api.nano.dto.settings.Settings; -import org.openhab.core.library.types.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.QuantityType; +import org.openhab.core.library.types.StringType; import org.openhab.core.library.unit.SIUnits; import org.openhab.core.library.unit.Units; import org.openhab.core.thing.ChannelUID; diff --git a/bundles/org.openhab.binding.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java b/bundles/org.openhab.binding.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java index afecbc538..5580ff51b 100644 --- a/bundles/org.openhab.binding.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java +++ b/bundles/org.openhab.binding.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java @@ -19,7 +19,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.jivesoftware.smack.*; +import org.jivesoftware.smack.SmackException; +import org.jivesoftware.smack.XMPPException; import org.openhab.binding.xmppclient.internal.XMPPClient; import org.openhab.binding.xmppclient.internal.action.XMPPActions; import org.openhab.core.thing.Bridge; diff --git a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java index 3b1c55103..04c469816 100644 --- a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java +++ b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/YeelightHandlerFactory.java @@ -17,7 +17,12 @@ import static org.openhab.binding.yeelight.internal.YeelightBindingConstants.*; import java.util.HashSet; import java.util.Set; -import org.openhab.binding.yeelight.internal.handler.*; +import org.openhab.binding.yeelight.internal.handler.YeelightCeilingHandler; +import org.openhab.binding.yeelight.internal.handler.YeelightCeilingWithAmbientHandler; +import org.openhab.binding.yeelight.internal.handler.YeelightCeilingWithNightHandler; +import org.openhab.binding.yeelight.internal.handler.YeelightColorHandler; +import org.openhab.binding.yeelight.internal.handler.YeelightStripeHandler; +import org.openhab.binding.yeelight.internal.handler.YeelightWhiteHandler; import org.openhab.core.thing.Thing; import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.binding.BaseThingHandlerFactory; diff --git a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightHandlerBase.java b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightHandlerBase.java index 7eb12ecbc..d8e0546f3 100644 --- a/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightHandlerBase.java +++ b/bundles/org.openhab.binding.yeelight/src/main/java/org/openhab/binding/yeelight/internal/handler/YeelightHandlerBase.java @@ -26,8 +26,17 @@ import org.openhab.binding.yeelight.internal.lib.enums.DeviceType; import org.openhab.binding.yeelight.internal.lib.listeners.DeviceConnectionStateListener; import org.openhab.binding.yeelight.internal.lib.listeners.DeviceStatusChangeListener; import org.openhab.binding.yeelight.internal.lib.services.DeviceManager; -import org.openhab.core.library.types.*; -import org.openhab.core.thing.*; +import org.openhab.core.library.types.DecimalType; +import org.openhab.core.library.types.HSBType; +import org.openhab.core.library.types.IncreaseDecreaseType; +import org.openhab.core.library.types.OnOffType; +import org.openhab.core.library.types.PercentType; +import org.openhab.core.library.types.StringType; +import org.openhab.core.thing.ChannelUID; +import org.openhab.core.thing.Thing; +import org.openhab.core.thing.ThingStatus; +import org.openhab.core.thing.ThingStatusDetail; +import org.openhab.core.thing.ThingTypeUID; import org.openhab.core.thing.binding.BaseThingHandler; import org.openhab.core.types.Command; import org.openhab.core.types.RefreshType; diff --git a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Schedules.java b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Schedules.java index 86e134556..8640ff9de 100644 --- a/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Schedules.java +++ b/bundles/org.openhab.io.hueemulation/src/main/java/org/openhab/io/hueemulation/internal/rest/Schedules.java @@ -12,7 +12,12 @@ */ package org.openhab.io.hueemulation.internal.rest; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.UUID; import java.util.stream.Collectors; import javax.ws.rs.Consumes; diff --git a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/ItemTestHelper.java b/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/ItemTestHelper.java index 2399c8808..4d169e1a5 100644 --- a/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/ItemTestHelper.java +++ b/bundles/org.openhab.persistence.influxdb/src/test/java/org/openhab/persistence/influxdb/internal/ItemTestHelper.java @@ -24,10 +24,11 @@ public class ItemTestHelper { public static NumberItem createNumberItem(String name, Number value) { NumberItem numberItem = new NumberItem(name); - if (value instanceof Integer || value instanceof Long) + if (value instanceof Integer || value instanceof Long) { numberItem.setState(new DecimalType(value.longValue())); - else + } else { numberItem.setState(new DecimalType(value.doubleValue())); + } return numberItem; } } diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/charts/RRD4jChartServlet.java b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/charts/RRD4jChartServlet.java index 58bbf2ada..522a24563 100644 --- a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/charts/RRD4jChartServlet.java +++ b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/charts/RRD4jChartServlet.java @@ -17,7 +17,11 @@ import java.awt.Font; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import java.util.Objects; import javax.imageio.ImageIO; import javax.servlet.Servlet; diff --git a/bundles/org.openhab.transform.map/src/test/java/org/openhab/transform/map/internal/MapTransformationServiceTest.java b/bundles/org.openhab.transform.map/src/test/java/org/openhab/transform/map/internal/MapTransformationServiceTest.java index c5b8eec18..00383b1e2 100644 --- a/bundles/org.openhab.transform.map/src/test/java/org/openhab/transform/map/internal/MapTransformationServiceTest.java +++ b/bundles/org.openhab.transform.map/src/test/java/org/openhab/transform/map/internal/MapTransformationServiceTest.java @@ -14,7 +14,11 @@ package org.openhab.transform.map.internal; import static org.junit.jupiter.api.Assertions.*; -import java.io.*; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintStream; import java.util.Locale; import java.util.Properties; import java.util.concurrent.Callable;