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

2
bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SerialConnector.java
View File

@@ -278,7 +278,7 @@ public class SerialConnector extends NibeHeatPumpBaseConnector {
int b;
// wait first byte (blocking)
if ((b = in.read()) > -1) {
byte d[] = new byte[] { (byte) b };
byte[] d = new byte[] { (byte) b };
os.write(d);
// read rest of the available bytes

1
bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/SimulatorConnector.java
View File

@@ -195,7 +195,6 @@ public class SimulatorConnector extends NibeHeatPumpBaseConnector {
logger.debug("Read queue: {}, Write queue: {}", readQueue.size(), writeQueue.size());
}
Thread.sleep(800);
} catch (InterruptedException e) {
}
}

2
bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/connection/UDPConnector.java
View File

@@ -98,7 +98,7 @@ public class UDPConnector extends NibeHeatPumpBaseConnector {
public void sendDatagram(NibeHeatPumpMessage msg) throws NibeHeatPumpException {
logger.debug("Sending request: {}", msg.toHexString());
byte data[] = msg.decodeMessage();
byte[] data = msg.decodeMessage();
int port = -1;
if (msg instanceof ModbusWriteRequestMessage) {

22
bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/handler/NibeHeatPumpHandler.java
View File

@@ -377,10 +377,10 @@ public class NibeHeatPumpHandler extends BaseThingHandler implements NibeHeatPum
if (command instanceof DecimalType || command instanceof QuantityType || command instanceof StringType) {
BigDecimal v;
if (command instanceof DecimalType) {
v = ((DecimalType) command).toBigDecimal();
} else if (command instanceof QuantityType) {
v = ((QuantityType) command).toBigDecimal();
if (command instanceof DecimalType decimalCommand) {
v = decimalCommand.toBigDecimal();
} else if (command instanceof QuantityType quantityCommand) {
v = quantityCommand.toBigDecimal();
} else {
v = new BigDecimal(command.toString());
}
@@ -491,12 +491,12 @@ public class NibeHeatPumpHandler extends BaseThingHandler implements NibeHeatPum
updateStatus(ThingStatus.ONLINE);
if (msg instanceof ModbusReadResponseMessage) {
handleReadResponseMessage((ModbusReadResponseMessage) msg);
} else if (msg instanceof ModbusWriteResponseMessage) {
handleWriteResponseMessage((ModbusWriteResponseMessage) msg);
} else if (msg instanceof ModbusDataReadOutMessage) {
handleDataReadOutMessage((ModbusDataReadOutMessage) msg);
if (msg instanceof ModbusReadResponseMessage readResponseMessage) {
handleReadResponseMessage(readResponseMessage);
} else if (msg instanceof ModbusWriteResponseMessage writeResponseMessage) {
handleWriteResponseMessage(writeResponseMessage);
} else if (msg instanceof ModbusDataReadOutMessage dataReadOutMessage) {
handleDataReadOutMessage(dataReadOutMessage);
} else {
logger.debug("Received unknown message: {}", msg.toString());
}
@@ -567,7 +567,7 @@ public class NibeHeatPumpHandler extends BaseThingHandler implements NibeHeatPum
logger.trace("Value did not change, ignoring update");
} else {
final String channelPrefix = (variableInfo.type == Type.SETTING ? "setting#" : "sensor#");
final String channelId = channelPrefix + String.valueOf(coilAddress);
final String channelId = channelPrefix + coilAddress;
final String acceptedItemType = thing.getChannel(channelId).getAcceptedItemType();
logger.trace("AcceptedItemType for channel {} = {}", channelId, acceptedItemType);

49
bundles/org.openhab.binding.nibeheatpump/src/test/java/org/openhab/binding/nibeheatpump/internal/message/NibeHeatPumpProtocolTest.java
View File

@@ -81,37 +81,24 @@ public class NibeHeatPumpProtocolTest {
//@formatter:off
final String strTestData =
// RMU40 message, acknowledge should be send
"5C001962189600E1010200000000800000000000020914340001000005B8"
// RMU40 message, CRC failure, negative acknowledge should be send
+ "5C001962189600E1010200000000800000000000020914340001000005B9"
// MODBUS40 write request
+ "5C00206B004B"
// nonsense
+ "3EAABB"
// MODBUS40 read request
+ "5C0020690049"
// nonsense
+ "F0561939F6"
// MODBUS40 data read out, acknowledge should be send
+ "5C00206850449C9600489C88014C9C2D014E9CCF004D9CE0014F9C3200509C0400519C8201529C6B02569C3E00C9AF000001A8F600FDA77E02FAA90F0098A9DC27FFFF0000A0A93A04FFFF00009CA9FD19FFFF000081"
// nonsense
+ "F0349823"
// MODBUS40 data read out, CRC failure, negative acknowledge should be send
+ "5C00206850449C9600489C88014C9C2D014E9CCF004D9CE0014F9C3200509C0400519C8201529C6B02569C3E00C9AF000001A8F600FDA77E02FAA90F0098A9DC27FFFF0000A0A93A04FFFF00009CA9FD19FFFF000080"
// RMU40 message, acknowledge should be send
+ "5C001962189600DF01020000000080000000000002091434000100000586"
// nonsense
+ "123490"
// unknown RMU40 message, acknowledge should be send
+ "5C0019600079"
// MODBUS40 data read out, special len, acknowledge should be send
+ "5C00206851449C2500489CFC004C9CF1004E9CC7014D9C0B024F9C2500509C3300519C0B01529C5C5C01569C3100C9AF000001A80C01FDA716FAFAA9070098A91B1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000BE"
// MODBUS40 data read out, special len, acknowledge should be send
+ "5C00206852449C2500489CFE004C9CF2004E9CD4014D9CFB014F9C2500509C3700519C0D01529C5C5C01569C3200C9AF000001A80C01FDA712FAFAA9070098A95C5C1BFFFF0000A0A9D102FFFF00009CA9B412FFFF00007F"
// MODBUS40 data read out, special checksum, acknowledge should be send
+ "5C00206850449C2600489CF6004C9CF1004E9CD6014D9C0C024F9C4500509C3F00519CF100529C0401569CD500C9AF000001A80C01FDA799FAFAA9020098A91A1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000C5"
// 16-bit address (e.g. model F2120 heatpumps), acknowledge should be send
+ "5C41C9F7007F";
"""
5C001962189600E1010200000000800000000000020914340001000005B8\
5C001962189600E1010200000000800000000000020914340001000005B9\
5C00206B004B\
3EAABB\
5C0020690049\
F0561939F6\
5C00206850449C9600489C88014C9C2D014E9CCF004D9CE0014F9C3200509C0400519C8201529C6B02569C3E00C9AF000001A8F600FDA77E02FAA90F0098A9DC27FFFF0000A0A93A04FFFF00009CA9FD19FFFF000081\
F0349823\
5C00206850449C9600489C88014C9C2D014E9CCF004D9CE0014F9C3200509C0400519C8201529C6B02569C3E00C9AF000001A8F600FDA77E02FAA90F0098A9DC27FFFF0000A0A93A04FFFF00009CA9FD19FFFF000080\
5C001962189600DF01020000000080000000000002091434000100000586\
123490\
5C0019600079\
5C00206851449C2500489CFC004C9CF1004E9CC7014D9C0B024F9C2500509C3300519C0B01529C5C5C01569C3100C9AF000001A80C01FDA716FAFAA9070098A91B1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000BE\
5C00206852449C2500489CFE004C9CF2004E9CD4014D9CFB014F9C2500509C3700519C0D01529C5C5C01569C3200C9AF000001A80C01FDA712FAFAA9070098A95C5C1BFFFF0000A0A9D102FFFF00009CA9B412FFFF00007F\
5C00206850449C2600489CF6004C9CF1004E9CD6014D9C0C024F9C4500509C3F00519CF100529C0401569CD500C9AF000001A80C01FDA799FAFAA9020098A91A1BFFFF0000A0A9CA02FFFF00009CA99212FFFF0000C5\
5C41C9F7007F\
""";
//@formatter:on
// create byte data from hex string