Java 17 features (H-M) (#15520)

- 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
- remove null check before instanceof

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

bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/MinecraftHandlerFactory.java

@@ -65,11 +65,9 @@ public class MinecraftHandlerFactory extends BaseThingHandlerFactory {
             minecraftServers.add(serverHandler);
             return serverHandler;
         } else if (thingTypeUID.equals(MinecraftBindingConstants.THING_TYPE_PLAYER)) {
-            MinecraftPlayerHandler playerHandler = new MinecraftPlayerHandler(thing);
-            return playerHandler;
+            return new MinecraftPlayerHandler(thing);
         } else if (thingTypeUID.equals(MinecraftBindingConstants.THING_TYPE_SIGN)) {
-            MinecraftSignHandler signHandler = new MinecraftSignHandler(thing);
-            return signHandler;
+            return new MinecraftSignHandler(thing);
         }
 
         return null;

bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftDiscoveryService.java

@@ -12,9 +12,9 @@
  */
 package org.openhab.binding.minecraft.internal.discovery;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.openhab.binding.minecraft.internal.MinecraftBindingConstants;
 import org.openhab.binding.minecraft.internal.MinecraftHandlerFactory;
@@ -53,7 +53,7 @@ public class MinecraftDiscoveryService extends AbstractDiscoveryService {
     private CompositeSubscription subscription;
 
     public MinecraftDiscoveryService() {
-        super(Collections.singleton(MinecraftBindingConstants.THING_TYPE_SERVER), DISCOVER_TIMEOUT_SECONDS, false);
+        super(Set.of(MinecraftBindingConstants.THING_TYPE_SERVER), DISCOVER_TIMEOUT_SECONDS, false);
     }
 
     @Override
@@ -91,10 +91,8 @@ public class MinecraftDiscoveryService extends AbstractDiscoveryService {
      * @return subscription for listening to sign events.
      */
     private Subscription subscribeSignsRx(Observable<ServerConnection> serverRx) {
-        return serverRx
-                .flatMap(connection -> connection.getSocketHandler().getSignsRx().distinct(), (connection, signs) -> {
-                    return new Pair<>(connection, signs);
-                }).subscribe(conectionSignPair -> {
+        return serverRx.flatMap(connection -> connection.getSocketHandler().getSignsRx().distinct(),
+                (connection, signs) -> new Pair<>(connection, signs)).subscribe(conectionSignPair -> {
                     for (SignData sign : conectionSignPair.second) {
                         submitSignDiscoveryResults(conectionSignPair.first.getThingUID(), sign);
                     }

bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/discovery/MinecraftMDNSDiscoveryParticipant.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.binding.minecraft.internal.discovery;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -38,7 +37,7 @@ public class MinecraftMDNSDiscoveryParticipant implements MDNSDiscoveryParticipa
 
     @Override
     public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
-        return Collections.singleton(MinecraftBindingConstants.THING_TYPE_SERVER);
+        return Set.of(MinecraftBindingConstants.THING_TYPE_SERVER);
     }
 
     @Override
@@ -48,7 +47,7 @@ public class MinecraftMDNSDiscoveryParticipant implements MDNSDiscoveryParticipa
 
     @Override
     public DiscoveryResult createResult(ServiceInfo service) {
-        if (service.getName().equals("wc-minecraft")) {
+        if ("wc-minecraft".equals(service.getName())) {
             ThingUID uid = getThingUID(service);
 
             if (uid != null) {

bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftPlayerHandler.java

@@ -141,8 +141,8 @@ public class MinecraftPlayerHandler extends BaseThingHandler {
         MinecraftServerHandler bridgeHandler = null;
 
         ThingHandler handler = bridge.getHandler();
-        if (handler instanceof MinecraftServerHandler) {
-            bridgeHandler = (MinecraftServerHandler) handler;
+        if (handler instanceof MinecraftServerHandler serverHandler) {
+            bridgeHandler = serverHandler;
         } else {
             logger.debug("No available bridge handler found yet. Bridge: {} .", bridge.getUID());
             bridgeHandler = null;

bundles/org.openhab.binding.minecraft/src/main/java/org/openhab/binding/minecraft/internal/handler/MinecraftSignHandler.java

@@ -113,8 +113,8 @@ public class MinecraftSignHandler extends BaseThingHandler {
         MinecraftServerHandler bridgeHandler = null;
 
         ThingHandler handler = bridge.getHandler();
-        if (handler instanceof MinecraftServerHandler) {
-            bridgeHandler = (MinecraftServerHandler) handler;
+        if (handler instanceof MinecraftServerHandler serverHandler) {
+            bridgeHandler = serverHandler;
         } else {
             logger.debug("No available bridge handler found yet. Bridge: {} .", bridge.getUID());
             bridgeHandler = null;