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

4
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/console/PowermaxCommandExtension.java
View File

@@ -65,8 +65,8 @@ public class PowermaxCommandExtension extends AbstractConsoleCommandExtension im
PowermaxBridgeHandler handler = null;
if (thing != null) {
thingHandler = thing.getHandler();
if (thingHandler instanceof PowermaxBridgeHandler) {
handler = (PowermaxBridgeHandler) thingHandler;
if (thingHandler instanceof PowermaxBridgeHandler bridgeHandler) {
handler = bridgeHandler;
}
}
if (thing == null) {

12
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/discovery/PowermaxDiscoveryService.java
View File

@@ -63,8 +63,8 @@ public class PowermaxDiscoveryService extends AbstractDiscoveryService
@Override
public void setThingHandler(ThingHandler handler) {
if (handler instanceof PowermaxBridgeHandler) {
bridgeHandler = (PowermaxBridgeHandler) handler;
if (handler instanceof PowermaxBridgeHandler powermaxBridgeHandler) {
bridgeHandler = powermaxBridgeHandler;
}
}
@@ -146,8 +146,8 @@ public class PowermaxDiscoveryService extends AbstractDiscoveryService
for (Thing thing : handler.getThing().getThings()) {
ThingHandler thingHandler = thing.getHandler();
if (thing.getThingTypeUID().equals(PowermaxBindingConstants.THING_TYPE_ZONE)
&& thingHandler instanceof PowermaxThingHandler) {
PowermaxZoneConfiguration config = ((PowermaxThingHandler) thingHandler).getZoneConfiguration();
&& thingHandler instanceof PowermaxThingHandler powermaxThingHandler) {
PowermaxZoneConfiguration config = powermaxThingHandler.getZoneConfiguration();
if (config.zoneNumber == zoneNumber) {
return;
}
@@ -182,8 +182,8 @@ public class PowermaxDiscoveryService extends AbstractDiscoveryService
for (Thing thing : handler.getThing().getThings()) {
ThingHandler thingHandler = thing.getHandler();
if (thing.getThingTypeUID().equals(PowermaxBindingConstants.THING_TYPE_X10)
&& thingHandler instanceof PowermaxThingHandler) {
PowermaxX10Configuration config = ((PowermaxThingHandler) thingHandler).getX10Configuration();
&& thingHandler instanceof PowermaxThingHandler powermaxThingHandler) {
PowermaxX10Configuration config = powermaxThingHandler.getX10Configuration();
if (config.deviceNumber == deviceNumber) {
return;
}

11
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/handler/PowermaxBridgeHandler.java
View File

@@ -15,10 +15,10 @@ package org.openhab.binding.powermax.internal.handler;
import static org.openhab.binding.powermax.internal.PowermaxBindingConstants.*;
import java.util.Collection;
import java.util.Collections;
import java.util.EventObject;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -113,7 +113,7 @@ public class PowermaxBridgeHandler extends BaseBridgeHandler implements Powermax
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(PowermaxDiscoveryService.class);
return Set.of(PowermaxDiscoveryService.class);
}
public @Nullable PowermaxState getCurrentState() {
@@ -628,8 +628,7 @@ public class PowermaxBridgeHandler extends BaseBridgeHandler implements Powermax
continue;
}
ThingHandler thingHandler = thing.getHandler();
if (thingHandler instanceof PowermaxThingHandler) {
PowermaxThingHandler handler = (PowermaxThingHandler) thingHandler;
if (thingHandler instanceof PowermaxThingHandler powermaxThingHandler) {
if (thing.getThingTypeUID().equals(THING_TYPE_ZONE)) {
// All of the zone state objects will have the same list of values.
// The use of getZone(1) here is just to get any PowermaxZoneState
@@ -638,12 +637,12 @@ public class PowermaxBridgeHandler extends BaseBridgeHandler implements Powermax
for (Value<?> value : state.getZone(1).getValues()) {
String channelId = value.getChannel();
if ((channel == null) || channel.equals(channelId)) {
handler.updateChannelFromAlarmState(channelId, state);
powermaxThingHandler.updateChannelFromAlarmState(channelId, state);
}
}
} else if (thing.getThingTypeUID().equals(THING_TYPE_X10)) {
if ((channel == null) || channel.equals(X10_STATUS)) {
handler.updateChannelFromAlarmState(X10_STATUS, state);
powermaxThingHandler.updateChannelFromAlarmState(X10_STATUS, state);
}
}
}

4
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/message/PowermaxMessageConstants.java
View File

@@ -31,7 +31,7 @@ public class PowermaxMessageConstants {
// System events
public static enum PowermaxSysEventType {
public enum PowermaxSysEventType {
NONE,
ALARM,
SILENT_ALARM,
@@ -41,7 +41,7 @@ public class PowermaxMessageConstants {
RESTORE,
GENERAL_RESTORE,
CANCEL,
RESET;
RESET
}
public static class PowermaxSysEvent {

8
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/message/PowermaxStatusMessage.java
View File

@@ -181,7 +181,7 @@ public class PowermaxStatusMessage extends PowermaxBaseMessage {
} else if (zoneEType == 0x05) {
// Violated (Motion)
PowermaxZoneSettings zone = panelSettings.getZoneSettings(eventZone);
if ((zone != null) && zone.getSensorType().equalsIgnoreCase("unknown")) {
if ((zone != null) && "unknown".equalsIgnoreCase(zone.getSensorType())) {
zone.setSensorType(PowermaxSensorType.MOTION_SENSOR_1.getLabel());
}
updatedState.getZone(eventZone).tripped.setValue(true);
@@ -276,11 +276,11 @@ public class PowermaxStatusMessage extends PowermaxBaseMessage {
// the sensor type always triggers an alarm
// or the system is armed away
// or the system is armed home and the zone is not interior(-follow)
boolean armed = (!zone.getType().equalsIgnoreCase("Non-Alarm")
boolean armed = (!"Non-Alarm".equalsIgnoreCase(zone.getType())
&& (zone.isAlwaysInAlarm() || (mode == PowermaxArmMode.ARMED_AWAY.getCode())
|| ((mode == PowermaxArmMode.ARMED_HOME.getCode())
&& !zone.getType().equalsIgnoreCase("Interior-Follow")
&& !zone.getType().equalsIgnoreCase("Interior"))));
&& !"Interior-Follow".equalsIgnoreCase(zone.getType())
&& !"Interior".equalsIgnoreCase(zone.getType()))));
updatedState.getZone(i).armed.setValue(armed);
}
});

4
bundles/org.openhab.binding.powermax/src/main/java/org/openhab/binding/powermax/internal/state/PowermaxZoneState.java
View File

@@ -39,9 +39,7 @@ public class PowermaxZoneState extends PowermaxStateContainer {
public StringValue lastMessage = new StringValue(this, ZONE_LAST_MESSAGE);
public DateTimeValue lastMessageTime = new DateTimeValue(this, ZONE_LAST_MESSAGE_TIME);
public DynamicValue<Boolean> locked = new DynamicValue<>(this, LOCKED, () -> {
return armed.getValue();
}, () -> {
public DynamicValue<Boolean> locked = new DynamicValue<>(this, LOCKED, () -> armed.getValue(), () -> {
Boolean isArmed = armed.getValue();
if (isArmed == null) {
return UnDefType.NULL;