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

7
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/discovery/OrbitBhyveDiscoveryService.java
View File

@@ -14,7 +14,6 @@ package org.openhab.binding.orbitbhyve.internal.discovery;
import static org.openhab.binding.orbitbhyve.internal.OrbitBhyveBindingConstants.THING_TYPE_SPRINKLER;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -79,8 +78,8 @@ public class OrbitBhyveDiscoveryService extends AbstractDiscoveryService
@Override
public void setThingHandler(@Nullable ThingHandler thingHandler) {
if (thingHandler instanceof OrbitBhyveBridgeHandler) {
bridgeHandler = (OrbitBhyveBridgeHandler) thingHandler;
if (thingHandler instanceof OrbitBhyveBridgeHandler bridgeHandler) {
this.bridgeHandler = bridgeHandler;
}
}
@@ -145,6 +144,6 @@ public class OrbitBhyveDiscoveryService extends AbstractDiscoveryService
@Override
public Set<ThingTypeUID> getSupportedThingTypes() {
return Collections.singleton(THING_TYPE_SPRINKLER);
return Set.of(THING_TYPE_SPRINKLER);
}
}

18
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveBridgeHandler.java
View File

@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
@@ -109,7 +110,7 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(OrbitBhyveDiscoveryService.class);
return Set.of(OrbitBhyveDiscoveryService.class);
}
@Override
@@ -230,8 +231,7 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
if (logger.isTraceEnabled()) {
logger.trace("Device response: {}", response.getContentAsString());
}
OrbitBhyveDevice device = gson.fromJson(response.getContentAsString(), OrbitBhyveDevice.class);
return device;
return gson.fromJson(response.getContentAsString(), OrbitBhyveDevice.class);
} else {
logger.debug("Returned status: {}", response.getStatus());
updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.COMMUNICATION_ERROR,
@@ -316,10 +316,10 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
if (th.isEnabled()) {
String deviceId = th.getUID().getId();
ThingHandler handler = th.getHandler();
if (handler instanceof OrbitBhyveSprinklerHandler) {
if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
for (OrbitBhyveDevice device : devices) {
if (deviceId.equals(th.getUID().getId())) {
updateDeviceStatus(device, (OrbitBhyveSprinklerHandler) handler);
updateDeviceStatus(device, sprinklerHandler);
}
}
}
@@ -340,9 +340,9 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
for (Thing th : getThing().getThings()) {
if (deviceId.equals(th.getUID().getId())) {
ThingHandler handler = th.getHandler();
if (handler instanceof OrbitBhyveSprinklerHandler) {
if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
OrbitBhyveDevice device = getDevice(deviceId);
updateDeviceStatus(device, (OrbitBhyveSprinklerHandler) handler);
updateDeviceStatus(device, sprinklerHandler);
}
}
}
@@ -352,8 +352,8 @@ public class OrbitBhyveBridgeHandler extends ConfigStatusBridgeHandler {
for (Thing th : getThing().getThings()) {
if (program.getDeviceId().equals(th.getUID().getId())) {
ThingHandler handler = th.getHandler();
if (handler instanceof OrbitBhyveSprinklerHandler) {
((OrbitBhyveSprinklerHandler) handler).updateProgram(program);
if (handler instanceof OrbitBhyveSprinklerHandler sprinklerHandler) {
sprinklerHandler.updateProgram(program);
}
}
}

4
bundles/org.openhab.binding.orbitbhyve/src/main/java/org/openhab/binding/orbitbhyve/internal/handler/OrbitBhyveSprinklerHandler.java
View File

@@ -81,8 +81,8 @@ public class OrbitBhyveSprinklerHandler extends BaseThingHandler {
handler.stopWatering(deviceId);
return;
}
if (CHANNEL_WATERING_TIME.equals(channelUID.getId()) && command instanceof QuantityType) {
final QuantityType<?> value = ((QuantityType<?>) command).toUnit(Units.MINUTE);
if (CHANNEL_WATERING_TIME.equals(channelUID.getId()) && command instanceof QuantityType quantityCommand) {
final QuantityType<?> value = quantityCommand.toUnit(Units.MINUTE);
if (value != null) {
wateringTime = value.intValue();
}