]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix SAT warnings (#14202)
authorHolger Friedrich <holgerfriedrich@users.noreply.github.com>
Fri, 13 Jan 2023 07:11:06 +0000 (08:11 +0100)
committerGitHub <noreply@github.com>
Fri, 13 Jan 2023 07:11:06 +0000 (08:11 +0100)
* Fix SAT warnings

- checkstyle.ModifierOrderCheck
- checkstyle.OneStatementPerLineCheck
- checkstyle.NeedBracesCheck
- PMD.UseStandardCharsets
- PMD.UseCollectionIsEmpty
- PMD.UnusedLocalVariable
- PMD.SimplifyBooleanReturns where reasonable, suppress where
readability is better without change
- PMD.SimplifyBooleanExpressions

* Include StandardCharsets

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
86 files changed:
bundles/org.openhab.binding.bluetooth/src/main/java/org/openhab/binding/bluetooth/discovery/internal/BluetoothDeviceSnapshot.java
bundles/org.openhab.binding.boschshc/src/main/java/org/openhab/binding/boschshc/internal/services/AbstractStatelessBoschSHCService.java
bundles/org.openhab.binding.cm11a/src/main/java/org/openhab/binding/cm11a/internal/X10ReceivedData.java
bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java
bundles/org.openhab.binding.digiplex/src/main/java/org/openhab/binding/digiplex/internal/communication/DigiplexResponseResolver.java
bundles/org.openhab.binding.digiplex/src/main/java/org/openhab/binding/digiplex/internal/communication/events/AbstractEvent.java
bundles/org.openhab.binding.digiplex/src/main/java/org/openhab/binding/digiplex/internal/discovery/DigiplexDiscoveryService.java
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/climate/datatypes/AssignSensorType.java
bundles/org.openhab.binding.digitalstrom/src/main/java/org/openhab/binding/digitalstrom/internal/lib/structure/devices/deviceparameters/impl/DeviceSensorValue.java
bundles/org.openhab.binding.dmx/src/main/java/org/openhab/binding/dmx/internal/Util.java
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/A5_11/A5_11_03.java
bundles/org.openhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/messages/ESP3PacketFactory.java
bundles/org.openhab.binding.enturno/src/main/java/org/openhab/binding/enturno/internal/connection/EnturNoConnection.java
bundles/org.openhab.binding.fineoffsetweatherstation/src/main/java/org/openhab/binding/fineoffsetweatherstation/internal/domain/Measurand.java
bundles/org.openhab.binding.fronius/src/main/java/org/openhab/binding/fronius/internal/FroniusHttpUtil.java
bundles/org.openhab.binding.fsinternetradio/src/test/java/org/openhab/binding/fsinternetradio/test/FSInternetRadioHandlerJavaTest.java
bundles/org.openhab.binding.gardena/src/main/java/org/openhab/binding/gardena/internal/model/dto/Device.java
bundles/org.openhab.binding.globalcache/src/main/java/org/openhab/binding/globalcache/internal/handler/GlobalCacheHandler.java
bundles/org.openhab.binding.goecharger/src/main/java/org/openhab/binding/goecharger/internal/handler/GoEChargerV2Handler.java
bundles/org.openhab.binding.gpio/src/main/java/org/openhab/binding/gpio/internal/handler/PigpioDigitalInputHandler.java
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/GreeException.java
bundles/org.openhab.binding.gree/src/main/java/org/openhab/binding/gree/internal/handler/GreeAirDevice.java
bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/action/HeosActions.java
bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosChannelHandlerGrouping.java
bundles/org.openhab.binding.heos/src/main/java/org/openhab/binding/heos/internal/handler/HeosThingBaseHandler.java
bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/communicator/client/RpcClient.java
bundles/org.openhab.binding.homematic/src/main/java/org/openhab/binding/homematic/internal/type/HomematicTypeGeneratorImpl.java
bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/device/InsteonAddress.java
bundles/org.openhab.binding.km200/src/main/java/org/openhab/binding/km200/internal/handler/KM200SwitchProgramServiceHandler.java
bundles/org.openhab.binding.lcn/src/main/java/org/openhab/binding/lcn/internal/common/Variable.java
bundles/org.openhab.binding.luxom/src/main/java/org/openhab/binding/luxom/internal/handler/util/PercentageConverter.java
bundles/org.openhab.binding.luxtronikheatpump/src/main/java/org/openhab/binding/luxtronikheatpump/internal/enums/HeatpumpChannel.java
bundles/org.openhab.binding.magentatv/src/main/java/org/openhab/binding/magentatv/internal/handler/MagentaTVControl.java
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/TimeStabilizer.java
bundles/org.openhab.binding.mielecloud/src/main/java/org/openhab/binding/mielecloud/internal/webservice/api/TransitionState.java
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java
bundles/org.openhab.binding.modbus.sunspec/src/main/java/org/openhab/binding/modbus/sunspec/internal/parser/CommonModelParser.java
bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/handler/NanoleafControllerHandler.java
bundles/org.openhab.binding.nanoleaf/src/main/java/org/openhab/binding/nanoleaf/internal/model/PanelLayout.java
bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusPushButtonHandler.java
bundles/org.openhab.binding.nikobus/src/main/java/org/openhab/binding/nikobus/internal/handler/NikobusRollershutterModuleHandler.java
bundles/org.openhab.binding.onkyo/src/main/java/org/openhab/binding/onkyo/internal/OnkyoBindingConstants.java
bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/communication/messages/PartitionCommand.java
bundles/org.openhab.binding.paradoxalarm/src/main/java/org/openhab/binding/paradoxalarm/internal/util/ParadoxUtil.java
bundles/org.openhab.binding.paradoxalarm/src/test/java/org/openhab/binding/paradoxalarm/internal/TestGetBytes.java
bundles/org.openhab.binding.pjlinkdevice/src/main/java/org/openhab/binding/pjlinkdevice/internal/device/command/input/Input.java
bundles/org.openhab.binding.plugwise/src/main/java/org/openhab/binding/plugwise/internal/protocol/field/MACAddress.java
bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/handler/ResolThingHandler.java
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/RFXComTestHelper.java
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting4MessageTest.java
bundles/org.openhab.binding.russound/src/main/java/org/openhab/binding/russound/internal/rio/system/RioSystemConfig.java
bundles/org.openhab.binding.samsungtv/src/main/java/org/openhab/binding/samsungtv/internal/handler/SamsungTvHandler.java
bundles/org.openhab.binding.satel/src/main/java/org/openhab/binding/satel/internal/protocol/SatelMessage.java
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyBindingConstants.java
bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/MeterValue.java
bundles/org.openhab.binding.smartmeter/src/main/java/org/openhab/binding/smartmeter/internal/conformity/negate/NegateBitModel.java
bundles/org.openhab.binding.squeezebox/src/main/java/org/openhab/binding/squeezebox/internal/handler/SqueezeBoxServerHandler.java
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/TACmiBindingConstants.java
bundles/org.openhab.binding.tacmi/src/main/java/org/openhab/binding/tacmi/internal/message/DigitalMessage.java
bundles/org.openhab.binding.tankerkoenig/src/main/java/org/openhab/binding/tankerkoenig/internal/handler/StationHandler.java
bundles/org.openhab.binding.touchwand/src/main/java/org/openhab/binding/touchwand/internal/dto/TouchWandUnitFromJson.java
bundles/org.openhab.binding.velbus/src/main/java/org/openhab/binding/velbus/internal/handler/VelbusRelayWithInputHandler.java
bundles/org.openhab.binding.ventaair/src/main/java/org/openhab/binding/ventaair/internal/VentaThingHandler.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureAlarmsDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureBaseThingDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureBroadbandConnectionsDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureDoorWindowsDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureGatewayDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureInstallationsDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureMiceDetectionDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureSmartLockDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureSmartPlugsDTO.java
bundles/org.openhab.binding.verisure/src/main/java/org/openhab/binding/verisure/internal/dto/VerisureUserPresencesDTO.java
bundles/org.openhab.binding.wemo/src/main/java/org/openhab/binding/wemo/internal/WemoUtil.java
bundles/org.openhab.binding.zoneminder/src/main/java/org/openhab/binding/zoneminder/internal/handler/ZmBridgeHandler.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitSettings.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitAccessoryFactory.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitHumiditySensorImpl.java
bundles/org.openhab.persistence.dynamodb/src/main/java/org/openhab/persistence/dynamodb/internal/DynamoDBPersistenceService.java
bundles/org.openhab.persistence.dynamodb/src/test/java/org/openhab/persistence/dynamodb/internal/BaseIntegrationTest.java
bundles/org.openhab.persistence.influxdb/src/main/java/org/openhab/persistence/influxdb/internal/influx2/Influx2FilterCriteriaQueryCreatorImpl.java
bundles/org.openhab.transform.scale/src/main/java/org/openhab/transform/scale/internal/Range.java

index 9f477e61690b5211c682dd57b1a7537eb691927a..f192d7c41fbeb7e18bd1e783bc0d5472110ef893 100644 (file)
@@ -165,6 +165,7 @@ public class BluetoothDeviceSnapshot extends BluetoothDiscoveryDevice {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index c205d366d5d86fdfb921b88452ad1fb1ef697849..0230d71d5b37878e2980816d1cf990a209176dd9 100644 (file)
@@ -57,8 +57,9 @@ public abstract class AbstractStatelessBoschSHCService extends AbstractBoschSHCS
      */
     public void postAction() throws InterruptedException, TimeoutException, ExecutionException {
         BridgeHandler bridgeHandler = getBridgeHandler();
-        if (bridgeHandler == null)
+        if (bridgeHandler == null) {
             return;
+        }
 
         bridgeHandler.postAction(endpoint);
     }
index a5dd75cc23901e157b932d1be9f81b1e686e123c..40fcf4fc7cc6ef3f50ffac59558f50105cacbfd5 100644 (file)
@@ -127,6 +127,7 @@ public class X10ReceivedData {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
index 4c3fb70878acdcd1e88d222e43d248f726448fe5..70a9bf574736290a008c94353fb3ceed4b654a0e 100644 (file)
@@ -392,7 +392,7 @@ public class LightThingHandler extends DeconzBaseThingHandler {
                 }
                 break;
             case CHANNEL_COLOR:
-                if (on != null && on == false) {
+                if (on != null && !on) {
                     updateState(channelId, OnOffType.OFF);
                 } else if (bri != null && "xy".equals(newState.colormode)) {
                     final double @Nullable [] xy = newState.xy;
index 14a063d481e5bf1d082dbcbcf522e0ee06170b42..384d00d24179ea480e47282c71eead221cc68401 100644 (file)
@@ -113,11 +113,7 @@ public class DigiplexResponseResolver {
     }
 
     private static boolean toBoolean(char value) {
-        if (value == 'O') {
-            return false;
-        } else {
-            return true;
-        }
+        return value != 'O';
     }
 
     private static DigiplexResponse resolveSystemEvent(String message) {
index ebc7e86c7f3e553e70190ed828dd50b3b2380faa..559257bac8df105e9ff80862339d35302a0460a7 100644 (file)
@@ -41,9 +41,6 @@ public abstract class AbstractEvent implements DigiplexResponse {
         // TODO: According to documentation: areaNo = 255 - Occurs in at least one area enabled in the system.
         // I did never encounter 255 on my system though (EVO192).
         // 15 is returned instead, which (I believe) has the same meaning.
-        if (this.areaNo == 15 || this.areaNo == 255) {
-            return true;
-        }
-        return false;
+        return (this.areaNo == 15 || this.areaNo == 255);
     }
 }
index b6348a759d8dd8517438a724d256190b022d03fb..f28e6d3e51b61f654740fc9a78c5d74d87e7f2ff 100644 (file)
@@ -101,11 +101,7 @@ public class DigiplexDiscoveryService extends AbstractDiscoveryService
 
     private boolean isDefaultName(ZoneLabelResponse response) {
         return ZONE_DEFAULT_NAMES.stream().anyMatch(format -> {
-            if (String.format(format, response.zoneNo).equals(response.zoneName)) {
-                return true;
-            } else {
-                return false;
-            }
+            return String.format(format, response.zoneNo).equals(response.zoneName);
         });
     }
 
index 1813e53fbe1157571febeb890934be3bae5a6377..e85c90e3b4ca50bfe911df1f1ce8313e0318ea17 100644 (file)
@@ -83,6 +83,7 @@ public class AssignSensorType {
      * 
      * @see java.lang.Object#equals(java.lang.Object)
      */
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
index 41a4b6e4d5e56967d984db5a27b1dbaedc077779..674e1e24c8dd01adffa10ff2d30454245ea5db9d 100644 (file)
@@ -33,13 +33,7 @@ public class Util {
      * @return true or false
      */
     public static boolean inRange(int value, int min, int max) {
-        if (value < min) {
-            return false;
-        }
-        if (value > max) {
-            return false;
-        }
-        return true;
+        return value >= min && value <= max;
     }
 
     /**
index 82e7f9225d73294c49c78c9867c586efc3541ce0..c719f9afa2ab0b32e211527a2183d5913384149a 100644 (file)
@@ -380,7 +380,6 @@ public class PanelThingHandler extends DSCAlarmBaseThingHandler {
         String[] channelTypes = { PANEL_SERVICE_REQUIRED, PANEL_AC_TROUBLE, PANEL_TELEPHONE_TROUBLE, PANEL_FTC_TROUBLE,
                 PANEL_ZONE_FAULT, PANEL_ZONE_TAMPER, PANEL_ZONE_LOW_BATTERY, PANEL_TIME_LOSS };
 
-        String channel;
         ChannelUID channelUID = null;
 
         int bitCount = 8;
index 49b8b31dfc92d7a9eb39582b67bf68068a15fd4c..7ae30eeea5c6e4177f1365f2a8baf9b25919008c 100644 (file)
@@ -40,12 +40,8 @@ public class A5_11_03 extends _4BSMessage {
 
         int state = (db1 >> 4) & 0x03;
 
-        if (state != 0) {
-            // TODO: display error state on thing
-            return true;
-        } else {
-            return false;
-        }
+        // TODO: display error state on thing
+        return state != 0;
     }
 
     protected State getPositionData() {
index c444bcac541c6cd9b6c4140c43f07d6869d38f23..4fbf31a64ef41f2d9c151171a96cfd28ad1fde78 100644 (file)
@@ -49,7 +49,7 @@ public class ESP3PacketFactory {
                 new byte[] { SAMessageType.SA_WR_LEARNMODE.getValue(), (byte) (activate ? 1 : 0), 0, 0, 0, 0, 0 });
     }
 
-    public final static BasePacket SA_RD_LEARNEDCLIENTS = new SAMessage(SAMessageType.SA_RD_LEARNEDCLIENTS);
+    public static final BasePacket SA_RD_LEARNEDCLIENTS = new SAMessage(SAMessageType.SA_RD_LEARNEDCLIENTS);
 
     public static BasePacket SA_RD_MAILBOX_STATUS(byte[] clientId, byte[] controllerId) {
         return new SAMessage(SAMessageType.SA_RD_MAILBOX_STATUS,
index ee8896f13032c25d191623ca3f9927fc6a784029..8d9b01fe5e46376756f0a24272ff9d4f2d8b1a31 100644 (file)
@@ -196,7 +196,7 @@ public class EnturNoConnection {
                 .collect(groupingBy(call -> call.quay.id));
 
         List<DisplayData> processedData = new ArrayList<>();
-        if (departures.keySet().size() > 0) {
+        if (!departures.keySet().isEmpty()) {
             DisplayData processedData01 = getDisplayData(stopPlace, departures, 0);
             processedData.add(processedData01);
         }
index 6332ee82c8e82a5f229ca6837ea0eb3c83ac43cc..786cc992ac965d4503c85c88f646bbaee355a30b 100644 (file)
@@ -348,8 +348,9 @@ public enum Measurand {
         }
 
         public MeasureType getMeasureType(@Nullable ParserCustomizationType customizationType) {
-            if (customizationType == null)
+            if (customizationType == null) {
                 return measureType;
+            }
             return Optional.ofNullable(customizations).map(m -> m.get(customizationType))
                     .map(ParserCustomization::getMeasureType).orElse(measureType);
         }
index 4f993c8654a749f5bc9e1948af55b0bd2af8c765..5977390948a04f0b569f1f0c96dfe0c36abbf8f0 100644 (file)
@@ -38,7 +38,7 @@ public class FroniusHttpUtil {
      * @return the response body
      * @throws FroniusCommunicationException when the request execution failed or interrupted
      */
-    public synchronized static String executeUrl(String url, int timeout) throws FroniusCommunicationException {
+    public static synchronized String executeUrl(String url, int timeout) throws FroniusCommunicationException {
         int attemptCount = 1;
         try {
             while (true) {
index 60a9c44c58fabc9bd5bdda1e1292a2b12abcf389..7b4b9a1cda77ef54d51bbedb5568b921cce13cea 100644 (file)
@@ -821,10 +821,7 @@ public class FSInternetRadioHandlerJavaTest extends JavaTest {
         BigDecimal port = (BigDecimal) config.get(FSInternetRadioBindingConstants.CONFIG_PROPERTY_PORT.toString());
         String pin = (String) config.get(FSInternetRadioBindingConstants.CONFIG_PROPERTY_PIN.toString());
 
-        if (ip == null || port.compareTo(BigDecimal.ZERO) == 0 || pin == null || pin.isEmpty()) {
-            return false;
-        }
-        return true;
+        return !(ip == null || port.compareTo(BigDecimal.ZERO) == 0 || pin == null || pin.isEmpty());
     }
 
     @SuppressWarnings("null")
index 63f5033f8d2a9b9ccc20a03d54b42d7075a52150..29839ae4428f231b92129af814a6de8e3e43f6f5 100644 (file)
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 public class Device {
     private final Logger logger = LoggerFactory.getLogger(Device.class);
 
-    private transient static final String DEVICE_TYPE_PREFIX = "gardena smart";
+    private static final transient String DEVICE_TYPE_PREFIX = "gardena smart";
     public boolean active = true;
     public String id;
     public String deviceType;
index c95577db53aec604fc4cd1edc9f3a6c5569ecd08..9456d28227f516f0490ecdd97cdffc4ea4917f61 100644 (file)
@@ -443,10 +443,10 @@ public class GlobalCacheHandler extends BaseThingHandler {
         private Logger logger = LoggerFactory.getLogger(CommandProcessor.class);
 
         private boolean terminate = false;
-        private final String TERMINATE_COMMAND = "terminate";
+        private static final String TERMINATE_COMMAND = "terminate";
 
-        private final int SEND_QUEUE_MAX_DEPTH = 10;
-        private final int SEND_QUEUE_TIMEOUT = 2000;
+        private static final int SEND_QUEUE_MAX_DEPTH = 10;
+        private static final int SEND_QUEUE_TIMEOUT = 2000;
 
         private ConnectionManager connectionManager;
 
@@ -594,19 +594,19 @@ public class GlobalCacheHandler extends BaseThingHandler {
 
         private boolean deviceIsConnected;
 
-        private final String COMMAND_NAME = "command";
-        private final String SERIAL1_NAME = "serial-1";
-        private final String SERIAL2_NAME = "serial-2";
+        private static final String COMMAND_NAME = "command";
+        private static final String SERIAL1_NAME = "serial-1";
+        private static final String SERIAL2_NAME = "serial-2";
 
-        private final int COMMAND_PORT = 4998;
-        private final int SERIAL1_PORT = 4999;
-        private final int SERIAL2_PORT = 5000;
+        private static final int COMMAND_PORT = 4998;
+        private static final int SERIAL1_PORT = 4999;
+        private static final int SERIAL2_PORT = 5000;
 
-        private final int SOCKET_CONNECT_TIMEOUT = 1500;
+        private static final int SOCKET_CONNECT_TIMEOUT = 1500;
 
         private ScheduledFuture<?> connectionMonitorJob;
-        private final int CONNECTION_MONITOR_FREQUENCY = 60;
-        private final int CONNECTION_MONITOR_START_DELAY = 15;
+        private static final int CONNECTION_MONITOR_FREQUENCY = 60;
+        private static final int CONNECTION_MONITOR_START_DELAY = 15;
 
         private Runnable connectionMonitorRunnable = () -> {
             logger.trace("Performing connection check for thing {} at IP {}", thingID(), commandConnection.getIP());
@@ -844,10 +844,7 @@ public class GlobalCacheHandler extends BaseThingHandler {
         }
 
         private boolean deviceSupportsSerialPort2() {
-            if (thing.getThingTypeUID().equals(THING_TYPE_GC_100_12)) {
-                return true;
-            }
-            return false;
+            return thing.getThingTypeUID().equals(THING_TYPE_GC_100_12);
         }
 
         /*
index 5f648ee4f1b149f6028273c2f95ba85785160096..a853a8a14bacbdf9604fa80ff9f65e8610d6a720 100644 (file)
@@ -68,6 +68,7 @@ public class GoEChargerV2Handler extends GoEChargerBaseHandler {
         super(thing, httpClient);
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanExpressions")
     @Override
     protected State getValue(String channelId, GoEStatusResponseBaseDTO goeResponseBase) {
         var state = super.getValue(channelId, goeResponseBase);
index 538dee85c10741373eb0bf90cefaaaf8e0200d7c..65086458a0071080b3467fd28e4ea1bbd12e6042 100644 (file)
@@ -66,8 +66,9 @@ public class PigpioDigitalInputHandler implements ChannelHandler {
         } else if (pullupdownStr.equals(GPIOBindingConstants.PUD_UP)) {
             pullupdown = JPigpio.PI_PUD_UP;
         } else {
-            if (!pullupdownStr.equals(GPIOBindingConstants.PUD_OFF))
+            if (!pullupdownStr.equals(GPIOBindingConstants.PUD_OFF)) {
                 throw new InvalidPullUpDownException();
+            }
         }
         gpio = new GPIO(jPigpio, gpioId, JPigpio.PI_INPUT);
         jPigpio.gpioSetAlertFunc(gpio.getPin(), (gpio, level, tick) -> {
index aad379c0c2e03d7ac61dbb932f3ebf534049b6e8..6706e1e7cb99e07130b1304fefb1b181f0a7c797 100644 (file)
@@ -33,7 +33,7 @@ import com.google.gson.JsonSyntaxException;
 @NonNullByDefault
 public class GreeException extends Exception {
     private static final long serialVersionUID = -2337258558995287405L;
-    private static String EX_NONE = "none";
+    private static final String EX_NONE = "none";
 
     public GreeException(@Nullable Exception exception) {
         super(exception);
index a55b8ec30a067032e7332368ff448805c68c4d17..f6c2eecc2f52614f9635526aea82eeb18558d477 100644 (file)
@@ -60,7 +60,7 @@ import com.google.gson.JsonSyntaxException;
 @NonNullByDefault
 public class GreeAirDevice {
     private final Logger logger = LoggerFactory.getLogger(GreeAirDevice.class);
-    private final static Gson gson = new Gson();
+    private static final Gson gson = new Gson();
     private boolean isBound = false;
     private final InetAddress ipAddress;
     private int port = 0;
@@ -80,7 +80,6 @@ public class GreeAirDevice {
     }
 
     public void getDeviceStatus(DatagramSocket clientSocket) throws GreeException {
-
         if (!isBound) {
             throw new GreeException("Device not bound");
         }
index 3d02d008ef442ea80e6002b4cd3f9096b4674cad..8cd281586756d5bc92822e4ba1a4bd51e0a3deea 100644 (file)
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public class HeosActions implements ThingActions {
 
-    private final static Logger logger = LoggerFactory.getLogger(HeosActions.class);
+    private static final Logger logger = LoggerFactory.getLogger(HeosActions.class);
 
     private @Nullable HeosBridgeHandler handler;
 
index 75f09f7c75c5657e4c4d9970761e01a5e1c03e4a..e37801f8f32506eeed714d660ca84eb714258cce 100644 (file)
@@ -43,7 +43,6 @@ public class HeosChannelHandlerGrouping extends BaseHeosChannelHandler {
     @Override
     public void handleGroupCommand(Command command, @Nullable String id, ThingUID uid,
             HeosGroupHandler heosGroupHandler) throws IOException, ReadException {
-
         if (command instanceof RefreshType) {
             return;
         }
index addba554e4fa1565fc56a3ce18be78bdbf5b9b55..8dea3c4a9199721726f5d3707ce430b03f47fec0 100644 (file)
@@ -278,7 +278,6 @@ public abstract class HeosThingBaseHandler extends BaseThingHandler implements H
         }
 
         switch (command) {
-
             case PLAYER_STATE_CHANGED:
                 playerStateChanged(eventObject);
                 break;
index 75f073e20f776c1a4dc91d2162579da2cc663f8f..3c171b8045263d426fcbfcac1a896b319faaf3a5 100644 (file)
@@ -131,8 +131,9 @@ public abstract class RpcClient<T> {
      * Disposes the client.
      */
     public void dispose() {
-        if (future != null)
+        if (future != null) {
             future.cancel(true);
+        }
     }
 
     /**
index 9be4870efcccdb9789d4d2acb00b0149bf4b3edd..a572a4f5029a460c5791d3954407df650930039d 100644 (file)
@@ -335,7 +335,7 @@ public class HomematicTypeGeneratorImpl implements HomematicTypeGenerator {
                                     ParameterOption defaultOption = options.get(offset);
                                     logger.trace("Changing default option to {} (offset {})", defaultOption, offset);
                                     builder.withDefault(defaultOption.getValue());
-                                } else if (options.size() > 0) {
+                                } else if (!options.isEmpty()) {
                                     ParameterOption defaultOption = options.get(0);
                                     logger.trace("Changing default option to {} (first value)", defaultOption);
                                     builder.withDefault(defaultOption.getValue());
index bcbb3a64b9c0ea962c6c5e634220186e44899150..8808869f116078b722ab0a981db0d6d38b94d273 100644 (file)
@@ -148,6 +148,7 @@ public class InsteonAddress {
         return s;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 441cc3c55b6e4bf53c4934e4ae6839695ef453a2..a72c6c3b128db51dd8c23452b1e5c9bb852db904 100644 (file)
@@ -49,13 +49,13 @@ public class KM200SwitchProgramServiceHandler {
 
     protected final Integer MIN_TIME = 0;
     protected final Integer MAX_TIME = 1430;
-    protected final static String TYPE_MONDAY = "Mo";
-    protected final static String TYPE_TUESDAY = "Tu";
-    protected final static String TYPE_WEDNESDAY = "We";
-    protected final static String TYPE_THURSDAY = "Th";
-    protected final static String TYPE_FRIDAY = "Fr";
-    protected final static String TYPE_SATURDAY = "Sa";
-    protected final static String TYPE_SUNDAY = "Su";
+    protected static final String TYPE_MONDAY = "Mo";
+    protected static final String TYPE_TUESDAY = "Tu";
+    protected static final String TYPE_WEDNESDAY = "We";
+    protected static final String TYPE_THURSDAY = "Th";
+    protected static final String TYPE_FRIDAY = "Fr";
+    protected static final String TYPE_SATURDAY = "Sa";
+    protected static final String TYPE_SUNDAY = "Su";
 
     private String activeDay = TYPE_MONDAY;
     private Integer activeCycle = 1;
index a5e4894615a2ab2a4991c78212eeaa8d22259033..3b929c61553bcbae11bed7faa4584a8952199df6 100644 (file)
@@ -244,6 +244,7 @@ public enum Variable {
      * @param is2013 the target module's-generation
      * @return true if a poll is required to get the new status-value
      */
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     public boolean shouldPollStatusAfterCommand(int firmwareVersion) {
         // Regulator set-points will send status-messages on every change (all firmware versions)
         if (type == Type.REGULATOR) {
index 8e8a38210295b62ffe5d6d5a38e02a2f41797f10..3c312164264e62ebe9cabcda1de4418524751e8b 100644 (file)
@@ -30,8 +30,9 @@ public class PercentageConverter {
      * @return if hexRepresentation == null return -1, otherwise return percentage
      */
     public static int getPercentage(@Nullable String hexRepresentation) {
-        if (hexRepresentation == null)
+        if (hexRepresentation == null) {
             return -1;
+        }
         int decimal = Integer.parseInt(hexRepresentation, 16);
         BigDecimal level = new BigDecimal(100 * decimal).divide(new BigDecimal(255), RoundingMode.FLOOR);
         return level.intValue();
index 59e02d57dcf6cd37796ff919304f308417ec00c5..f52e7a1d08df14323d405c081d3323e7bb3ff3fc 100644 (file)
@@ -1410,11 +1410,7 @@ public enum HeatpumpChannel {
 
         int code = visiblity.getCode();
 
-        if (visibilityValues.length < code || visibilityValues[code] == 1) {
-            return true;
-        }
-
-        return false;
+        return (visibilityValues.length < code || visibilityValues[code] == 1);
     }
 
     public static HeatpumpChannel fromString(String heatpumpCommand) throws InvalidChannelException {
index 7c076b985fce10017a8302ec99df4e0ac1d76a26..0fce1cb9771712863cdcc580db19bc57155c5dab 100644 (file)
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @NonNullByDefault
 public class MagentaTVControl {
     private final Logger logger = LoggerFactory.getLogger(MagentaTVControl.class);
-    private final static HashMap<String, String> KEY_MAP = new HashMap<>();
+    private static final HashMap<String, String> KEY_MAP = new HashMap<>();
 
     private final MagentaTVNetwork network;
     private final MagentaTVHttp http = new MagentaTVHttp();
index 090245a6bf2713ac322ae312b593250d49606e06..81fcb188b70c0984825b0955f010a02cd05086c4 100644 (file)
@@ -30,8 +30,8 @@ import org.eclipse.jdt.annotation.Nullable;
 @NonNullByDefault
 public class TimeStabilizer {
 
-    private final static int SLIDING_SECONDS = 300;
-    private final static int MAX_FLUCTUATION_SECONDS = 180;
+    private static final int SLIDING_SECONDS = 300;
+    private static final int MAX_FLUCTUATION_SECONDS = 180;
 
     private final Deque<Item> cache = new ConcurrentLinkedDeque<Item>();
 
index 8b54bb9d3aa21e68e7f313b35598e5a38e2daeb8..853905829512bd8d28e38d2bd8393a5fc227e264 100644 (file)
@@ -55,6 +55,7 @@ public class TransitionState {
         return previousState.map(this::hasFinishedChangedFromPreviousState).orElse(true);
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     private boolean hasFinishedChangedFromPreviousState(DeviceState previous) {
         if (previous.getStateType().equals(nextState.getStateType())) {
             return false;
index b42f92851db008e250a1a5f82117b6b36629bc13..2de266a627fb2f7d3802654d03ccfe56dfebe120 100644 (file)
@@ -128,10 +128,7 @@ public class MillheatAccountHandler extends BaseBridgeHandler {
 
     private boolean allowModelUpdate() {
         final long timeSinceLastUpdate = System.currentTimeMillis() - model.getLastUpdated();
-        if (timeSinceLastUpdate > MIN_TIME_BETWEEEN_MODEL_UPDATES_MS) {
-            return true;
-        }
-        return false;
+        return timeSinceLastUpdate > MIN_TIME_BETWEEEN_MODEL_UPDATES_MS;
     }
 
     public MillheatModel getModel() {
index 69cd751526e4076a00e33ca6e11c9c7827117585..52204c9df0e5854b26a1a27bacc784d64b94f868 100644 (file)
@@ -12,7 +12,7 @@
  */
 package org.openhab.binding.modbus.sunspec.internal.parser;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.binding.modbus.sunspec.internal.SunSpecConstants;
@@ -52,10 +52,10 @@ public class CommonModelParser extends AbstractBaseParser implements SunspecPars
         }
 
         // parse manufacturer, model and version
-        block.manufacturer = ModbusBitUtilities.extractStringFromRegisters(raw, 2, 32, Charset.forName("UTF-8"));
-        block.model = ModbusBitUtilities.extractStringFromRegisters(raw, 18, 32, Charset.forName("UTF-8"));
-        block.version = ModbusBitUtilities.extractStringFromRegisters(raw, 42, 16, Charset.forName("UTF-8"));
-        block.serialNumber = ModbusBitUtilities.extractStringFromRegisters(raw, 50, 32, Charset.forName("UTF-8"));
+        block.manufacturer = ModbusBitUtilities.extractStringFromRegisters(raw, 2, 32, StandardCharsets.UTF_8);
+        block.model = ModbusBitUtilities.extractStringFromRegisters(raw, 18, 32, StandardCharsets.UTF_8);
+        block.version = ModbusBitUtilities.extractStringFromRegisters(raw, 42, 16, StandardCharsets.UTF_8);
+        block.serialNumber = ModbusBitUtilities.extractStringFromRegisters(raw, 50, 32, StandardCharsets.UTF_8);
 
         block.deviceAddress = extractUInt16(raw, 66, 1);
 
index 3f4cbf464d143df235d86b3cecb15b57a1b2eead..49953a787f6722794114028f3d0d84401662f7f2 100644 (file)
@@ -903,8 +903,6 @@ public class NanoleafControllerHandler extends BaseBridgeHandler implements Nano
                 break;
             case CHANNEL_COLOR_TEMPERATURE_ABS:
                 // Color temperature (absolute)
-                int colorTempKelvin;
-
                 IntegerState state = new Ct();
                 if (command instanceof DecimalType) {
                     state.setValue(((DecimalType) command).intValue());
index 125773de078d6e9909109c31e8dacc94a836860c..aa3fa00d427ad9c4e0fb2bce232ef64f4a3aa24f 100644 (file)
@@ -78,7 +78,7 @@ public class PanelLayout {
             goEquals = go.equals(otherGo);
         }
 
-        if (goEquals == false) {
+        if (!goEquals) {
             // No reason to compare layout if global oriantation is different
             return false;
         }
index aaa4e31f0117b50b1ff44be2414cbdd1cc4d74fa..1b58951433386c6c58e1f776688809b8baae3c23 100644 (file)
@@ -299,9 +299,9 @@ public class NikobusPushButtonHandler extends NikobusBaseThingHandler {
             processNext(currentTimeMillis);
         }
 
-        abstract protected void reset(long currentTimeMillis);
+        protected abstract void reset(long currentTimeMillis);
 
-        abstract protected void processNext(long currentTimeMillis);
+        protected abstract void processNext(long currentTimeMillis);
     }
 
     public static class TriggerButtonConfig {
index 4b198b048c58a3194f2bb1cb94bbc912d83a6f4c..a33e43dd97e15ddf7f4d0566726e68687a687bf4 100644 (file)
@@ -294,8 +294,8 @@ public class NikobusRollershutterModuleHandler extends NikobusModuleHandler {
         final int up;
         final int down;
 
-        final static DirectionConfiguration NORMAL = new DirectionConfiguration(1, 2);
-        final static DirectionConfiguration REVERSED = new DirectionConfiguration(2, 1);
+        static final DirectionConfiguration NORMAL = new DirectionConfiguration(1, 2);
+        static final DirectionConfiguration REVERSED = new DirectionConfiguration(2, 1);
 
         private DirectionConfiguration(int up, int down) {
             this.up = up;
index 0363fbab4f250ba62e7f15253520f4df4d8f4658..5e4536ff05c3aa89a74f6bd446e428f3d709a6be 100644 (file)
@@ -90,10 +90,10 @@ public class OnkyoBindingConstants {
     public static final String CHANNEL_NET_MENU8 = "netmenu#item8";
     public static final String CHANNEL_NET_MENU9 = "netmenu#item9";
 
-    public final static String CHANNEL_AUDIO_IN_INFO = "info#audioIn";
-    public final static String CHANNEL_AUDIO_OUT_INFO = "info#audioOut";
-    public final static String CHANNEL_VIDEO_IN_INFO = "info#videoIn";
-    public final static String CHANNEL_VIDEO_OUT_INFO = "info#videoOut";
+    public static final String CHANNEL_AUDIO_IN_INFO = "info#audioIn";
+    public static final String CHANNEL_AUDIO_OUT_INFO = "info#audioOut";
+    public static final String CHANNEL_VIDEO_IN_INFO = "info#videoIn";
+    public static final String CHANNEL_VIDEO_OUT_INFO = "info#videoOut";
 
     // Used for Discovery service
     public static final String MANUFACTURER = "ONKYO";
index 2b855a1b280bce212cc4fece1a357a76e33b502f..14c8d0551b25ca7ad14c26d27230d8fad13bba99 100644 (file)
@@ -32,7 +32,7 @@ public enum PartitionCommand {
     DISARM(6),
     BEEP(8);
 
-    private final static Logger logger = LoggerFactory.getLogger(PartitionCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(PartitionCommand.class);
 
     private int command;
 
index efac61c59fbbadcb1616300d350e5abb339bbc34..0f6768f2c4562419a74f9d4ff91258cb236c0997 100644 (file)
@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 public class ParadoxUtil {
 
     private static final String SPACE_DELIMITER = " ";
-    private final static Logger logger = LoggerFactory.getLogger(ParadoxUtil.class);
+    private static final Logger logger = LoggerFactory.getLogger(ParadoxUtil.class);
 
     public static byte calculateChecksum(byte[] payload) {
         int result = 0;
index f78b9cab780173633459033ea85ce434256ad049..5d571a17ec5459dd99a2042abc3f38ee65d82d55 100644 (file)
@@ -41,7 +41,7 @@ public class TestGetBytes {
         System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "TRACE");
     }
 
-    private final static Logger logger = LoggerFactory.getLogger(ParadoxUtil.class);
+    private static final Logger logger = LoggerFactory.getLogger(ParadoxUtil.class);
 
     private static final byte[] EXPECTED1 = { (byte) 0xAA, 0x0A, 0x00, 0x03, 0x08, (byte) 0xF0, 0x00, 0x00, 0x01,
             (byte) 0xEE, (byte) 0xEE, (byte) 0xEE, (byte) 0xEE, (byte) 0xEE, (byte) 0xEE, (byte) 0xEE, 0x01, 0x02, 0x03,
index 6b4b1de28069c73afc163728f92763ebac1e55a6..5cae8b5d4eb3dad2bf49dc7ea439a09314fdf2a9 100644 (file)
@@ -73,6 +73,7 @@ public class Input {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 555898e021ed9f62ad70e46abded0b935adf241c..7a8fd2639c13a5497bede6f7d6bcdc42ff36cc55 100644 (file)
@@ -37,6 +37,7 @@ public class MACAddress {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 3c30245c0323a726cbb92fd6a6762cb6e93978fe..20dff6490e9bf5c8e1267e9a69d81f2645fdc387 100644 (file)
@@ -308,6 +308,7 @@ public class ResolThingHandler extends ResolBaseThingHandler {
     }
 
     /* check if the given value is a special one like 888.8 or 999.9 for shortcut or open load on a sensor wire */
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     private boolean isSpecialValue(Double dd) {
         if ((Math.abs(dd - 888.8) < 0.1) || (Math.abs(dd - (-888.8)) < 0.1)) {
             /* value out of range */
index 4784888738de4767bfd1f7b830718e04c6d3435a..e7422fb15045ac137ec911fc05b934636e8f4a2e 100644 (file)
@@ -33,13 +33,13 @@ import org.openhab.core.thing.ThingUID;
  */
 @NonNullByDefault
 public class RFXComTestHelper {
-    static final public ThingUID bridgeUID = new ThingUID("rfxcom", "tcpbridge", "rfxtrx0");
-    static final public ThingUID thingUID = new ThingUID("rfxcom", bridgeUID, "mocked");
-    static final public ThingTypeUID thingTypeUID = new ThingTypeUID("rfxcom", "raw");
+    public static final ThingUID bridgeUID = new ThingUID("rfxcom", "tcpbridge", "rfxtrx0");
+    public static final ThingUID thingUID = new ThingUID("rfxcom", bridgeUID, "mocked");
+    public static final ThingTypeUID thingTypeUID = new ThingTypeUID("rfxcom", "raw");
 
-    static final public ChannelUID commandChannelUID = new ChannelUID(thingUID, RFXComBindingConstants.CHANNEL_COMMAND);
+    public static final ChannelUID commandChannelUID = new ChannelUID(thingUID, RFXComBindingConstants.CHANNEL_COMMAND);
 
-    static public void basicBoundaryCheck(PacketType packetType, RFXComMessage message) throws RFXComException {
+    public static void basicBoundaryCheck(PacketType packetType, RFXComMessage message) throws RFXComException {
         // This is a place where its easy to make mistakes in coding, and can result in errors, normally
         // array bounds errors
         byte[] binaryMessage = message.decodeMessage();
@@ -47,7 +47,7 @@ public class RFXComTestHelper {
         assertEquals(packetType.toByte(), binaryMessage[1], "Wrong packet type");
     }
 
-    static public int getActualIntValue(RFXComDeviceMessage msg, RFXComDeviceConfiguration config, String channelId)
+    public static int getActualIntValue(RFXComDeviceMessage msg, RFXComDeviceConfiguration config, String channelId)
             throws RFXComException {
         return ((DecimalType) msg.convertToState(channelId, config, new MockDeviceState())).intValue();
     }
index 35dfbd9fb18050310711f347f6dc8d2fab4ec1ac..22ce7c0c3d35e1d0d2298b9a47f9dcd8e06f48f9 100644 (file)
@@ -46,9 +46,9 @@ import org.openhab.core.util.HexUtils;
  */
 @NonNullByDefault
 public class RFXComLighting4MessageTest {
-    static public final ChannelUID contactChannelUID = new ChannelUID(thingUID, CHANNEL_CONTACT);
+    public static final ChannelUID contactChannelUID = new ChannelUID(thingUID, CHANNEL_CONTACT);
 
-    static public void checkDiscoveryResult(RFXComDeviceMessage<RFXComLighting4Message.SubType> msg, String deviceId,
+    public static void checkDiscoveryResult(RFXComDeviceMessage<RFXComLighting4Message.SubType> msg, String deviceId,
             @Nullable Integer pulse, String subType) throws RFXComException {
         String thingUID = "homeduino:rfxcom:fssfsd:thing";
         DiscoveryResultBuilder builder = DiscoveryResultBuilder.create(new ThingUID(thingUID));
index d782d25faeccdb1d7e4fbc051d7cda61f4b4a3ce..2ff32001cd47215ee804549785ea47a81e48efae 100644 (file)
@@ -142,6 +142,7 @@ public class RioSystemConfig {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
index 2fa0d3da5cbb10072f4510c62425a3842f5a97bb..9ebf0fa002bf3b4ee8bd66853d751c529c61feac 100644 (file)
@@ -242,12 +242,12 @@ public class SamsungTvHandler extends BaseThingHandler implements RegistryListen
         boolean isOnline = false;
 
         for (Device<?, ?, ?> device : upnpService.getRegistry().getDevices()) {
-            if (createService((RemoteDevice) device) == true) {
+            if (createService((RemoteDevice) device)) {
                 isOnline = true;
             }
         }
 
-        if (isOnline == true) {
+        if (isOnline) {
             logger.debug("Device was online");
             putOnline();
         } else {
index 282d94843d50b17633372551bf2f44c52c34ba06..ff37573871d32590ee1131831a812ca1435ad7b5 100644 (file)
@@ -158,6 +158,7 @@ public class SatelMessage {
         return String.format("Message: command = %02X, payload = %s", this.command, getPayloadAsHex());
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index bd6fe5e7c6d7f799541fdad6b4954668966ae253..8b30cf31cac4cc1ea21c00276f447f222609e7bd 100755 (executable)
@@ -188,8 +188,8 @@ public class ShellyBindingConstants {
     public static final String CHANNEL_ESENSOR_TEMP5 = CHANNEL_SENSOR_TEMP + "5";
     public static final String CHANNEL_ESENSOR_HUMIDITY = CHANNEL_SENSOR_HUM;
     public static final String CHANNEL_ESENSOR_VOLTAGE = CHANNEL_SENSOR_VOLTAGE;
-    public static final String CHANNEL_ESENSOR_DIGITALINPUT = "digitalInput";;
-    public static final String CHANNEL_ESENSOR_ANALOGINPUT = "analogInput";;
+    public static final String CHANNEL_ESENSOR_DIGITALINPUT = "digitalInput";
+    public static final String CHANNEL_ESENSOR_ANALOGINPUT = "analogInput";
     public static final String CHANNEL_ESENSOR_INPUT = "input";
     public static final String CHANNEL_ESENSOR_INPUT1 = CHANNEL_ESENSOR_INPUT + "1";
 
index c839f4a98613bae41126a12f30de825c4a44bae9..464d6327e98eddbe84e8623908134486fd9641b4 100644 (file)
@@ -74,6 +74,7 @@ public class MeterValue<Q extends Quantity<Q>> {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 5588e939f8f7f0bfba1a2f9a6cef75a5a2eda22a..5475334809482bf7e5e170be159700ecb7cc7adc 100644 (file)
@@ -66,6 +66,7 @@ public class NegateBitModel {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 3fc0ac8959771fd7fb86a706453772ebcc580b39..53fb46cd61b1aa34b5825bad9b82bbf7ac7c05b7 100644 (file)
@@ -939,7 +939,7 @@ public class SqueezeBoxServerHandler extends BaseBridgeHandler {
                     boolean hasitems = "1".equals(entry.value);
                     if (f != null) {
                         // Except for some favorites (e.g. Spotify) use hasitems:1 and type:playlist
-                        if (hasitems && isTypePlaylist == false) {
+                        if (hasitems && !isTypePlaylist) {
                             // Skip subfolders
                             favorites.remove(f);
                             f = null;
index 313f5fe009333c10fdfdd981cd4b43ec4e7a9a35..73fec66b7910e9e9b35afc94e9a04f11fe36da7f 100644 (file)
@@ -53,5 +53,5 @@ public class TACmiBindingConstants {
             "schema-state-ro");
 
     // Channel specific configuration items
-    public final static String CHANNEL_CONFIG_OUTPUT = "output";
+    public static final String CHANNEL_CONFIG_OUTPUT = "output";
 }
index 9f2d04d5aeece03e66a5b5d0d6af9cb11c702c1e..b40f21d5381a09bd20305231f713d6ffc37ca87f 100644 (file)
@@ -86,6 +86,7 @@ public final class DigitalMessage extends Message {
      * @param portNumber - the portNumber in Range 1-32
      * @return
      */
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean hasPortnumber(int portNumber) {
         if (podNumber == 0 && portNumber <= 16) {
index 4a61bfee2dfd33ed8e06a85b87ad7d54652673de..8d93c6e221c9b5d79b6d3017b7490377a38d8fde 100644 (file)
@@ -128,7 +128,7 @@ public class StationHandler extends BaseThingHandler {
      */
     public void updateData(LittleStation station) {
         logger.debug("Update Tankerkoenig data '{}'", getThing().getUID());
-        if (station.isOpen() == true) {
+        if (station.isOpen()) {
             logger.debug("Checked Station is open! '{}'", getThing().getUID());
             updateState(CHANNEL_STATION_OPEN, OpenClosedType.OPEN);
             if (station.getDiesel() != null) {
index 5b3c02568045901da6967aed193404eb946af1b2..bfb4423804315e64243833511f9b808228c057b3 100644 (file)
@@ -34,7 +34,7 @@ import com.google.gson.JsonParser;
 @NonNullByDefault
 public class TouchWandUnitFromJson {
 
-    private final static Logger logger = LoggerFactory.getLogger(TouchWandUnitFromJson.class);
+    private static final Logger logger = LoggerFactory.getLogger(TouchWandUnitFromJson.class);
 
     public TouchWandUnitFromJson() {
     }
index 005a70ac7391b5f3cf9f07f39235a2c0fb1c0670..daf91de7d32274ed72bb3c7ae9ed1867da0501c4 100644 (file)
@@ -91,11 +91,7 @@ public class VelbusRelayWithInputHandler extends VelbusRelayHandler {
     private boolean isTriggerChannel(byte address, byte channel) {
         VelbusChannelIdentifier velbusChannelIdentifier = new VelbusChannelIdentifier(address, channel);
 
-        if (getModuleAddress().getChannelNumber(velbusChannelIdentifier) == 6) {
-            return true;
-        } else {
-            return false;
-        }
+        return getModuleAddress().getChannelNumber(velbusChannelIdentifier) == 6;
     }
 
     @Override
index 1bac1d823dd55e3c84e766b2d603169cd103ad34..4c08b334cab738f7f1024ada29cf735911dce828 100644 (file)
@@ -327,10 +327,8 @@ public class VentaThingHandler extends BaseThingHandler {
         }
 
         private boolean messageIsEmpty(DeviceInfoMessage message) {
-            if (message.getCurrentActions() == null && message.getInfo() == null && message.getMeasurements() == null) {
-                return true;
-            }
-            return false;
+            return (message.getCurrentActions() == null && message.getInfo() == null
+                    && message.getMeasurements() == null);
         }
 
         /**
index 6bbc8aeb38b1781fba6df30b6f96ba5742f6d142..e8d8d663a452e3e190e266fb14fa14507fbf1c5d 100644 (file)
@@ -40,6 +40,7 @@ public class VerisureAlarmsDTO extends VerisureBaseThingDTO {
         return super.hashCode();
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index afa126f066d6e440fdf2e30bbcaab56517029d13..2abe4b8c7d7a38112df407e9b9a398485da960f4 100644 (file)
@@ -216,6 +216,7 @@ public abstract class VerisureBaseThingDTO implements VerisureThingDTO {
             return result;
         }
 
+        @SuppressWarnings("PMD.SimplifyBooleanReturns")
         @Override
         public boolean equals(@Nullable Object obj) {
             if (this == obj) {
@@ -343,6 +344,7 @@ public abstract class VerisureBaseThingDTO implements VerisureThingDTO {
             return result;
         }
 
+        @SuppressWarnings("PMD.SimplifyBooleanReturns")
         @Override
         public boolean equals(@Nullable Object obj) {
             if (this == obj) {
index e29eaba8219413365c03e61a5426a1c31234b782..d2735f4c41677ebd1cb59f8de5e90a91d852d355 100644 (file)
@@ -39,6 +39,7 @@ public class VerisureBroadbandConnectionsDTO extends VerisureBaseThingDTO {
         return super.hashCode();
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 3b59e6fe0bc0137ebf957e182f56bc8c071c8d54..4d58ebe773a935c9f23fd420bdf27a81606af42a 100644 (file)
@@ -126,6 +126,7 @@ public class VerisureDoorWindowsDTO extends VerisureBaseThingDTO {
             return result;
         }
 
+        @SuppressWarnings("PMD.SimplifyBooleanReturns")
         @Override
         public boolean equals(@Nullable Object obj) {
             if (this == obj) {
index 643b5a99785f78446df141091cd21ed0a381002a..0db463882aaabcf0a7953b820d72d502010ddcf9 100644 (file)
@@ -37,6 +37,7 @@ public class VerisureGatewayDTO extends VerisureBaseThingDTO {
         return super.hashCode();
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index feb609bfeb546ed1e5b6b49a6f619b0ad33298ba..e462a6a9fb3e14bcab4d6fdb156e449de5472d6f 100644 (file)
@@ -44,6 +44,7 @@ public class VerisureInstallationsDTO {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
@@ -92,6 +93,7 @@ public class VerisureInstallationsDTO {
             return result;
         }
 
+        @SuppressWarnings("PMD.SimplifyBooleanReturns")
         @Override
         public boolean equals(@Nullable Object obj) {
             if (this == obj) {
index d7026e20f1093617b31b0b564ae61600d2fd1fa7..394a57773963e6f95a736bf91615dd056ebca231 100644 (file)
@@ -67,6 +67,7 @@ public class VerisureMiceDetectionDTO extends VerisureBaseThingDTO {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 5862d9e49714ace986389b68cdca13bea876bdb6..59b45181b1b3eeaf1bf5c8ca103db7f75629a780 100644 (file)
@@ -148,6 +148,7 @@ public class VerisureSmartLockDTO {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 034c4685680c1940b6c395b51c3bf4da344c5d3c..c8b4f4645e68764d65b04532986b36881d289cc6 100644 (file)
@@ -39,6 +39,7 @@ public class VerisureSmartPlugsDTO extends VerisureBaseThingDTO {
         return super.hashCode();
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 0ee5c7fff17d748e850fe8f8d4dd9ad05efdaec3..63759ab8b0d97dce76f2bb8df2102da31ec01e31 100644 (file)
@@ -39,6 +39,7 @@ public class VerisureUserPresencesDTO extends VerisureBaseThingDTO {
         return super.hashCode();
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(@Nullable Object obj) {
         if (this == obj) {
index 0f4cad1e8a4e97730d9853652c272006b0c743b4..2c7425ffca27a40fd519495d61cefbeaacd7c4f4 100644 (file)
@@ -131,7 +131,7 @@ public class WemoUtil {
     }
 
     public static String createBinaryStateContent(boolean binaryState) {
-        String binary = binaryState == true ? "1" : "0";
+        String binary = binaryState ? "1" : "0";
         String content = "<?xml version=\"1.0\"?>"
                 + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\" s:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">"
                 + "<s:Body>" + "<u:SetBinaryState xmlns:u=\"urn:Belkin:service:basicevent:1\">" + "<BinaryState>"
index 329553361a667cdbdc94f7bb33428f7ffcfeca0f..61b645db289e1c17dca68fe1a3260294f484ac66 100644 (file)
@@ -141,7 +141,7 @@ public class ZmBridgeHandler extends BaseBridgeHandler {
         defaultImageRefreshInterval = config.defaultImageRefreshInterval;
 
         backgroundDiscoveryEnabled = config.discoveryEnabled;
-        logger.debug("Bridge: Background discovery is {}", backgroundDiscoveryEnabled == true ? "ENABLED" : "DISABLED");
+        logger.debug("Bridge: Background discovery is {}", backgroundDiscoveryEnabled ? "ENABLED" : "DISABLED");
 
         host = config.host;
         useSSL = config.useSSL.booleanValue();
index fe36ba08eb44fe48d023a0305e23aedf1885a6df..35b5f26d79cb5b323f9bef1542891810e50c71f4 100644 (file)
@@ -60,9 +60,9 @@ import io.github.hapjava.server.impl.HomekitRoot;
 @NonNullByDefault
 public class HomekitChangeListener implements ItemRegistryChangeListener {
     private final Logger logger = LoggerFactory.getLogger(HomekitChangeListener.class);
-    private final static String REVISION_CONFIG = "revision";
-    private final static String ACCESSORY_COUNT = "accessory_count";
-    private final static String KNOWN_ACCESSORIES = "known_accessories";
+    private static final String REVISION_CONFIG = "revision";
+    private static final String ACCESSORY_COUNT = "accessory_count";
+    private static final String KNOWN_ACCESSORIES = "known_accessories";
     private final ItemRegistry itemRegistry;
     private final HomekitAccessoryRegistry accessoryRegistry = new HomekitAccessoryRegistry();
     private final MetadataRegistry metadataRegistry;
@@ -291,7 +291,6 @@ public class HomekitChangeListener implements ItemRegistryChangeListener {
 
         try {
             boolean changed = false;
-            boolean removed = false;
             for (final String name : pendingUpdates) {
                 String oldValue = knownAccessories.get(name);
                 accessoryRegistry.remove(name);
index 7a60bac2197262920107467aceb0c7254f507539..daff50df52c70d9a7a78d983aebcc5dd2576f889 100644 (file)
@@ -66,6 +66,7 @@ public class HomekitSettings {
         return result;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
index 4c832748228f1021838f95a61376eb6fe35d5fb1..0669d3472fe1304d02b23b6437ca0b73b1694c7d 100644 (file)
@@ -50,18 +50,18 @@ public class HomekitTaggedItem {
     private final Logger logger = LoggerFactory.getLogger(HomekitTaggedItem.class);
 
     /** configuration keywords at items level **/
-    public final static String DELAY = "commandDelay";
-    public final static String DIMMER_MODE = "dimmerMode";
+    public static final String DELAY = "commandDelay";
+    public static final String DIMMER_MODE = "dimmerMode";
     public static final String BATTERY_LOW_THRESHOLD = "lowThreshold";
-    public final static String INSTANCE = "instance";
-    public final static String INVERTED = "inverted";
-    public final static String MAX_VALUE = "maxValue";
-    public final static String MIN_VALUE = "minValue";
-    public final static String PRIMARY_SERVICE = "primary";
-    public final static String STEP = "step";
-    public final static String UNIT = "unit";
-    public final static String EMULATE_STOP_STATE = "stop";
-    public final static String EMULATE_STOP_SAME_DIRECTION = "stopSameDirection";
+    public static final String INSTANCE = "instance";
+    public static final String INVERTED = "inverted";
+    public static final String MAX_VALUE = "maxValue";
+    public static final String MIN_VALUE = "minValue";
+    public static final String PRIMARY_SERVICE = "primary";
+    public static final String STEP = "step";
+    public static final String UNIT = "unit";
+    public static final String EMULATE_STOP_STATE = "stop";
+    public static final String EMULATE_STOP_SAME_DIRECTION = "stopSameDirection";
 
     private static final Map<Integer, String> CREATED_ACCESSORY_IDS = new ConcurrentHashMap<>();
 
index d7b20037b9371e1dea655c77180ccf62f1d994d7..d8a20b5352578f05c0c83ec78fd26d4bc1acfcd4 100644 (file)
@@ -63,10 +63,10 @@ import io.github.hapjava.characteristics.impl.common.NameCharacteristic;
 @NonNullByDefault
 public class HomekitAccessoryFactory {
     private static final Logger logger = LoggerFactory.getLogger(HomekitAccessoryFactory.class);
-    public final static String METADATA_KEY = "homekit"; // prefix for HomeKit meta information in items.xml
+    public static final String METADATA_KEY = "homekit"; // prefix for HomeKit meta information in items.xml
 
     /** List of mandatory attributes for each accessory type. **/
-    private final static Map<HomekitAccessoryType, HomekitCharacteristicType[]> MANDATORY_CHARACTERISTICS = new HashMap<HomekitAccessoryType, HomekitCharacteristicType[]>() {
+    private static final Map<HomekitAccessoryType, HomekitCharacteristicType[]> MANDATORY_CHARACTERISTICS = new HashMap<HomekitAccessoryType, HomekitCharacteristicType[]>() {
         {
             put(ACCESSORY_GROUP, new HomekitCharacteristicType[] {});
             put(LEAK_SENSOR, new HomekitCharacteristicType[] { LEAK_DETECTED_STATE });
@@ -112,7 +112,7 @@ public class HomekitAccessoryFactory {
     };
 
     /** List of service implementation for each accessory type. **/
-    private final static Map<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>> SERVICE_IMPL_MAP = new HashMap<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>>() {
+    private static final Map<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>> SERVICE_IMPL_MAP = new HashMap<HomekitAccessoryType, Class<? extends AbstractHomekitAccessoryImpl>>() {
         {
             put(ACCESSORY_GROUP, HomekitAccessoryGroupImpl.class);
             put(LEAK_SENSOR, HomekitLeakSensorImpl.class);
@@ -436,8 +436,9 @@ public class HomekitAccessoryFactory {
             MetadataRegistry metadataRegistry, HomekitAccessoryUpdater updater, HomekitSettings settings,
             Set<HomekitTaggedItem> ancestorServices) throws HomekitException {
         final var item = taggedItem.getItem();
-        if (!(item instanceof GroupItem))
+        if (!(item instanceof GroupItem)) {
             return;
+        }
 
         for (var groupMember : ((GroupItem) item).getMembers().stream()
                 .sorted((lhs, rhs) -> lhs.getName().compareTo(rhs.getName())).collect(Collectors.toList())) {
@@ -446,8 +447,9 @@ public class HomekitAccessoryFactory {
                     .collect(Collectors.toList());
 
             logger.trace("accessory types for {} are {}", groupMember.getName(), accessoryTypes);
-            if (accessoryTypes.isEmpty())
+            if (accessoryTypes.isEmpty()) {
                 continue;
+            }
 
             if (accessoryTypes.size() > 1) {
                 logger.warn("Item {} is a HomeKit sub-accessory, but multiple accessory types are not allowed.",
index 0f2ca14d55dfd12ae05c41820134a33372fdecbc..6216f3a9092e9b34a9eb369ebb44f5cfb297814a 100644 (file)
@@ -162,7 +162,7 @@ public class HomekitCharacteristicFactory {
     private static final Logger logger = LoggerFactory.getLogger(HomekitCharacteristicFactory.class);
 
     // List of optional characteristics and corresponding method to create them.
-    private final static Map<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>> optional = new HashMap<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>>() {
+    private static final Map<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>> optional = new HashMap<HomekitCharacteristicType, BiFunction<HomekitTaggedItem, HomekitAccessoryUpdater, Characteristic>>() {
         {
             put(NAME, HomekitCharacteristicFactory::createNameCharacteristic);
             put(BATTERY_LOW_STATUS, HomekitCharacteristicFactory::createStatusLowBatteryCharacteristic);
index e09bfd632974ba14db7264755f852affb2b446e5..aa4728a36f003c3dd2a0664188ab571a797fd469 100644 (file)
@@ -32,7 +32,7 @@ import io.github.hapjava.services.impl.HumiditySensorService;
  * @author Andy Lintner - Initial contribution
  */
 public class HomekitHumiditySensorImpl extends AbstractHomekitAccessoryImpl implements HumiditySensorAccessory {
-    private final static String CONFIG_MULTIPLICATOR = "homekitMultiplicator";
+    private static final String CONFIG_MULTIPLICATOR = "homekitMultiplicator";
 
     public HomekitHumiditySensorImpl(HomekitTaggedItem taggedItem, List<HomekitTaggedItem> mandatoryCharacteristics,
             HomekitAccessoryUpdater updater, HomekitSettings settings) {
index 245d2a36b84f75bbbb47de1dd977183cb5bff944..50706c700a72ec65f856cbc4d7ce7922fac6e140 100644 (file)
@@ -106,7 +106,7 @@ public class DynamoDBPersistenceService implements QueryablePersistenceService {
     private ItemRegistry itemRegistry;
     private @Nullable DynamoDbEnhancedAsyncClient client;
     private @Nullable DynamoDbAsyncClient lowLevelClient;
-    private final static Logger logger = LoggerFactory.getLogger(DynamoDBPersistenceService.class);
+    private static final Logger logger = LoggerFactory.getLogger(DynamoDBPersistenceService.class);
     private boolean isProperlyConfigured;
     private @Nullable DynamoDBConfig dbConfig;
     private @Nullable DynamoDBTableNameResolver tableNameResolver;
index adb029a5e4b6d98e77900704250aad3307a96e1c..f3e5d38bdec68dd99467c74aca457138ebd2321d 100644 (file)
@@ -93,7 +93,7 @@ public class BaseIntegrationTest extends JavaTest {
     protected static final Unit<Dimensionless> DIMENSIONLESS_ITEM_UNIT = Units.ONE;
     private static @Nullable URI endpointOverride;
 
-    protected static UnitProvider UNIT_PROVIDER;
+    protected static final UnitProvider UNIT_PROVIDER;
     static {
         ComponentContext context = Mockito.mock(ComponentContext.class);
         BundleContext bundleContext = Mockito.mock(BundleContext.class);
@@ -192,7 +192,7 @@ public class BaseIntegrationTest extends JavaTest {
      * @param tablePrefix
      * @return new persistence service
      */
-    protected synchronized static DynamoDBPersistenceService newService(@Nullable Boolean legacy, boolean cleanLocal,
+    protected static synchronized DynamoDBPersistenceService newService(@Nullable Boolean legacy, boolean cleanLocal,
             @Nullable URI overrideLocalURI, @Nullable String table, @Nullable String tablePrefix) {
         final DynamoDBPersistenceService service;
         Map<String, Object> config = getConfig(legacy, table, tablePrefix);
index 233b980545fb84a8b5844964dab74b2a4eb42505..ff390529664f822dfb4dae4fb54d4565abff80f7 100644 (file)
@@ -73,11 +73,12 @@ public class Influx2FilterCriteriaQueryCreatorImpl implements FilterCriteriaQuer
                 flux = flux.filter(tag(TAG_ITEM_NAME).equal(itemName));
             }
 
-            if (needsToUseItemTagName)
+            if (needsToUseItemTagName) {
                 flux = flux.keep(new String[] { FIELD_MEASUREMENT_NAME, COLUMN_TIME_NAME_V2, COLUMN_VALUE_NAME_V2,
                         TAG_ITEM_NAME });
-            else
+            } else {
                 flux = flux.keep(new String[] { FIELD_MEASUREMENT_NAME, COLUMN_TIME_NAME_V2, COLUMN_VALUE_NAME_V2 });
+            }
         }
 
         if (criteria.getState() != null && criteria.getOperator() != null) {
index 70cb1f222be71afef7dd6db6f22b16bf7dac037b..36826ba15a20f9ad30e873d1be327ad13ea4610e 100644 (file)
@@ -74,6 +74,7 @@ public class Range {
         this.maxInclusive = maxInclusive;
     }
 
+    @SuppressWarnings("PMD.SimplifyBooleanReturns")
     public boolean contains(final BigDecimal value) {
         final boolean minMatch;
         if (min == null) {