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

16
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/HaywardBindingConstants.java
View File

@@ -174,11 +174,13 @@ public class HaywardBindingConstants {
// Hayward Command html
public static final String COMMAND_PARAMETERS = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request>";
public static final String COMMAND_SCHEDULE = "<Parameter name=\"IsCountDownTimer\" dataType=\"bool\">false</Parameter>"
+ "<Parameter name=\"StartTimeHours\" dataType=\"int\">0</Parameter>"
+ "<Parameter name=\"StartTimeMinutes\" dataType=\"int\">0</Parameter>"
+ "<Parameter name=\"EndTimeHours\" dataType=\"int\">0</Parameter>"
+ "<Parameter name=\"EndTimeMinutes\" dataType=\"int\">0</Parameter>"
+ "<Parameter name=\"DaysActive\" dataType=\"int\">0</Parameter>"
+ "<Parameter name=\"Recurring\" dataType=\"bool\">false</Parameter>";
public static final String COMMAND_SCHEDULE = """
<Parameter name="IsCountDownTimer" dataType="bool">false</Parameter>\
<Parameter name="StartTimeHours" dataType="int">0</Parameter>\
<Parameter name="StartTimeMinutes" dataType="int">0</Parameter>\
<Parameter name="EndTimeHours" dataType="int">0</Parameter>\
<Parameter name="EndTimeMinutes" dataType="int">0</Parameter>\
<Parameter name="DaysActive" dataType="int">0</Parameter>\
<Parameter name="Recurring" dataType="bool">false</Parameter>\
""";
}

10
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/HaywardThingHandler.java
View File

