Use Collection.isEmpty (#10525)

Fixes 47 SAT UseCollectionIsEmpty findings.

Signed-off-by: Wouter Born <github@maindrain.net>

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 4ed6d58ee957ccfddcaeb01958898b6aa17323d1..d81d2a19abbb78268e936b7da9ea58a49bd314f7 100644 (file)
--- 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
@@ -611,7 +611,7 @@ public class AccountServlet extends HttpServlet {
             if ((stateDeviceSerialNumber == null && device.serialNumber == null)
                     || (stateDeviceSerialNumber != null && stateDeviceSerialNumber.equals(device.serialNumber))) {
                 List<PairedDevice> pairedDeviceList = state.getPairedDeviceList();
-                if (pairedDeviceList.size() > 0) {
+                if (!pairedDeviceList.isEmpty()) {
                     html.append("<table><tr><th align='left'>Name</th><th align='left'>Value</th></tr>");
                     for (PairedDevice pairedDevice : pairedDeviceList) {
                         html.append("<tr><td>");

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 b25cdb286a7c078ba0b470253620e6ae3e15672e..11f3ba79facea3f42180ef66af21d0ba0e89a7aa 100644 (file)
--- 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
@@ -212,7 +212,7 @@ public class SmartHomeDevicesDiscovery extends AbstractDiscoveryService {
                 }
                 Set<SmartHomeDevice> supportedChildren = SmartHomeDeviceHandler.getSupportedSmartHomeDevices(shg,
                         deviceList);
-                if (supportedChildren.size() == 0) {
+                if (supportedChildren.isEmpty()) {
                     // No children with an supported interface
                     continue;
                 }

diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/net/SocketChannelSession.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/net/SocketChannelSession.java
index 6e35a3b6beb4257a5ce8f5c3206ed6bb6302a97c..f437eab8a2938831fb5f67e09ec10156e245a180 100644 (file)
--- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/net/SocketChannelSession.java
+++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/net/SocketChannelSession.java
@@ -347,7 +347,7 @@ public class SocketChannelSession implements SocketSession {
             while (isRunning.get()) {
                 try {
                     // if no listeners, we don't want to start dispatching yet.
-                    if (listeners.size() == 0) {
+                    if (listeners.isEmpty()) {
                         Thread.sleep(250);
                         continue;
                     }

diff --git a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java
index 850bb35f00d723b7e42200974001693867c360a9..fbbc62696cd31c8834e1beb3a7dc843e3e6e9047 100644 (file)
--- a/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java
+++ b/bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzButtonHandler.java
@@ -137,7 +137,7 @@ public class AVMFritzButtonHandler extends DeviceHandler {
     }
 
     private void updateShortLongPressButton(List<ButtonModel> buttons) {
-        ButtonModel shortPressButton = buttons.size() > 0 ? buttons.get(0) : null;
+        ButtonModel shortPressButton = !buttons.isEmpty() ? buttons.get(0) : null;
         ButtonModel longPressButton = buttons.size() > 1 ? buttons.get(1) : null;
         ButtonModel lastPressedButton = shortPressButton != null && (longPressButton == null
                 || shortPressButton.getLastpressedtimestamp() > longPressButton.getLastpressedtimestamp())

diff --git a/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java b/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java
index 8e0d6141a21aadaef0f929b4b8b7fd025ebfd51c..c384c6626a229c8ebcbed5bfefc7d83f289f0855 100644 (file)
--- a/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java
+++ b/bundles/org.openhab.binding.comfoair/src/main/java/org/openhab/binding/comfoair/internal/ComfoAirHandler.java
@@ -87,7 +87,7 @@ public class ComfoAirHandler extends BaseThingHandler {
                         Collection<ComfoAirCommand> affectedReadCommands = ComfoAirCommandType
                                 .getAffectedReadCommands(channelId, keysToUpdate);
 
-                        if (affectedReadCommands.size() > 0) {
+                        if (!affectedReadCommands.isEmpty()) {
                             Runnable updateThread = new AffectedItemsUpdateThread(affectedReadCommands);
                             affectedItemsPoller = scheduler.schedule(updateThread, 3, TimeUnit.SECONDS);
                         }

diff --git a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
index 223a97a06194357f1de49ac0de5480be68ce621c..403d1aa57d12b85c4198c25ccde93cfb9a33e3ac 100644 (file)
--- a/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
+++ b/bundles/org.openhab.binding.draytonwiser/src/main/java/org/openhab/binding/draytonwiser/internal/handler/HotWaterHandler.java
@@ -82,17 +82,17 @@ public class HotWaterHandler extends DraytonWiserThingHandler<HotWaterData> {
 
     private State getHotWaterDemandState() {
         final List<HotWaterDTO> hotWater = getData().hotWater;
-        return OnOffType.from(hotWater.size() >= 1 && "ON".equalsIgnoreCase(hotWater.get(0).getHotWaterRelayState()));
+        return OnOffType.from(!hotWater.isEmpty() && "ON".equalsIgnoreCase(hotWater.get(0).getHotWaterRelayState()));
     }
 
     private State getManualModeState() {
         final List<HotWaterDTO> hotWater = getData().hotWater;
-        return OnOffType.from(hotWater.size() >= 1 && "MANUAL".equalsIgnoreCase(hotWater.get(0).getMode()));
+        return OnOffType.from(!hotWater.isEmpty() && "MANUAL".equalsIgnoreCase(hotWater.get(0).getMode()));
     }
 
     private State getSetPointState() {
         final List<HotWaterDTO> hotWater = getData().hotWater;
-        return OnOffType.from(hotWater.size() >= 1 && "ON".equalsIgnoreCase(hotWater.get(0).getWaterHeatingState()));
+        return OnOffType.from(!hotWater.isEmpty() && "ON".equalsIgnoreCase(hotWater.get(0).getWaterHeatingState()));
     }
 
     private void setManualMode(final boolean manualMode) throws DraytonWiserApiException {

diff --git a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemObjectType.java b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemObjectType.java
index 14655ad730554405d972e5374017d3e97be84424..0b921807adf4228a063c8d48dc3ab7d8e626f093 100644 (file)
--- a/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemObjectType.java
+++ b/bundles/org.openhab.binding.dsmr/src/main/java/org/openhab/binding/dsmr/internal/device/cosem/CosemObjectType.java
@@ -240,7 +240,7 @@ public enum CosemObjectType {
      * @return true if this CosemObjectType support the requested number of values, false otherwise.
      */
     public boolean supportsNrOfValues(int nrOfValues) {
-        if (repeatingDescriptors.size() == 0) {
+        if (repeatingDescriptors.isEmpty()) {
             return nrOfValues == descriptors.size();
         } else {
             /* There are repeating descriptors */

diff --git a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/discovery/EcobeeDiscoveryService.java b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/discovery/EcobeeDiscoveryService.java
index 68cdb46218d21aa298fe6dc7c1c14714e46ee677..e3028f64ae2f856aed95519c109bf3410a718872 100644 (file)
--- a/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/discovery/EcobeeDiscoveryService.java
+++ b/bundles/org.openhab.binding.ecobee/src/main/java/org/openhab/binding/ecobee/internal/discovery/EcobeeDiscoveryService.java
@@ -153,7 +153,7 @@ public class EcobeeDiscoveryService extends AbstractDiscoveryService implements
 
     private synchronized void discoverSensors() {
         List<Thing> thermostatThings = bridgeHandler.getThing().getThings();
-        if (thermostatThings.size() == 0) {
+        if (thermostatThings.isEmpty()) {
             logger.debug("EcobeeDiscovery: Skipping sensor discovery because there are no thermostat things");
             return;
         }

diff --git a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java
index 2a701eaba359742a57fe5a8bf004204be477a0cf..bc990f70206294add81ea500ca1459a771aa48e1 100644 (file)
--- a/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java
+++ b/bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/EnturNoHandler.java
@@ -213,37 +213,39 @@ public class EnturNoHandler extends BaseThingHandler {
         if (processedData.size() > i) {
             State state = UnDefType.UNDEF;
             List<String> departures = processedData.get(i).departures;
+            int departuresCount = departures.size();
             List<String> estimatedFlags = processedData.get(i).estimatedFlags;
+            int esitmatedFlagsCount = estimatedFlags.size();
             switch (channelId) {
                 case EnturNoBindingConstants.CHANNEL_DEPARTURE_01:
-                    state = departures.size() > 0 ? getDateTimeTypeState(departures.get(0)) : state;
+                    state = departuresCount > 0 ? getDateTimeTypeState(departures.get(0)) : state;
                     break;
                 case EnturNoBindingConstants.CHANNEL_DEPARTURE_02:
-                    state = departures.size() > 1 ? getDateTimeTypeState(departures.get(1)) : state;
+                    state = departuresCount > 1 ? getDateTimeTypeState(departures.get(1)) : state;
                     break;
                 case EnturNoBindingConstants.CHANNEL_DEPARTURE_03:
-                    state = departures.size() > 2 ? getDateTimeTypeState(departures.get(2)) : state;
+                    state = departuresCount > 2 ? getDateTimeTypeState(departures.get(2)) : state;
                     break;
                 case EnturNoBindingConstants.CHANNEL_DEPARTURE_04:
-                    state = departures.size() > 3 ? getDateTimeTypeState(departures.get(3)) : state;
+                    state = departuresCount > 3 ? getDateTimeTypeState(departures.get(3)) : state;
                     break;
                 case EnturNoBindingConstants.CHANNEL_DEPARTURE_05:
-                    state = departures.size() > 4 ? getDateTimeTypeState(departures.get(4)) : state;
+                    state = departuresCount > 4 ? getDateTimeTypeState(departures.get(4)) : state;
                     break;
                 case EnturNoBindingConstants.ESTIMATED_FLAG_01:
-                    state = estimatedFlags.size() > 0 ? getStringTypeState(estimatedFlags.get(0)) : state;
+                    state = esitmatedFlagsCount > 0 ? getStringTypeState(estimatedFlags.get(0)) : state;
                     break;
                 case EnturNoBindingConstants.ESTIMATED_FLAG_02:
-                    state = estimatedFlags.size() > 1 ? getStringTypeState(estimatedFlags.get(1)) : state;
+                    state = esitmatedFlagsCount > 1 ? getStringTypeState(estimatedFlags.get(1)) : state;
                     break;
                 case EnturNoBindingConstants.ESTIMATED_FLAG_03:
-                    state = estimatedFlags.size() > 2 ? getStringTypeState(estimatedFlags.get(2)) : state;
+                    state = esitmatedFlagsCount > 2 ? getStringTypeState(estimatedFlags.get(2)) : state;
                     break;
                 case EnturNoBindingConstants.ESTIMATED_FLAG_04:
-                    state = estimatedFlags.size() > 3 ? getStringTypeState(estimatedFlags.get(3)) : state;
+                    state = esitmatedFlagsCount > 3 ? getStringTypeState(estimatedFlags.get(3)) : state;
                     break;
                 case EnturNoBindingConstants.ESTIMATED_FLAG_05:
-                    state = estimatedFlags.size() > 4 ? getStringTypeState(estimatedFlags.get(4)) : state;
+                    state = esitmatedFlagsCount > 4 ? getStringTypeState(estimatedFlags.get(4)) : state;
                     break;
                 case EnturNoBindingConstants.CHANNEL_LINE_CODE:
                     state = getStringTypeState(processedData.get(i).lineCode);

diff --git a/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/HDPowerViewJUnitTests.java b/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/HDPowerViewJUnitTests.java
index 7f6891dd3d2819771d1aec3cd43ed97002922837..afa17d571470a0c604555061df8e203a0ce1707b 100644 (file)
--- a/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/HDPowerViewJUnitTests.java
+++ b/bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/HDPowerViewJUnitTests.java
@@ -168,7 +168,7 @@ public class HDPowerViewJUnitTests {
                 @Nullable
                 List<ShadeData> shadesData = shadesX.shadeData;
                 assertNotNull(shadesData);
-                assertTrue(shadesData.size() > 0);
+                assertTrue(!shadesData.isEmpty());
                 @Nullable
                 ShadeData shadeData;
                 shadeData = shadesData.get(0);
@@ -198,7 +198,7 @@ public class HDPowerViewJUnitTests {
                 @Nullable
                 List<Scene> scenesData = scenes.sceneData;
                 assertNotNull(scenesData);
-                assertTrue(scenesData.size() > 0);
+                assertTrue(!scenesData.isEmpty());
                 @Nullable
                 Scene sceneZero = scenesData.get(0);
                 assertNotNull(sceneZero);

diff --git a/bundles/org.openhab.binding.icalendar/src/test/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendarTest.java b/bundles/org.openhab.binding.icalendar/src/test/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendarTest.java
index 98690a06eedcff797580c7e1919bbe234dac1db0..7bdb0e39778ec99bda40f75736ed1ba9ba30f899 100644 (file)
--- a/bundles/org.openhab.binding.icalendar/src/test/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendarTest.java
+++ b/bundles/org.openhab.binding.icalendar/src/test/java/org/openhab/binding/icalendar/internal/logic/BiweeklyPresentableCalendarTest.java
@@ -252,9 +252,9 @@ public class BiweeklyPresentableCalendarTest {
         events = calendar3.getJustBegunEvents(Instant.parse("2020-01-28T15:55:00Z"),
                 Instant.parse("2020-01-28T16:05:00Z"));
         assertNotNull(events);
-        assertTrue(events.size() > 0);
+        assertTrue(!events.isEmpty());
         List<CommandTag> cmdTags = events.get(0).commandTags;
-        assertTrue(cmdTags.size() > 0);
+        assertTrue(!cmdTags.isEmpty());
         CommandTag cmd = cmdTags.get(0);
         // accept correct, empty or null configuration codes
         assertTrue(cmd.isAuthorized("abc"));

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 dcc4503b881fbdd6f24a52217a3565731ff0b1fd..dcdc9efdd86c3f3528358d19d3e82ffca987b806 100644 (file)
--- 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
@@ -187,7 +187,7 @@ public abstract class JablotronAlarmHandler extends BaseThingHandler {
         }
 
         List<JablotronHistoryDataEvent> events = sendGetEventHistory();
-        if (events != null && events.size() > 0) {
+        if (events != null && !events.isEmpty()) {
             JablotronHistoryDataEvent event = events.get(0);
             updateLastEvent(event);
         }
@@ -221,7 +221,7 @@ public abstract class JablotronAlarmHandler extends BaseThingHandler {
 
     protected void updateEventChannel(String channel) {
         List<JablotronHistoryDataEvent> events = eventCache.getValue();
-        if (events != null && events.size() > 0) {
+        if (events != null && !events.isEmpty()) {
             JablotronHistoryDataEvent event = events.get(0);
             switch (channel) {
                 case CHANNEL_LAST_EVENT_TIME:

diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java
index 7b4b72f246b2fb89de0ed78b9f1c982d259c9932..21de9c3eb867aab799f828bcb1331254b53778fc 100644 (file)
--- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java
+++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100FHandler.java
@@ -12,9 +12,7 @@
  */
 package org.openhab.binding.jablotron.internal.handler;
 
-import static org.openhab.binding.jablotron.JablotronBindingConstants.BINDING_ID;
-import static org.openhab.binding.jablotron.JablotronBindingConstants.CACHE_TIMEOUT_MS;
-import static org.openhab.binding.jablotron.JablotronBindingConstants.CHANNEL_LAST_CHECK_TIME;
+import static org.openhab.binding.jablotron.JablotronBindingConstants.*;
 
 import java.util.List;
 
@@ -181,7 +179,7 @@ public class JablotronJa100FHandler extends JablotronAlarmHandler {
 
             // update events
             List<JablotronHistoryDataEvent> events = sendGetEventHistory();
-            if (events != null && events.size() > 0) {
+            if (events != null && !events.isEmpty()) {
                 JablotronHistoryDataEvent event = events.get(0);
                 updateLastEvent(event);
             }

diff --git a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java
index 8cf74b1a9d7490f95ef88cf7a62439cff098bc9a..8f8be61e336aae2fe9d1a9719847f5dadc142aa9 100644 (file)
--- a/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java
+++ b/bundles/org.openhab.binding.jablotron/src/main/java/org/openhab/binding/jablotron/internal/handler/JablotronJa100Handler.java
@@ -12,9 +12,7 @@
  */
 package org.openhab.binding.jablotron.internal.handler;
 
-import static org.openhab.binding.jablotron.JablotronBindingConstants.BINDING_ID;
-import static org.openhab.binding.jablotron.JablotronBindingConstants.CACHE_TIMEOUT_MS;
-import static org.openhab.binding.jablotron.JablotronBindingConstants.CHANNEL_LAST_CHECK_TIME;
+import static org.openhab.binding.jablotron.JablotronBindingConstants.*;
 
 import java.util.List;
 
@@ -199,7 +197,7 @@ public class JablotronJa100Handler extends JablotronAlarmHandler {
 
     private void updateTemperatureChannel(Channel channel, JablotronServiceDetailSegment segment) {
         List<JablotronServiceDetailSegmentInfo> infos = segment.getSegmentInfos();
-        if (infos.size() > 0) {
+        if (!infos.isEmpty()) {
             logger.debug("Found value: {} and type: {}", infos.get(0).getValue(), infos.get(0).getType());
             updateState(channel.getUID(), QuantityType.valueOf(infos.get(0).getValue(), SIUnits.CELSIUS));
         } else {

diff --git a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java
index 17517e2b3faa50a252eaecfd8fadb6d1d44fa781..27c887127ea1bbbacf3e939ad1b120bee9f12a12 100644 (file)
--- a/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java
+++ b/bundles/org.openhab.binding.loxone/src/main/java/org/openhab/binding/loxone/internal/LxServerHandler.java
@@ -487,7 +487,7 @@ public class LxServerHandler extends BaseThingHandler implements LxServerHandler
 
                 state.setStateValue(update.getValue());
             });
-            if (perStateUuid.size() == 0) {
+            if (perStateUuid.isEmpty()) {
                 logger.debug("[{}] State update UUID={} has empty controls table", debugId, update.getUuid());
             }
         } else {

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/BasicChannelTypeProvider.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/BasicChannelTypeProvider.java
index c4f2340e26bc94bb969f3378efbd9a421eb7d254..d4956cc32def59699881af1f56ddd9a1a6b26ab8 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/BasicChannelTypeProvider.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/BasicChannelTypeProvider.java
@@ -17,10 +17,10 @@ import static org.openhab.binding.miio.internal.MiIoBindingConstants.BINDING_ID;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -108,8 +108,8 @@ public class BasicChannelTypeProvider implements ChannelTypeProvider {
             if (category != null) {
                 channelTypeBuilder.withCategory(category);
             }
-            final LinkedHashSet<String> tags = miChannel.getTags();
-            if (tags != null && tags.size() > 0) {
+            final Set<String> tags = miChannel.getTags();
+            if (tags != null && !tags.isEmpty()) {
                 channelTypeBuilder.withTags(tags);
             }
             channelTypes.put(channelTypeUID.getAsString(), channelTypeBuilder.build());

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
index cefd4469be06833366b52fed5cfba4c9c62f8c96..e20e4592a3d6773acfa54451cc3a958a52926d37 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoBasicHandler.java
@@ -19,10 +19,10 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import javax.measure.Unit;
@@ -471,8 +471,8 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
             ChannelTypeUID channelTypeUID = new ChannelTypeUID(miChannel.getChannelType());
             if (channelTypeRegistry.getChannelType(channelTypeUID) != null) {
                 newChannel = newChannel.withType(channelTypeUID);
-                final LinkedHashSet<String> tags = miChannel.getTags();
-                if (tags != null && tags.size() > 0) {
+                final Set<String> tags = miChannel.getTags();
+                if (tags != null && !tags.isEmpty()) {
                     newChannel.withDefaultTags(tags);
                 }
             } else {
@@ -485,8 +485,8 @@ public class MiIoBasicHandler extends MiIoAbstractHandler {
         if (useGeneratedChannelType) {
             newChannel = newChannel
                     .withType(new ChannelTypeUID(BINDING_ID, model.toUpperCase().replace(".", "_") + "_" + channel));
-            final LinkedHashSet<String> tags = miChannel.getTags();
-            if (tags != null && tags.size() > 0) {
+            final Set<String> tags = miChannel.getTags();
+            if (tags != null && !tags.isEmpty()) {
                 newChannel.withDefaultTags(tags);
             }
         }

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoUnsupportedHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoUnsupportedHandler.java
index 41c67411f806c396ba640a798627805ba5836ff3..563b7e8cdaa97f2001d70ecb3bb66856e2c3f7b7 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoUnsupportedHandler.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoUnsupportedHandler.java
@@ -264,7 +264,7 @@ public class MiIoUnsupportedHandler extends MiIoAbstractHandler {
             sb.append(supportedChannelList.get(ch));
             sb.append("\r\n");
         }
-        if (supportedChannelList.size() > 0) {
+        if (!supportedChannelList.isEmpty()) {
             MiIoBasicDevice mbd = createBasicDeviceDb(model, new ArrayList<>(supportedChannelList.keySet()));
             sb.append("Created experimental database for your device:\r\n");
             sb.append(GSONP.toJson(mbd));

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
index a77249d84abf7657036fbaf2be8d34922a3146f8..388385cac05a933ad2dd4a13afbb66d71cc7d3d2 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java
@@ -180,7 +180,7 @@ public class RRMapDraw {
                 g2d.draw(new Line2D.Float(xPos, yP, xPos, yP));
             }
         }
-        if (logger.isDebugEnabled() && roomIds.size() > 0) {
+        if (logger.isDebugEnabled() && !roomIds.isEmpty()) {
             StringBuilder sb = new StringBuilder();
             for (Integer r : roomIds) {
                 sb.append(" " + r.toString());

diff --git a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
index 6366c51210969e6a1a3b09d372ecd7efd4968fe2..94d937886ac16fd95676bcc18bde95759d573827 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
+++ b/bundles/org.openhab.binding.miio/src/test/java/org/openhab/binding/miio/internal/ReadmeHelper.java
@@ -166,7 +166,7 @@ public class ReadmeHelper {
         StateDescriptionDTO stateDescription = channel.getStateDescription();
         if (stateDescription != null && stateDescription.getOptions() != null) {
             final List<OptionsValueListDTO> options = stateDescription.getOptions();
-            if (options != null && options.size() > 0) {
+            if (options != null && !options.isEmpty()) {
                 StringBuilder mapping = new StringBuilder();
                 mapping.append("Value mapping [");
                 options.forEach((option) -> {

diff --git a/bundles/org.openhab.binding.neohub/src/main/java/org/openhab/binding/neohub/internal/NeoHubHandler.java b/bundles/org.openhab.binding.neohub/src/main/java/org/openhab/binding/neohub/internal/NeoHubHandler.java
index c95be4270afbab2ae35fbccb948eb51ffe4d043d..67e981b3bb18a82b5edc1a781b2385805b581a07 100644 (file)
--- a/bundles/org.openhab.binding.neohub/src/main/java/org/openhab/binding/neohub/internal/NeoHubHandler.java
+++ b/bundles/org.openhab.binding.neohub/src/main/java/org/openhab/binding/neohub/internal/NeoHubHandler.java
@@ -243,7 +243,7 @@ public class NeoHubHandler extends BaseBridgeHandler {
 
             @Nullable
             List<? extends AbstractRecord> devices = deviceData.getDevices();
-            if (devices == null || devices.size() == 0) {
+            if (devices == null || devices.isEmpty()) {
                 logger.warn(MSG_FMT_DEVICE_POLL_ERR, "no devices found");
                 updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR);
                 return null;

diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/NetatmoBridgeHandler.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/NetatmoBridgeHandler.java
index 12a8d38abb4565d5d91bcd1d6c6124ebba11ecfd..61ce9fa850f94be81c19b4b4bd29e90e26f18965 100644 (file)
--- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/NetatmoBridgeHandler.java
+++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/NetatmoBridgeHandler.java
@@ -299,7 +299,7 @@ public class NetatmoBridgeHandler extends BaseBridgeHandler {
                 .map(api -> api.getmeasure(equipmentId, scale, types, moduleId, null, "last", 1, true, false).getBody())
                 .orElse(null);
         updateStatus(ThingStatus.ONLINE);
-        NAMeasureBodyElem element = (data != null && data.size() > 0) ? data.get(0) : null;
+        NAMeasureBodyElem element = data != null && !data.isEmpty() ? data.get(0) : null;
         return element != null ? element.getValue().get(0) : Collections.emptyList();
     }
 

diff --git a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
index fcedd4764a975658c2ff87c131a7e560a1ef8058..8addb1754b7fb2c1508358e7717dd4db6131a838 100644 (file)
--- a/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
+++ b/bundles/org.openhab.binding.ojelectronics/src/main/java/org/openhab/binding/ojelectronics/internal/ThermostatHandler.java
@@ -131,7 +131,7 @@ public class ThermostatHandler extends BaseThingHandler {
      */
     public @Nullable Thermostat tryHandleAndGetUpdatedThermostat() {
         final LinkedList<SimpleImmutableEntry<String, Command>> updatedValues = this.updatedValues;
-        if (updatedValues.size() == 0) {
+        if (updatedValues.isEmpty()) {
             return null;
         }
         this.updatedValues = new LinkedList<>();

diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java
index f7ec33b018946fc263c205b3d385932aff142a35..a47f233d040cebb432f5e4ba6ad217c69f5cd457 100644 (file)
--- a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java
+++ b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabBridgeHandler.java
@@ -262,7 +262,7 @@ public class RemoteopenhabBridgeHandler extends BaseBridgeHandler
                     logger.debug(
                             "{} channels defined (with {} different channel types) for the thing {} (from {} items including {} groups)",
                             channels.size(), nbChannelTypesCreated, getThing().getUID(), items.size(), nbGroups);
-                } else if (channels.size() > 0) {
+                } else if (!channels.isEmpty()) {
                     int nbRemoved = 0;
                     for (Channel channel : channels) {
                         if (getThing().getChannel(channel.getUID()) != null) {
@@ -319,7 +319,7 @@ public class RemoteopenhabBridgeHandler extends BaseBridgeHandler
             Channel channel = getThing().getChannel(item.name);
             RemoteopenhabStateDescription descr = item.stateDescription;
             List<RemoteopenhabStateOption> options = descr == null ? null : descr.options;
-            if (channel != null && options != null && options.size() > 0) {
+            if (channel != null && options != null && !options.isEmpty()) {
                 List<StateOption> stateOptions = new ArrayList<>();
                 for (RemoteopenhabStateOption option : options) {
                     stateOptions.add(new StateOption(option.value, option.label));

diff --git a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabThingHandler.java b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabThingHandler.java
index db6335c937059fb3ce6e59e3557fac79f5dc59da..ab29c91b42c4a455f6d6681d4d9c32d974231b29 100644 (file)
--- a/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabThingHandler.java
+++ b/bundles/org.openhab.binding.remoteopenhab/src/main/java/org/openhab/binding/remoteopenhab/internal/handler/RemoteopenhabThingHandler.java
@@ -158,7 +158,7 @@ public class RemoteopenhabThingHandler extends BaseThingHandler implements Remot
                     .withLabel(channelDTO.label).withDescription(channelDTO.description)
                     .withConfiguration(channelConfig).build());
         }
-        if (channels.size() > 0) {
+        if (!channels.isEmpty()) {
             ThingBuilder thingBuilder = editThing();
             int nbRemoved = 0;
             for (Channel channel : channels) {

diff --git a/bundles/org.openhab.binding.sensebox/src/main/java/org/openhab/binding/sensebox/internal/SenseBoxAPIConnection.java b/bundles/org.openhab.binding.sensebox/src/main/java/org/openhab/binding/sensebox/internal/SenseBoxAPIConnection.java
index 0e14c975b9c8cf448cad130b34ed9b7e315bb02a..7ef94fa7ad9b87c25af3ef92e92e9302352e3266 100644 (file)
--- a/bundles/org.openhab.binding.sensebox/src/main/java/org/openhab/binding/sensebox/internal/SenseBoxAPIConnection.java
+++ b/bundles/org.openhab.binding.sensebox/src/main/java/org/openhab/binding/sensebox/internal/SenseBoxAPIConnection.java
@@ -80,17 +80,18 @@ public class SenseBoxAPIConnection {
                 if (loc.getGeometry() != null) {
                     List<Double> locationData = loc.getGeometry().getData();
                     if (locationData != null) {
+                        int locationDataCount = locationData.size();
                         SenseBoxLocation location = new SenseBoxLocation();
 
-                        if (locationData.size() > 0) {
+                        if (locationDataCount > 0) {
                             location.setLongitude(locationData.get(0));
                         }
 
-                        if (locationData.size() > 1) {
+                        if (locationDataCount > 1) {
                             location.setLatitude(locationData.get(1));
                         }
 
-                        if (locationData.size() > 2) {
+                        if (locationDataCount > 2) {
                             location.setHeight(locationData.get(2));
                         }
 

diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java
index 25d6b43022f15a1476164a12abdc26a90bba2875..5307e6a3727e58bf0148ac046abd485174f10d5f 100755 (executable)
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyBaseHandler.java
@@ -949,7 +949,7 @@ public class ShellyBaseHandler extends BaseThingHandler implements ShellyDeviceL
 
     public boolean updateWakeupReason(@Nullable List<Object> valueArray) {
         boolean changed = false;
-        if ((valueArray != null) && (valueArray.size() > 0)) {
+        if (valueArray != null && !valueArray.isEmpty()) {
             String reason = getString((String) valueArray.get(0));
             String newVal = valueArray.toString();
             changed = updateChannel(CHANNEL_GROUP_DEV_STATUS, CHANNEL_DEVST_WAKEUP, getStringType(reason));

diff --git a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java
index ebc220e65023968e3407e8c5af3e3b2ace7261d8..0d6e0b9b7ccd26b30fc19d5ca602cbefe59197bd 100644 (file)
--- a/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java
+++ b/bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/handler/ShellyLightHandler.java
@@ -492,7 +492,7 @@ public class ShellyLightHandler extends ShellyBaseHandler {
             logger.debug("{}: Setting effect to {}", thingName, newCol.effect);
             parms.put(SHELLY_COLOR_EFFECT, newCol.effect.toString());
         }
-        if (parms.size() > 0) {
+        if (!parms.isEmpty()) {
             logger.debug("{}: Send light settings: {}", thingName, parms);
             api.setLightParms(lightId, parms);
             updateCurrentColors(lightId, newCol);

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 7793315547d5e85524acda17f4116e76793402bc..5ccfc737f55c3ce434f72906ce31068a163b1153 100644 (file)
--- 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
@@ -130,7 +130,7 @@ public class PhonebookProfileFactory implements ProfileFactory, ProfileTypeProvi
                         thingName + " - " + phonebook.getName()))
                 .collect(Collectors.toList());
 
-        if (parameterOptions.size() > 0) {
+        if (!parameterOptions.isEmpty()) {
             parameterOptions.add(new ParameterOption(thingUid, thingName));
         }
 

diff --git a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
index 8d4b109f50ef79b2500b160e76659ce282814ed9..8f6174e38af77bde41051c6d655be4c61438b451 100644 (file)
--- a/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
+++ b/bundles/org.openhab.binding.upnpcontrol/src/main/java/org/openhab/binding/upnpcontrol/internal/util/UpnpXMLParser.java
@@ -375,7 +375,7 @@ public class UpnpXMLParser {
                 entries.add(new UpnpEntry(id, refId, parentId, upnpClass.toString()).withTitle(title.toString())
                         .withAlbum(album.toString()).withAlbumArtUri(albumArtUri.toString())
                         .withCreator(creator.toString())
-                        .withArtist(artistList.size() > 0 ? artistList.get(0) : artist.toString())
+                        .withArtist(!artistList.isEmpty() ? artistList.get(0) : artist.toString())
                         .withPublisher(publisher.toString()).withGenre(genre.toString()).withTrackNumber(trackNumberVal)
                         .withResList(resList));
 

diff --git a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java
index bd6097c482b0893cf6d361ae0b3c12521080381a..4a9dcff9bf4a1b562dd0241900e5eef44e702eee 100644 (file)
--- a/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java
+++ b/bundles/org.openhab.binding.vigicrues/src/main/java/org/openhab/binding/vigicrues/internal/handler/VigiCruesHandler.java
@@ -243,7 +243,7 @@ public class VigiCruesHandler extends BaseThingHandler {
     }
 
     private void updateRelativeMeasure(String channelId, List<QuantityType<?>> reference, double value) {
-        if (reference.size() > 0) {
+        if (!reference.isEmpty()) {
             double percent = value / reference.get(0).doubleValue() * 100;
             updateQuantity(channelId, percent, Units.PERCENT);
         }

diff --git a/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/dto/Status.java b/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/dto/Status.java
index a0f0a086b1aaa222eb6fced75c13c5e1f3a4d9b1..7c70f687277cc0d1edec72b1930dce028e862625 100644 (file)
--- a/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/dto/Status.java
+++ b/bundles/org.openhab.binding.volvooncall/src/main/java/org/openhab/binding/volvooncall/internal/dto/Status.java
@@ -92,7 +92,7 @@ public class Status extends VocAnswer {
     }
 
     public boolean aFailedBulb() {
-        return bulbFailures.size() > 0;
+        return !bulbFailures.isEmpty();
     }
 
     /*

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 d5a8f3fc443300c7db3eb255e7faa73b873d3783..b229d958bf4948af9adfe0ee3c0f9d361f498048 100644 (file)
--- 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
@@ -91,7 +91,7 @@ public class WlanThermoEsp32CommandHandler {
             }
         } else if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList != null && channelList.size() > 0 && channelId < channelList.size()) {
+            if (channelList != null && !channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 switch (channelUID.getIdWithoutGroup()) {
                     case CHANNEL_NAME:
@@ -176,7 +176,7 @@ public class WlanThermoEsp32CommandHandler {
 
         if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList.size() > 0 && channelId < channelList.size()) {
+            if (!channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 switch (channelUID.getIdWithoutGroup()) {
                     case CHANNEL_NAME:
@@ -283,7 +283,7 @@ public class WlanThermoEsp32CommandHandler {
 
         if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList.size() > 0 && channelId < channelList.size()) {
+            if (!channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 if (CHANNEL_ALARM_OPENHAB.equals(channelUID.getIdWithoutGroup())) {
                     if (channel.getTemp() != 999) {

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 9c30f4bf803f2f1683f714cbc4d29b758204525c..d5a88d89382a6bddfa9d2075760a7eac27ab417b 100644 (file)
--- 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
@@ -81,7 +81,7 @@ public class WlanThermoNanoV1CommandHandler {
             }
         } else if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList.size() > 0 && channelId < channelList.size()) {
+            if (!channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 switch (channelUID.getIdWithoutGroup()) {
                     case CHANNEL_NAME:
@@ -165,7 +165,7 @@ public class WlanThermoNanoV1CommandHandler {
 
         if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList.size() > 0 && channelId < channelList.size()) {
+            if (!channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 switch (channelUID.getIdWithoutGroup()) {
                     case CHANNEL_NAME:
@@ -266,7 +266,7 @@ public class WlanThermoNanoV1CommandHandler {
 
         if (channelUID.getId().startsWith(CHANNEL_PREFIX)) {
             int channelId = Integer.parseInt(groupId.substring(CHANNEL_PREFIX.length())) - 1;
-            if (channelList.size() > 0 && channelId < channelList.size()) {
+            if (!channelList.isEmpty() && channelId < channelList.size()) {
                 Channel channel = channelList.get(channelId);
                 if (CHANNEL_ALARM_OPENHAB.equals(channelUID.getIdWithoutGroup())) {
                     if (channel.getTemp() != 999) {

diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
index 3eea5aa2e648d5fba89bd84800c36287c8b826be..4f936583765e95e9cedc03b5b6bfa50b88a03118 100644 (file)
--- a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
+++ b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
@@ -671,7 +671,7 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
 
         public boolean isValid() { // a valid configuration must be initialized
             // and contain at least one function
-            return (isInitialized && (archives.size() > 0));
+            return isInitialized && !archives.isEmpty();
         }
 
         @Override