Java 17 features (N-S) (#15565)

- add missing @override
- Java style array syntax
- remove redundant modifiers
- always move String constants to left side in comparisons
- simplify lambda expressions and return statements
- use replace instead of replaceAll w/o regex
- instanceof matching and multiline strings

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

bundles/org.openhab.binding.solarwatt/src/main/java/org/openhab/binding/solarwatt/internal/discovery/SolarwattDevicesDiscoveryService.java

@@ -84,8 +84,8 @@ public class SolarwattDevicesDiscoveryService extends AbstractDiscoveryService
 
     @Override
     public void setThingHandler(final @Nullable ThingHandler handler) {
-        if (handler instanceof EnergyManagerHandler) {
-            this.energyManagerHandler = (EnergyManagerHandler) handler;
+        if (handler instanceof EnergyManagerHandler energyManagerHandler) {
+            this.energyManagerHandler = energyManagerHandler;
         }
     }
 
@@ -196,7 +196,7 @@ public class SolarwattDevicesDiscoveryService extends AbstractDiscoveryService
      * @return guid for openhab
      */
     private String rewriteGuid(String emGuid) {
-        return emGuid.replaceAll(":", "-");
+        return emGuid.replace(":", "-");
     }
 
     public class EnergymanagerScan implements Runnable {

bundles/org.openhab.binding.solarwatt/src/main/java/org/openhab/binding/solarwatt/internal/domain/SolarwattTag.java

@@ -27,7 +27,7 @@ public class SolarwattTag {
 
     public SolarwattTag(String tagName) {
         this.tagName = tagName;
-        char chars[] = tagName.toCharArray();
+        char[] chars = tagName.toCharArray();
         chars[0] = Character.toLowerCase(chars[0]);
         this.channelName = new String(chars);
     }

bundles/org.openhab.binding.solarwatt/src/main/java/org/openhab/binding/solarwatt/internal/handler/EnergyManagerHandler.java

@@ -22,9 +22,9 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -113,7 +113,7 @@ public class EnergyManagerHandler extends BaseBridgeHandler {
      */
     @Override
     public Collection<Class<? extends ThingHandlerService>> getServices() {
-        return Collections.singleton(SolarwattDevicesDiscoveryService.class);
+        return Set.of(SolarwattDevicesDiscoveryService.class);
     }
 
     /**

bundles/org.openhab.binding.solarwatt/src/main/java/org/openhab/binding/solarwatt/internal/handler/SimpleDeviceHandler.java

@@ -212,8 +212,8 @@ public class SimpleDeviceHandler extends BaseThingHandler {
         Bridge bridge = this.getBridge();
         if (bridge != null) {
             BridgeHandler bridgeHandler = bridge.getHandler();
-            if (bridgeHandler instanceof EnergyManagerHandler) {
-                return (EnergyManagerHandler) bridgeHandler;
+            if (bridgeHandler instanceof EnergyManagerHandler energyManagerHandler) {
+                return energyManagerHandler;
             } else {
                 // happens while dynamically reloading the binding
                 this.logger.warn("BridgeHandler is not implementing EnergyManagerHandler {}", bridgeHandler);