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

4
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/SleepIQHandlerFactory.java
View File

@@ -88,8 +88,8 @@ public class SleepIQHandlerFactory extends BaseThingHandlerFactory {
@Override
protected void removeHandler(final ThingHandler thingHandler) {
logger.debug("Removing SleepIQ thing handler");
if (thingHandler instanceof SleepIQCloudHandler) {
unregisterBedDiscoveryService((SleepIQCloudHandler) thingHandler);
if (thingHandler instanceof SleepIQCloudHandler sleepIQCloudHandler) {
unregisterBedDiscoveryService(sleepIQCloudHandler);
}
}

3
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQCloudHandler.java
View File

@@ -17,7 +17,6 @@ import static org.openhab.binding.sleepiq.internal.config.SleepIQCloudConfigurat
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -71,7 +70,7 @@ import org.slf4j.LoggerFactory;
*/
@NonNullByDefault
public class SleepIQCloudHandler extends ConfigStatusBridgeHandler {
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPE_UIDS = Collections.singleton(THING_TYPE_CLOUD);
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPE_UIDS = Set.of(THING_TYPE_CLOUD);
private static final int SLEEPER_POLLING_INTERVAL_HOURS = 12;

11
bundles/org.openhab.binding.sleepiq/src/main/java/org/openhab/binding/sleepiq/internal/handler/SleepIQDualBedHandler.java
View File

@@ -14,7 +14,6 @@ package org.openhab.binding.sleepiq.internal.handler;
import static org.openhab.binding.sleepiq.internal.SleepIQBindingConstants.*;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -61,7 +60,7 @@ import org.slf4j.LoggerFactory;
*/
@NonNullByDefault
public class SleepIQDualBedHandler extends BaseThingHandler implements BedStatusListener {
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPE_UIDS = Collections.singleton(THING_TYPE_DUAL_BED);
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPE_UIDS = Set.of(THING_TYPE_DUAL_BED);
private static final long GET_SLEEP_DATA_DELAY_MINUTES = 5;
@@ -146,12 +145,12 @@ public class SleepIQDualBedHandler extends BaseThingHandler implements BedStatus
switch (channelId) {
case CHANNEL_LEFT_SLEEP_NUMBER:
case CHANNEL_RIGHT_SLEEP_NUMBER:
if (command instanceof DecimalType) {
if (command instanceof DecimalType decimalCommand) {
Side side = Side.convertFromGroup(groupId);
logger.debug("BedHandler: Set sleepnumber to {} for bedId={}, side={}", command, bedId, side);
SleepIQCloudHandler cloudHandler = getCloudHandler();
if (cloudHandler != null) {
cloudHandler.setSleepNumber(bedId, side, ((DecimalType) command).intValue());
cloudHandler.setSleepNumber(bedId, side, decimalCommand.intValue());
}
}
break;
@@ -169,10 +168,10 @@ public class SleepIQDualBedHandler extends BaseThingHandler implements BedStatus
case CHANNEL_LEFT_FOUNDATION_PRESET:
case CHANNEL_RIGHT_FOUNDATION_PRESET:
logger.debug("Received command {} on channel {} to set preset", command, channelUID);
if (isFoundationInstalled() && command instanceof DecimalType) {
if (isFoundationInstalled() && command instanceof DecimalType decimalCommand) {
try {
Side side = Side.convertFromGroup(groupId);
FoundationPreset preset = FoundationPreset.forValue(((DecimalType) command).intValue());
FoundationPreset preset = FoundationPreset.forValue(decimalCommand.intValue());
logger.debug("BedHandler: Set foundation preset to {} for bedId={}, side={}", command, bedId,
side);
SleepIQCloudHandler cloudHandler = getCloudHandler();