@@ -93,7 +93,7 @@ public abstract class HaywardThingHandler extends BaseThingHandler {
if (bridge != null) {
HaywardBridgeHandler bridgehandler = (HaywardBridgeHandler) bridge.getHandler();
if (bridgehandler != null) {
if (bridgehandler.account.units.equals("Standard")) {
if ("Standard".equals(bridgehandler.account.units)) {
return new QuantityType<>(Integer.parseInt(value), ImperialUnits.FAHRENHEIT);
} else {
return new QuantityType<>(Integer.parseInt(value), SIUnits.CELSIUS);
@@ -112,10 +112,10 @@ public abstract class HaywardThingHandler extends BaseThingHandler {
return "0";
} else if (command == OnOffType.ON) {
return "1";
} else if (command instanceof DecimalType) {
return ((DecimalType) command).toString();
} else if (command instanceof QuantityType) {
return ((QuantityType<?>) command).format("%1.0f");
} else if (command instanceof DecimalType decimalCommand) {
return decimalCommand.toString();
} else if (command instanceof QuantityType quantityCommand) {
return quantityCommand.format("%1.0f");
} else {
return command.toString();
}

4
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/discovery/HaywardDiscoveryService.java
View File

@@ -349,8 +349,8 @@ public class HaywardDiscoveryService extends AbstractDiscoveryService implements
@Override
public void setThingHandler(@Nullable ThingHandler handler) {
if (handler instanceof HaywardBridgeHandler) {
this.discoveryBridgehandler = (HaywardBridgeHandler) handler;
if (handler instanceof HaywardBridgeHandler bridgeHandler) {
this.discoveryBridgehandler = bridgeHandler;
}
}

10
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
View File

@@ -83,10 +83,12 @@ public class HaywardBackyardHandler extends HaywardThingHandler {
HaywardBridgeHandler bridgehandler = (HaywardBridgeHandler) bridge.getHandler();
if (bridgehandler != null) {
// *****Request Alarm List from Hayward server
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request><Name>GetAlarmList</Name><Parameters>"
+ "<Parameter name=\"Token\" dataType=\"String\">" + bridgehandler.account.token
+ "</Parameter>" + "<Parameter name=\"MspSystemID\" dataType=\"int\">"
+ bridgehandler.account.mspSystemID + "</Parameter>"
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request><Name>GetAlarmList</Name><Parameters>\
<Parameter name="Token" dataType="String">\
""" + bridgehandler.account.token + "</Parameter>"
+ "<Parameter name=\"MspSystemID\" dataType=\"int\">" + bridgehandler.account.mspSystemID
+ "</Parameter>"
+ "<Parameter name=\"CultureInfoName\" dataType=\"String\">en-us</Parameter></Parameters></Request>";
try {

47
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
View File

@@ -15,9 +15,9 @@ package org.openhab.binding.haywardomnilogic.internal.handler;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -82,7 +82,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(HaywardDiscoveryService.class);
return Set.of(HaywardDiscoveryService.class);
}
public HaywardBridgeHandler(HaywardDynamicStateDescriptionProvider stateDescriptionProvider, Bridge bridge,
@@ -191,10 +191,12 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
String status;
// *****Login to Hayward server
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request>" + "<Name>Login</Name><Parameters>"
+ "<Parameter name=\"UserName\" dataType=\"String\">" + config.username + "</Parameter>"
+ "<Parameter name=\"Password\" dataType=\"String\">" + config.password + "</Parameter>"
+ "</Parameters></Request>";
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request>\
<Name>Login</Name><Parameters>\
<Parameter name="UserName" dataType="String">\
""" + config.username + "</Parameter>" + "<Parameter name=\"Password\" dataType=\"String\">"
+ config.password + "</Parameter>" + "</Parameters></Request>";
xmlResponse = httpXmlResponse(urlParameters);
@@ -219,9 +221,11 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
String xmlResponse;
// *****getApiDef from Hayward server
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request><Name>GetAPIDef</Name><Parameters>"
+ "<Parameter name=\"Token\" dataType=\"String\">" + account.token + "</Parameter>"
+ "<Parameter name=\"MspSystemID\" dataType=\"int\">" + account.mspSystemID + "</Parameter>;"
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request><Name>GetAPIDef</Name><Parameters>\
<Parameter name="Token" dataType="String">\
""" + account.token + "</Parameter>" + "<Parameter name=\"MspSystemID\" dataType=\"int\">"
+ account.mspSystemID + "</Parameter>;"
+ "<Parameter name=\"Version\" dataType=\"string\">0.4</Parameter >\r\n"
+ "<Parameter name=\"Language\" dataType=\"string\">en</Parameter >\r\n" + "</Parameters></Request>";
@@ -239,9 +243,10 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
String status;
// *****Get MSP
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request><Name>GetSiteList</Name><Parameters>"
+ "<Parameter name=\"Token\" dataType=\"String\">" + account.token
+ "</Parameter><Parameter name=\"UserID\" dataType=\"String\">" + account.userID
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request><Name>GetSiteList</Name><Parameters>\
<Parameter name="Token" dataType="String">\
""" + account.token + "</Parameter><Parameter name=\"UserID\" dataType=\"String\">" + account.userID
+ "</Parameter></Parameters></Request>";
xmlResponse = httpXmlResponse(urlParameters);
@@ -269,10 +274,11 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
public synchronized String getMspConfig() throws HaywardException, InterruptedException {
// *****getMspConfig from Hayward server
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request><Name>GetMspConfigFile</Name><Parameters>"
+ "<Parameter name=\"Token\" dataType=\"String\">" + account.token + "</Parameter>"
+ "<Parameter name=\"MspSystemID\" dataType=\"int\">" + account.mspSystemID
+ "</Parameter><Parameter name=\"Version\" dataType=\"string\">0</Parameter>\r\n"
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request><Name>GetMspConfigFile</Name><Parameters>\
<Parameter name="Token" dataType="String">\
""" + account.token + "</Parameter>" + "<Parameter name=\"MspSystemID\" dataType=\"int\">"
+ account.mspSystemID + "</Parameter><Parameter name=\"Version\" dataType=\"string\">0</Parameter>\r\n"
+ "</Parameters></Request>";
String xmlResponse = httpXmlResponse(urlParameters);
@@ -312,10 +318,11 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
public synchronized boolean getTelemetryData() throws HaywardException, InterruptedException {
// *****getTelemetry from Hayward server
String urlParameters = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Request><Name>GetTelemetryData</Name><Parameters>"
+ "<Parameter name=\"Token\" dataType=\"String\">" + account.token + "</Parameter>"
+ "<Parameter name=\"MspSystemID\" dataType=\"int\">" + account.mspSystemID
+ "</Parameter></Parameters></Request>";
String urlParameters = """
<?xml version="1.0" encoding="utf-8"?><Request><Name>GetTelemetryData</Name><Parameters>\
<Parameter name="Token" dataType="String">\
""" + account.token + "</Parameter>" + "<Parameter name=\"MspSystemID\" dataType=\"int\">"
+ account.mspSystemID + "</Parameter></Parameters></Request>";
String xmlResponse = httpXmlResponse(urlParameters);

2
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
View File

@@ -90,7 +90,7 @@ public class HaywardChlorinatorHandler extends HaywardThingHandler {
data = bridgehandler.evaluateXPath("//Chlorinator/@status", xmlResponse);
updateData(HaywardBindingConstants.CHANNEL_CHLORINATOR_STATUS, data.get(i));
if (data.get(i).equals("0")) {
if ("0".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_CHLORINATOR_ENABLE, "0");
// chlorState is used to set the chlorinator cfgState in the timedPercent command
this.chlorState = "2";

2
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
View File

@@ -60,7 +60,7 @@ public class HaywardColorLogicHandler extends HaywardThingHandler {
data = bridgehandler.evaluateXPath("//ColorLogic-Light/@lightState", xmlResponse);
updateData(HaywardBindingConstants.CHANNEL_COLORLOGIC_LIGHTSTATE, data.get(i));
if (data.get(i).equals("0")) {
if ("0".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_COLORLOGIC_ENABLE, "0");
} else {
updateData(HaywardBindingConstants.CHANNEL_COLORLOGIC_ENABLE, "1");

2
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
View File

@@ -154,7 +154,7 @@ public class HaywardFilterHandler extends HaywardThingHandler {
updateData(HaywardBindingConstants.CHANNEL_FILTER_SPEEDRPM, rpmSpeed.toString());
}
if (data.get(i).equals("0")) {
if ("0".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_FILTER_ENABLE, "0");
} else {
updateData(HaywardBindingConstants.CHANNEL_FILTER_ENABLE, "1");

2
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardHeaterHandler.java
View File

@@ -58,7 +58,7 @@ public class HaywardHeaterHandler extends HaywardThingHandler {
// Enable
data = bridgehandler.evaluateXPath("//Heater/@enable", xmlResponse);
if (data.get(i).equals("0")) {
if ("0".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_HEATER_ENABLE, "0");
} else {
updateData(HaywardBindingConstants.CHANNEL_HEATER_ENABLE, "1");

2
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardPumpHandler.java
View File

@@ -150,7 +150,7 @@ public class HaywardPumpHandler extends HaywardThingHandler {
updateData(HaywardBindingConstants.CHANNEL_PUMP_SPEEDRPM, rpmSpeed.toString());
}
if (data.get(i).equals("0")) {
if ("0".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_PUMP_ENABLE, "0");
} else {
updateData(HaywardBindingConstants.CHANNEL_PUMP_ENABLE, "1");

4
bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
View File

@@ -95,9 +95,9 @@ public class HaywardVirtualHeaterHandler extends HaywardThingHandler {
updateData(HaywardBindingConstants.CHANNEL_VIRTUALHEATER_CURRENTSETPOINT, data.get(i));
data = bridgehandler.evaluateXPath("//VirtualHeater/@enable", xmlResponse);
if (data.get(i).equals("yes")) {
if ("yes".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_VIRTUALHEATER_ENABLE, "1");
} else if (data.get(i).equals("no")) {
} else if ("no".equals(data.get(i))) {
updateData(HaywardBindingConstants.CHANNEL_VIRTUALHEATER_ENABLE, "0");
}
}