public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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>
This commit is contained in:
Holger Friedrich
2023-09-13 08:03:31 +02:00
committed by GitHub
parent 641b482551
commit ab58f4ffb4
471 changed files with 1624 additions and 1868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/handler/ResolBridgeHandler.java
View File

@@ -15,9 +15,9 @@ package org.openhab.binding.resol.handler;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Collection;
import java.util.Collections;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -102,7 +102,7 @@ public class ResolBridgeHandler extends BaseBridgeHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(ResolDeviceDiscoveryService.class);
return Set.of(ResolDeviceDiscoveryService.class);
}
public void registerResolThingListener(ResolEmuEMThingHandler resolEmuEMThingHandler) {
@@ -125,8 +125,8 @@ public class ResolBridgeHandler extends BaseBridgeHandler {
getThing().getThings().stream().forEach(thing -> {
ThingHandler th = thing.getHandler();
if (th instanceof ResolEmuEMThingHandler) {
((ResolEmuEMThingHandler) th).stop();
if (th instanceof ResolEmuEMThingHandler resolEmuEMThingHandler) {
resolEmuEMThingHandler.stop();
}
});
@@ -175,8 +175,8 @@ public class ResolBridgeHandler extends BaseBridgeHandler {
getThing().getThings().stream().forEach(thing -> {
ThingHandler th = thing.getHandler();
if (th instanceof ResolEmuEMThingHandler) {
((ResolEmuEMThingHandler) th).useConnection(c);
if (th instanceof ResolEmuEMThingHandler resolEmuEMThingHandler) {
resolEmuEMThingHandler.useConnection(c);
}
});
} catch (IOException e) {
@@ -235,11 +235,10 @@ public class ResolBridgeHandler extends BaseBridgeHandler {
connection.disconnect();
getThing().getThings().stream().forEach(thing -> {
ThingHandler th = thing.getHandler();
if (th instanceof ResolEmuEMThingHandler) {
((ResolEmuEMThingHandler) th).stop();
if (th instanceof ResolEmuEMThingHandler resolEmuEMThingHandler) {
resolEmuEMThingHandler.stop();
}
});
}
} catch (IOException ioe) {
// we don't care about exceptions on disconnect in dispose

16
bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/handler/ResolEmuEMThingHandler.java
View File

@@ -136,8 +136,8 @@ public class ResolEmuEMThingHandler extends ResolBaseThingHandler implements Pro
ResolBridgeHandler bridgeHandler = null;
ThingHandler handler = bridge.getHandler();
if (handler instanceof ResolBridgeHandler) {
bridgeHandler = (ResolBridgeHandler) handler;
if (handler instanceof ResolBridgeHandler resolBridgeHandler) {
bridgeHandler = resolBridgeHandler;
} else {
logger.debug("No available bridge handler found yet. Bridge: {} .", bridge.getUID());
}
@@ -190,13 +190,13 @@ public class ResolEmuEMThingHandler extends ResolBaseThingHandler implements Pro
float value = 0;
int intValue = 0;
if (command instanceof QuantityType<?>) {
value = Objects.requireNonNullElse(((QuantityType<?>) command).toUnit(SIUnits.CELSIUS),
if (command instanceof QuantityType<?> quantityCommand) {
value = Objects.requireNonNullElse(quantityCommand.toUnit(SIUnits.CELSIUS),
new QuantityType<>(888.8, SIUnits.CELSIUS)).floatValue();
} else if (command instanceof OnOffType) {
intValue = ((OnOffType) command).equals(OnOffType.ON) ? 1 : 0;
} else if (command instanceof DecimalType) {
intValue = ((DecimalType) command).intValue();
} else if (command instanceof OnOffType onOffCommand) {
intValue = onOffCommand.equals(OnOffType.ON) ? 1 : 0;
} else if (command instanceof DecimalType decimalCommand) {
intValue = decimalCommand.intValue();
value = intValue;
} else {
/* nothing to do */

4
bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/handler/ResolThingHandler.java
View File

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

4
bundles/org.openhab.binding.resol/src/main/java/org/openhab/binding/resol/internal/discovery/ResolDeviceDiscoveryService.java
View File

@@ -110,8 +110,8 @@ public class ResolDeviceDiscoveryService extends AbstractDiscoveryService
@Override
public void setThingHandler(ThingHandler handler) {
if (handler instanceof ResolBridgeHandler) {
resolBridgeHandler = (ResolBridgeHandler) handler;
if (handler instanceof ResolBridgeHandler resolBridgeHandler) {
this.resolBridgeHandler = resolBridgeHandler;
}
}