Java 17 features (A-G) (#15516)
- 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:
@@ -71,8 +71,8 @@ public abstract class BsbLanBaseThingHandler extends BaseThingHandler {
|
||||
return null;
|
||||
}
|
||||
ThingHandler handler = bridge.getHandler();
|
||||
if (handler instanceof BsbLanBridgeHandler) {
|
||||
this.bridgeHandler = (BsbLanBridgeHandler) handler;
|
||||
if (handler instanceof BsbLanBridgeHandler lanBridgeHandler) {
|
||||
this.bridgeHandler = lanBridgeHandler;
|
||||
}
|
||||
}
|
||||
return this.bridgeHandler;
|
||||
|
||||
@@ -106,7 +106,7 @@ public class BsbLanParameterConverter {
|
||||
|
||||
private static State getStateForSwitchValueChannel(BsbLanApiParameterDTO parameter) {
|
||||
// treat "0" as OFF and everything else as ON
|
||||
return parameter.value.equals("0") ? OnOffType.OFF : OnOffType.ON;
|
||||
return "0".equals(parameter.value) ? OnOffType.OFF : OnOffType.ON;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -134,9 +134,7 @@ public class BsbLanParameterConverter {
|
||||
}
|
||||
|
||||
private static @Nullable String getValueForNumberValueChannel(Command command) {
|
||||
if (command instanceof QuantityType<?>) {
|
||||
// the target unit is yet unknown, so just use the value as is (without converting based on the unit)
|
||||
QuantityType<?> quantity = (QuantityType<?>) command;
|
||||
if (command instanceof QuantityType<?> quantity) {
|
||||
return String.valueOf(quantity.doubleValue());
|
||||
}
|
||||
// check if numeric
|
||||
|
||||
@@ -35,8 +35,17 @@ public class BsbLanApiContentConverterTests {
|
||||
|
||||
@Test
|
||||
public void parseBsbLanApiParameterQueryResponse() {
|
||||
String content = "{\r\n" + "\"700\": {\r\n" + "\"name\": \"Betriebsart\",\r\n" + "\"value\": \"0\",\r\n"
|
||||
+ "\"unit\": \"\",\r\n" + "\"desc\": \"Schutzbetrieb\",\r\n" + "\"dataType\": 1\r\n" + "}\r\n" + "}";
|
||||
String content = """
|
||||
{
|
||||
"700": {
|
||||
"name": "Betriebsart",
|
||||
"value": "0",
|
||||
"unit": "",
|
||||
"desc": "Schutzbetrieb",
|
||||
"dataType": 1
|
||||
}
|
||||
}\
|
||||
""";
|
||||
|
||||
BsbLanApiParameterQueryResponseDTO r = BsbLanApiContentConverter.fromJson(content,
|
||||
BsbLanApiParameterQueryResponseDTO.class);
|
||||
|
||||
Reference in New Issue
Block a user