public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Java 17 features (A-G) (#15516)

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-05 22:30:16 +02:00
committed by GitHub
parent a0dc5c05f2
commit cf10b3e9c7
486 changed files with 2053 additions and 1955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/discovery/EnphaseDevicesDiscoveryService.java
View File

@@ -14,10 +14,10 @@ package org.openhab.binding.enphase.internal.discovery;
import static org.openhab.binding.enphase.internal.EnphaseBindingConstants.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -52,13 +52,13 @@ public class EnphaseDevicesDiscoveryService extends AbstractDiscoveryService
private @Nullable EnvoyBridgeHandler envoyHandler;
public EnphaseDevicesDiscoveryService() {
super(Collections.singleton(THING_TYPE_ENPHASE_INVERTER), TIMEOUT_SECONDS, false);
super(Set.of(THING_TYPE_ENPHASE_INVERTER), TIMEOUT_SECONDS, false);
}
@Override
public void setThingHandler(final @Nullable ThingHandler handler) {
if (handler instanceof EnvoyBridgeHandler) {
envoyHandler = (EnvoyBridgeHandler) handler;
if (handler instanceof EnvoyBridgeHandler bridgeHandler) {
envoyHandler = bridgeHandler;
}
}

3
bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/discovery/EnvoyDiscoveryParticipant.java
View File

@@ -15,7 +15,6 @@ package org.openhab.binding.enphase.internal.discovery;
import static org.openhab.binding.enphase.internal.EnphaseBindingConstants.*;
import java.net.Inet4Address;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -56,7 +55,7 @@ public class EnvoyDiscoveryParticipant implements MDNSDiscoveryParticipant, Envo
@Override
public Set<ThingTypeUID> getSupportedThingTypeUIDs() {
return Collections.singleton(EnphaseBindingConstants.THING_TYPE_ENPHASE_ENVOY);
return Set.of(EnphaseBindingConstants.THING_TYPE_ENPHASE_ENVOY);
}
@Override

13
bundles/org.openhab.binding.enphase/src/main/java/org/openhab/binding/enphase/internal/handler/EnvoyBridgeHandler.java
View File

@@ -22,8 +22,8 @@ import static org.openhab.binding.enphase.internal.EnphaseBindingConstants.ENVOY
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -132,7 +132,7 @@ public class EnvoyBridgeHandler extends BaseBridgeHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(EnphaseDevicesDiscoveryService.class);
return Set.of(EnphaseDevicesDiscoveryService.class);
}
@Override
@@ -347,15 +347,14 @@ public class EnvoyBridgeHandler extends BaseBridgeHandler {
@Override
public void childHandlerInitialized(final ThingHandler childHandler, final Thing childThing) {
if (childHandler instanceof EnphaseInverterHandler) {
updateInverter(getInvertersData(false), (EnphaseInverterHandler) childHandler);
if (childHandler instanceof EnphaseInverterHandler handler) {
updateInverter(getInvertersData(false), handler);
}
if (childHandler instanceof EnphaseDeviceHandler) {
if (childHandler instanceof EnphaseDeviceHandler handler) {
final Map<String, @Nullable DeviceDTO> devices = getDevices(false);
if (devices != null) {
((EnphaseDeviceHandler) childHandler)
.refreshDeviceState(devices.get(((EnphaseDeviceHandler) childHandler).getSerialNumber()));
handler.refreshDeviceState(devices.get(handler.getSerialNumber()));
}
}
}