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

2
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/dto/GetIndependentDevicesByHomeResponse.java
View File

@@ -21,5 +21,5 @@ import com.google.gson.annotations.SerializedName;
*/
public class GetIndependentDevicesByHomeResponse extends AbstractResponse {
@SerializedName("deviceInfo")
public DeviceDTO devices[] = new DeviceDTO[0];
public DeviceDTO[] devices = new DeviceDTO[0];
}

8
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatAccountHandler.java
View File

@@ -372,8 +372,8 @@ public class MillheatAccountHandler extends BaseBridgeHandler {
final Optional<Room> optionalRoom = model.findRoomById(roomId);
if (optionalHome.isPresent() && optionalRoom.isPresent()) {
final SetRoomTempRequest req = new SetRoomTempRequest(optionalHome.get(), optionalRoom.get());
if (command instanceof QuantityType<?>) {
final int newTemp = (int) ((QuantityType<?>) command).longValue();
if (command instanceof QuantityType<?> quantityCommand) {
final int newTemp = (int) quantityCommand.longValue();
switch (mode) {
case SLEEP:
req.sleepTemp = newTemp;
@@ -404,8 +404,8 @@ public class MillheatAccountHandler extends BaseBridgeHandler {
@Nullable final Command fanCommand) {
model.findHeaterByMacOrId(macAddress, heaterId).ifPresent(heater -> {
int setTemp = heater.getTargetTemp();
if (temperatureCommand instanceof QuantityType<?>) {
setTemp = (int) ((QuantityType<?>) temperatureCommand).longValue();
if (temperatureCommand instanceof QuantityType<?> temperature) {
setTemp = (int) temperature.longValue();
}
boolean masterOnOff = heater.powerStatus();
if (masterOnOffCommand != null) {

4
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/handler/MillheatHomeHandler.java
View File

@@ -68,9 +68,9 @@ public class MillheatHomeHandler extends MillheatBaseThingHandler {
updateState(channelUID, new QuantityType<>(home.getHolidayTemp(), SIUnits.CELSIUS));
} else if (command instanceof QuantityType<?>) {
updateVacationModeProperty(home, SetHolidayParameterRequest.PROP_TEMP, command);
} else if (command instanceof DecimalType) {
} else if (command instanceof DecimalType decimalCommand) {
updateVacationModeProperty(home, SetHolidayParameterRequest.PROP_TEMP,
new QuantityType<>((DecimalType) command, SIUnits.CELSIUS));
new QuantityType<>(decimalCommand, SIUnits.CELSIUS));
}
} else if (CHANNEL_HOME_VACATION_MODE.equals(channelUID.getId())) {
if (command instanceof RefreshType) {

2
bundles/org.openhab.binding.millheat/src/main/java/org/openhab/binding/millheat/internal/model/MillheatModel.java
View File

@@ -60,7 +60,7 @@ public class MillheatModel {
if (macAddress != null) {
heater = findHeaterByMac(macAddress);
}
if (!heater.isPresent() && id != null) {
if (heater.isEmpty() && id != null) {
heater = findHeaterById(id);
}
return heater;