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

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

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

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2023-09-08 14:36:59 +02:00
committed by GitHub
parent 3751fd0646
commit edaf17b345
519 changed files with 2703 additions and 2660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bundles/org.openhab.binding.mystrom/src/main/java/org/openhab/binding/mystrom/internal/MyStromBulbHandler.java
View File

@@ -95,18 +95,18 @@ public class MyStromBulbHandler extends AbstractMyStromHandler {
}
break;
case CHANNEL_COLOR:
if (command instanceof HSBType) {
if (Objects.equals(((HSBType) command).as(OnOffType.class), OnOffType.OFF)) {
if (command instanceof HSBType hsb) {
if (Objects.equals(hsb.as(OnOffType.class), OnOffType.OFF)) {
sResp = sendToBulb("off", null, null, null);
} else {
String hsv = command.toString().replaceAll(",", ";");
String hsv = command.toString().replace(",", ";");
sResp = sendToBulb("on", hsv, null, HSV);
}
}
break;
case CHANNEL_BRIGHTNESS:
if (command instanceof PercentType) {
if (Objects.equals(((PercentType) command).as(OnOffType.class), OnOffType.OFF)) {
if (command instanceof PercentType brightness) {
if (Objects.equals(brightness.as(OnOffType.class), OnOffType.OFF)) {
sResp = sendToBulb("off", null, null, null);
} else {
if (lastMode.equals(MONO)) {
@@ -122,9 +122,8 @@ public class MyStromBulbHandler extends AbstractMyStromHandler {
}
break;
case CHANNEL_COLOR_TEMPERATURE:
if (command instanceof PercentType) {
String mono = convertPercentageToMyStromCT((PercentType) command) + ";"
+ lastBrightness.toString();
if (command instanceof PercentType temperature) {
String mono = convertPercentageToMyStromCT(temperature) + ";" + lastBrightness.toString();
sResp = sendToBulb("on", mono, null, MONO);
}
break;
@@ -186,8 +185,8 @@ public class MyStromBulbHandler extends AbstractMyStromHandler {
if (deviceInfo != null) {
updateState(CHANNEL_SWITCH, deviceInfo.on ? OnOffType.ON : OnOffType.OFF);
updateState(CHANNEL_RAMP, QuantityType.valueOf(deviceInfo.ramp, MetricPrefix.MILLI(SECOND)));
if (deviceInfo instanceof MyStromDeviceSpecificInfo) {
updateState(CHANNEL_POWER, QuantityType.valueOf(((MyStromDeviceSpecificInfo) deviceInfo).power, WATT));
if (deviceInfo instanceof MyStromDeviceSpecificInfo info) {
updateState(CHANNEL_POWER, QuantityType.valueOf(info.power, WATT));
}
if (deviceInfo.on) {
try {
@@ -200,9 +199,9 @@ public class MyStromBulbHandler extends AbstractMyStromHandler {
lastColor = new HSBType(lastColor.getHue() + ",0," + lastBrightness);
updateState(CHANNEL_COLOR_TEMPERATURE, lastColorTemperature);
} else if (numSemicolon == 2 && deviceInfo.mode.equals(HSV)) {
lastColor = HSBType.valueOf(deviceInfo.color.replaceAll(";", ","));
lastColor = HSBType.valueOf(deviceInfo.color.replace(";", ","));
lastBrightness = lastColor.getBrightness();
} else if (!deviceInfo.color.equals("") && deviceInfo.mode.equals(RGB)) {
} else if (!"".equals(deviceInfo.color) && deviceInfo.mode.equals(RGB)) {
int r = Integer.parseInt(deviceInfo.color.substring(2, 4), 16);
int g = Integer.parseInt(deviceInfo.color.substring(4, 6), 16);
int b = Integer.parseInt(deviceInfo.color.substring(6, 8), 16);