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

Java 17 features (A-G) (#15516)

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-05 22:30:16 +02:00
committed by GitHub
parent a0dc5c05f2
commit cf10b3e9c7
486 changed files with 2053 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/DSCAlarmMessage.java
View File

@@ -233,15 +233,15 @@ public class DSCAlarmMessage {
case UserClosing: /* 700 */
user = message.substring(4);
name = name.concat(": " + user);
description = codeReceived + ": Partition " + String.valueOf(partition)
+ " has been armed by user " + user + ".";
description = codeReceived + ": Partition " + partition + " has been armed by user " + user
+ ".";
messageType = DSCAlarmMessageType.PARTITION_EVENT;
break;
case UserOpening: /* 750 */
user = message.substring(4);
name = name.concat(": " + user);
description = codeReceived + ": Partition " + String.valueOf(partition)
+ " has been disarmed by user " + user + ".";
description = codeReceived + ": Partition " + partition + " has been disarmed by user " + user
+ ".";
messageType = DSCAlarmMessageType.PARTITION_EVENT;
break;

8
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/DSCAlarmDiscoveryService.java
View File

@@ -97,8 +97,8 @@ public class DSCAlarmDiscoveryService extends AbstractDiscoveryService {
break;
case PARTITION:
if (partitionNumber >= 1 && partitionNumber <= 8) {
thingID = "partition" + String.valueOf(partitionNumber);
thingLabel = "Partition " + String.valueOf(partitionNumber);
thingID = "partition" + partitionNumber;
thingLabel = "Partition " + partitionNumber;
properties = new HashMap<>(0);
thingUID = new ThingUID(DSCAlarmBindingConstants.PARTITION_THING_TYPE, bridge.getUID(), thingID);
properties.put(DSCAlarmPartitionConfiguration.PARTITION_NUMBER, partitionNumber);
@@ -107,8 +107,8 @@ public class DSCAlarmDiscoveryService extends AbstractDiscoveryService {
break;
case ZONE:
if (zoneNumber >= 1 && zoneNumber <= 64) {
thingID = "zone" + String.valueOf(zoneNumber);
thingLabel = "Zone " + String.valueOf(zoneNumber);
thingID = "zone" + zoneNumber;
thingLabel = "Zone " + zoneNumber;
properties = new HashMap<>(0);
thingUID = new ThingUID(DSCAlarmBindingConstants.ZONE_THING_TYPE, bridge.getUID(), thingID);
properties.put(DSCAlarmZoneConfiguration.ZONE_NUMBER, zoneNumber);

2
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/discovery/EnvisalinkBridgeDiscovery.java
View File

@@ -136,7 +136,7 @@ public class EnvisalinkBridgeDiscovery {
* @return
*/
private long convertIPToNumber(String ipAddress) {
String octets[] = ipAddress.split("\\.");
String[] octets = ipAddress.split("\\.");
if (octets.length != 4) {
throw new IllegalArgumentException("Invalid IP address: " + ipAddress);

8
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PanelThingHandler.java
View File

@@ -202,17 +202,17 @@ public class PanelThingHandler extends DSCAlarmBaseThingHandler {
updateState(channelUID, new StringType(String.valueOf(-1)));
break;
case PANEL_TIME_STAMP:
if (command instanceof OnOffType) {
if (command instanceof OnOffType onOffCommand) {
cmd = command == OnOffType.ON ? 1 : 0;
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.TimeStampControl, String.valueOf(cmd));
updateState(channelUID, (OnOffType) command);
updateState(channelUID, onOffCommand);
}
break;
case PANEL_TIME_BROADCAST:
if (command instanceof OnOffType) {
if (command instanceof OnOffType onOffCommand) {
cmd = command == OnOffType.ON ? 1 : 0;
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.TimeDateBroadcastControl, String.valueOf(cmd));
updateState(channelUID, (OnOffType) command);
updateState(channelUID, onOffCommand);
}
break;
default:

2
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/ZoneThingHandler.java
View File

@@ -107,7 +107,7 @@ public class ZoneThingHandler extends DSCAlarmBaseThingHandler {
if (dscAlarmBridgeHandler != null && dscAlarmBridgeHandler.isConnected()
&& channelUID.getId().equals(ZONE_BYPASS_MODE)) {
String data = String.valueOf(getPartitionNumber()) + "*1" + String.format("%02d", getZoneNumber()) + "#";
String data = getPartitionNumber() + "*1" + String.format("%02d", getZoneNumber()) + "#";
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.KeySequence, data);
}