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

- 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

View File

@@ -12,9 +12,9 @@
*/
package org.openhab.binding.folding.internal.discovery;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.openhab.binding.folding.internal.FoldingBindingConstants;
import org.openhab.core.config.discovery.AbstractDiscoveryService;
@@ -37,7 +37,7 @@ import org.osgi.service.component.annotations.Component;
public class FoldingSlotDiscoveryService extends AbstractDiscoveryService {
public FoldingSlotDiscoveryService() {
super(Collections.singleton(FoldingBindingConstants.THING_TYPE_SLOT), 10, true);
super(Set.of(FoldingBindingConstants.THING_TYPE_SLOT), 10, true);
FoldingDiscoveryProxy.getInstance().setService(this);
}

View File

@@ -74,7 +74,7 @@ public class FoldingClientHandler extends BaseBridgeHandler {
try {
if (command instanceof RefreshType) {
refresh();
} else if (channelUID.getId().equals("run")) {
} else if ("run".equals(channelUID.getId())) {
if (command == OnOffType.ON) {
sendCommand("unpause");
} else if (command == OnOffType.OFF) {
@@ -82,7 +82,7 @@ public class FoldingClientHandler extends BaseBridgeHandler {
}
refresh();
delayedRefresh();
} else if (channelUID.getId().equals("finish")) {
} else if ("finish".equals(channelUID.getId())) {
if (command == OnOffType.ON) {
sendCommand("finish");
} else if (command == OnOffType.OFF) {

View File

@@ -57,13 +57,13 @@ public class SlotHandler extends BaseThingHandler implements SlotUpdateListener
@Override
public void handleCommand(ChannelUID channelUID, Command command) {
try {
if (channelUID.getId().equals("run")) {
if ("run".equals(channelUID.getId())) {
if (command == OnOffType.ON) {
getBridgeHandler().sendCommand("unpause " + myId());
} else if (command == OnOffType.OFF) {
getBridgeHandler().sendCommand("pause " + myId());
}
} else if (channelUID.getId().equals("finish")) {
} else if ("finish".equals(channelUID.getId())) {
if (command == OnOffType.ON) {
getBridgeHandler().sendCommand("finish " + myId());
} else if (command == OnOffType.OFF) {