Simplify boolean expressions (#3971)

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

bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigDescriptionParameterGroupBuilder.java

@@ -94,7 +94,6 @@ public class ConfigDescriptionParameterGroupBuilder {
      * @return the desired result
      */
     public ConfigDescriptionParameterGroup build() throws IllegalArgumentException {
-        return new ConfigDescriptionParameterGroup(name, context, advanced != null ? advanced : false, label,
+        return new ConfigDescriptionParameterGroup(name, context, advanced != null && advanced, label, description);
-                description);
     }
 }

bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/ConfigurableServiceUtil.java

@@ -91,6 +91,6 @@ public class ConfigurableServiceUtil {
 
     private static boolean resolveBoolean(Function<String, @Nullable Object> propertyResolver, String key) {
         Boolean value = (Boolean) propertyResolver.apply(key);
-        return value == null ? false : value.booleanValue();
+        return value != null && value.booleanValue();
     }
 }

bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/xml/ConfigDescriptionParameterConverter.java

@@ -88,7 +88,7 @@ public class ConfigDescriptionParameterConverter extends GenericUnmarshaller<Con
     }
 
     private Boolean falseIfNull(@Nullable Boolean b) {
-        return b != null ? b : false;
+        return b != null && b;
     }
 
     @Override

bundles/org.openhab.core.config.discovery.addon/src/main/java/org/openhab/core/config/discovery/addon/BaseAddonFinder.java

@@ -41,7 +41,7 @@ public abstract class BaseAddonFinder implements AddonFinder {
     protected static boolean propertyMatches(Map<String, Pattern> propertyPatternMap, String propertyName,
             @Nullable String propertyValue) {
         Pattern pattern = propertyPatternMap.get(propertyName);
-        return pattern == null ? true : propertyValue == null ? false : pattern.matcher(propertyValue).matches();
+        return pattern == null || (propertyValue != null && pattern.matcher(propertyValue).matches());
     }
 
     protected volatile List<AddonInfo> addonCandidates = List.of();

bundles/org.openhab.core.io.transport.modbus/src/main/java/org/openhab/core/io/transport/modbus/internal/pooling/ModbusSlaveConnectionFactoryImpl.java

@@ -105,8 +105,8 @@ public class ModbusSlaveConnectionFactoryImpl
             long reconnectAfterMillis = configuration.getReconnectAfterMillis();
             long connectionAgeMillis = System.currentTimeMillis() - localLastConnected;
             long disconnectIfConnectedBeforeMillis = disconnectIfConnectedBefore.getOrDefault(localEndpoint, -1L);
-            boolean disconnectSinceTooOldConnection = disconnectIfConnectedBeforeMillis < 0L ? false
+            boolean disconnectSinceTooOldConnection = disconnectIfConnectedBeforeMillis >= 0L
-                    : localLastConnected <= disconnectIfConnectedBeforeMillis;
+                    && localLastConnected <= disconnectIfConnectedBeforeMillis;
             boolean shouldBeDisconnected = (reconnectAfterMillis == 0
                     || (reconnectAfterMillis > 0 && connectionAgeMillis > reconnectAfterMillis)
                     || disconnectSinceTooOldConnection);

bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/lib/NumberExtensions.java

@@ -164,7 +164,7 @@ public class NumberExtensions {
         BigDecimal leftValue = numberToBigDecimal(left);
         BigDecimal rightValue = numberToBigDecimal(right);
         if (leftValue == null) {
-            return (rightValue != null) ? false : true;
+            return rightValue == null;
         } else if (rightValue == null) {
             return true;
         } else {

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceEqualsFilter.java

@@ -33,7 +33,7 @@ public class PersistenceEqualsFilter extends PersistenceFilter {
     public PersistenceEqualsFilter(String name, Collection<String> values, @Nullable Boolean inverted) {
         super(name);
         this.values = values;
-        this.inverted = (inverted == null) ? false : inverted;
+        this.inverted = inverted != null && inverted;
     }
 
     public Collection<String> getValues() {

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceIncludeFilter.java

@@ -45,7 +45,7 @@ public class PersistenceIncludeFilter extends PersistenceFilter {
         this.lower = lower;
         this.upper = upper;
         this.unit = (unit == null) ? "" : unit;
-        this.inverted = (inverted == null) ? false : inverted;
+        this.inverted = inverted != null && inverted;
     }
 
     public BigDecimal getLower() {

bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/filter/PersistenceThresholdFilter.java

@@ -53,7 +53,7 @@ public class PersistenceThresholdFilter extends PersistenceFilter {
         super(name);
         this.value = value;
         this.unit = (unit == null) ? "" : unit;
-        this.relative = (relative == null) ? false : relative;
+        this.relative = relative != null && relative;
     }
 
     public BigDecimal getValue() {

bundles/org.openhab.core/src/main/java/org/openhab/core/internal/types/StateDescriptionFragmentImpl.java

@@ -169,8 +169,7 @@ public class StateDescriptionFragmentImpl implements StateDescriptionFragment {
             return null;
         }
         final Boolean ro = readOnly;
-        return new StateDescriptionImpl(minimum, maximum, step, pattern, ro == null ? false : ro.booleanValue(),
+        return new StateDescriptionImpl(minimum, maximum, step, pattern, ro != null && ro.booleanValue(), options);
-                options);
     }
 
     /**

tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java

@@ -71,7 +71,7 @@ public class UpgradeTool {
                         "Please either set the environment variable ${OPENHAB_USERDATA} or provide a directory through the --dir option.");
                 System.exit(0);
             } else {
-                boolean force = commandLine.hasOption(OPT_FORCE) ? true : false;
+                boolean force = commandLine.hasOption(OPT_FORCE);
 
                 Upgrader upgrader = new Upgrader(baseDir, force);
                 if (!commandLine.hasOption(OPT_COMMAND)