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

5
bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/bridge/GroupePSABridgeHandler.java
View File

@@ -16,7 +16,6 @@ import static org.openhab.binding.groupepsa.internal.GroupePSABindingConstants.T
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
@@ -53,7 +52,7 @@ import org.openhab.core.types.Command;
*/
@NonNullByDefault
public class GroupePSABridgeHandler extends BaseBridgeHandler {
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = Collections.singleton(THING_TYPE_BRIDGE);
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES = Set.of(THING_TYPE_BRIDGE);
private static final long DEFAULT_POLLING_INTERVAL_M = TimeUnit.HOURS.toMinutes(1);
private final OAuthFactory oAuthFactory;
@@ -229,6 +228,6 @@ public class GroupePSABridgeHandler extends BaseBridgeHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(GroupePSADiscoveryService.class);
return Set.of(GroupePSADiscoveryService.class);
}
}

8
bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/discovery/GroupePSADiscoveryService.java
View File

@@ -14,10 +14,10 @@ package org.openhab.binding.groupepsa.internal.discovery;
import static org.openhab.binding.groupepsa.internal.GroupePSABindingConstants.THING_TYPE_VEHICLE;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
@@ -50,13 +50,13 @@ public class GroupePSADiscoveryService extends AbstractDiscoveryService implemen
private @Nullable GroupePSABridgeHandler bridgeHandler;
public GroupePSADiscoveryService() {
super(Collections.singleton(THING_TYPE_VEHICLE), 10, false);
super(Set.of(THING_TYPE_VEHICLE), 10, false);
}
@Override
public void setThingHandler(@Nullable ThingHandler handler) {
if (handler instanceof GroupePSABridgeHandler) {
bridgeHandler = (GroupePSABridgeHandler) handler;
if (handler instanceof GroupePSABridgeHandler bridgeHandler) {
this.bridgeHandler = bridgeHandler;
}
}

4
bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/rest/api/GroupePSAConnectApi.java
View File

@@ -196,8 +196,6 @@ public class GroupePSAConnectApi {
public @Nullable VehicleStatus getVehicleStatus(String vin) throws GroupePSACommunicationException {
ContentResponse responseOdometer = executeRequest(getBaseUrl() + "/user/vehicles/" + vin + "/status");
VehicleStatus status = parseResponse(responseOdometer, VehicleStatus.class);
return status;
return parseResponse(responseOdometer, VehicleStatus.class);
}
}

4
bundles/org.openhab.binding.groupepsa/src/main/java/org/openhab/binding/groupepsa/internal/things/GroupePSAHandler.java
View File

@@ -165,8 +165,8 @@ public class GroupePSAHandler extends BaseThingHandler {
Bridge bridge = getBridge();
if (bridge != null) {
ThingHandler handler = bridge.getHandler();
if (handler instanceof GroupePSABridgeHandler) {
return (GroupePSABridgeHandler) handler;
if (handler instanceof GroupePSABridgeHandler bridgeHandler) {
return bridgeHandler;
}
}
return null;