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

3
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/discovery/MieleApplianceDiscoveryService.java
View File

@@ -152,8 +152,7 @@ public class MieleApplianceDiscoveryService extends AbstractDiscoveryService imp
ThingTypeUID thingTypeUID = getThingTypeUidFromModelId(modelId);
if (getSupportedThingTypes().contains(thingTypeUID)) {
ThingUID thingUID = new ThingUID(thingTypeUID, bridgeUID, appliance.getApplianceIdentifier().getId());
return thingUID;
return new ThingUID(thingTypeUID, bridgeUID, appliance.getApplianceIdentifier().getId());
} else {
return null;
}

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/CoffeeMachineChannelSelector.java
View File

@@ -150,6 +150,7 @@ public enum CoffeeMachineChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherChannelSelector.java
View File

@@ -186,6 +186,7 @@ public enum DishwasherChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/DishwasherHandler.java
View File

@@ -122,6 +122,7 @@ public class DishwasherHandler extends MieleApplianceHandler<DishwasherChannelSe
updateSwitchStartStopFromState(dp);
}
@Override
public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
logger.debug("Insufficient extended state data to extract consumption values: {}", extendedDeviceState);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeChannelSelector.java
View File

@@ -141,6 +141,7 @@ public enum FridgeChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/FridgeFreezerChannelSelector.java
View File

@@ -157,6 +157,7 @@ public enum FridgeFreezerChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/HobChannelSelector.java
View File

@@ -161,6 +161,7 @@ public enum HobChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/HoodChannelSelector.java
View File

@@ -127,6 +127,7 @@ public enum HoodChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

8
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/MieleApplianceHandler.java
View File

@@ -265,8 +265,8 @@ public abstract class MieleApplianceHandler<E extends Enum<E> & ApplianceChannel
byte[] extendedStateBytes = DeviceUtil.stringToBytes(dp.Value);
logger.trace("Extended device state for {}: {}", getThing().getUID(),
DeviceUtil.bytesToHex(extendedStateBytes));
if (this instanceof ExtendedDeviceStateListener) {
((ExtendedDeviceStateListener) this).onApplianceExtendedStateChanged(extendedStateBytes);
if (this instanceof ExtendedDeviceStateListener listener) {
listener.onApplianceExtendedStateChanged(extendedStateBytes);
}
}
return;
@@ -441,8 +441,8 @@ public abstract class MieleApplianceHandler<E extends Enum<E> & ApplianceChannel
return null;
}
ThingHandler handler = bridge.getHandler();
if (handler instanceof MieleBridgeHandler) {
this.bridgeHandler = (MieleBridgeHandler) handler;
if (handler instanceof MieleBridgeHandler mieleBridgeHandler) {
this.bridgeHandler = mieleBridgeHandler;
}
}
return this.bridgeHandler;

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/OvenChannelSelector.java
View File

@@ -195,6 +195,7 @@ public enum OvenChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/TumbleDryerChannelSelector.java
View File

@@ -195,6 +195,7 @@ public enum TumbleDryerChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineChannelSelector.java
View File

@@ -210,6 +210,7 @@ public enum WashingMachineChannelSelector implements ApplianceChannelSelector {
}
}
@Override
public State getState(String s) {
try {
Method valueOf = typeClass.getMethod("valueOf", String.class);

1
bundles/org.openhab.binding.miele/src/main/java/org/openhab/binding/miele/internal/handler/WashingMachineHandler.java
View File

@@ -123,6 +123,7 @@ public class WashingMachineHandler extends MieleApplianceHandler<WashingMachineC
updateSwitchStartStopFromState(dp);
}
@Override
public void onApplianceExtendedStateChanged(byte[] extendedDeviceState) {
if (extendedDeviceState.length < EXTENDED_STATE_MIN_SIZE_BYTES) {
logger.debug("Insufficient extended state data to extract consumption values: {}", extendedDeviceState);