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

3
bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/Enigma2BindingConstants.java
View File

@@ -12,7 +12,6 @@
*/
package org.openhab.binding.enigma2.internal;
import java.util.Collections;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -32,7 +31,7 @@ public class Enigma2BindingConstants {
// List of all Thing Type UIDs
public static final ThingTypeUID THING_TYPE_DEVICE = new ThingTypeUID(BINDING_ID, "device");
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections.singleton(THING_TYPE_DEVICE);
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_DEVICE);
// List of all Channel ids
public static final String CHANNEL_VOLUME = "volume";

12
bundles/org.openhab.binding.enigma2/src/main/java/org/openhab/binding/enigma2/internal/handler/Enigma2Handler.java
View File

@@ -16,8 +16,8 @@ import static org.openhab.binding.enigma2.internal.Enigma2BindingConstants.*;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -155,10 +155,10 @@ public class Enigma2Handler extends BaseThingHandler {
if (command instanceof RefreshType) {
client.refreshVolume();
updateState(channelUID, new PercentType(client.getVolume()));
} else if (command instanceof PercentType) {
client.setVolume(((PercentType) command).intValue());
} else if (command instanceof DecimalType) {
client.setVolume(((DecimalType) command).intValue());
} else if (command instanceof PercentType percentCommand) {
client.setVolume(percentCommand.intValue());
} else if (command instanceof DecimalType decimalCommand) {
client.setVolume(decimalCommand.intValue());
} else {
logger.info("Channel {} only accepts PercentType, DecimalType, RefreshType. Type was {}.", channelUID,
command.getClass());
@@ -293,7 +293,7 @@ public class Enigma2Handler extends BaseThingHandler {
@Override
public Collection<Class<? extends ThingHandlerService>> getServices() {
return Collections.singleton(Enigma2Actions.class);
return Set.of(Enigma2Actions.class);
}
/**

32
bundles/org.openhab.binding.enigma2/src/test/java/org/openhab/binding/enigma2/internal/Enigma2ClientTest.java
View File

@@ -312,13 +312,29 @@ public class Enigma2ClientTest {
}
private void whenAllServices() throws IOException {
when(enigma2HttpClient.get(HOST + Enigma2Client.PATH_ALL_SERVICES))
.thenReturn("<e2servicelistrecursive>" + "<e2bouquet>" + "<e2servicelist>" + "<e2service>"
+ "<e2servicereference>1</e2servicereference>" + "<e2servicename>Channel 1</e2servicename>"
+ "</e2service>" + "<e2service>" + "<e2servicereference>2</e2servicereference>"
+ "<e2servicename>Channel 2</e2servicename>" + "</e2service>" + "</e2servicelist>"
+ "</e2bouquet>" + "<e2bouquet>" + "<e2servicelist>" + "<e2service>"
+ "<e2servicereference>3</e2servicereference>" + "<e2servicename>Channel 3</e2servicename>"
+ "</e2service>" + "</e2servicelist>" + "</e2bouquet>" + "</e2servicelistrecursive>");
when(enigma2HttpClient.get(HOST + Enigma2Client.PATH_ALL_SERVICES)).thenReturn("""
<e2servicelistrecursive>\
<e2bouquet>\
<e2servicelist>\
<e2service>\
<e2servicereference>1</e2servicereference>\
<e2servicename>Channel 1</e2servicename>\
</e2service>\
<e2service>\
<e2servicereference>2</e2servicereference>\
<e2servicename>Channel 2</e2servicename>\
</e2service>\
</e2servicelist>\
</e2bouquet>\
<e2bouquet>\
<e2servicelist>\
<e2service>\
<e2servicereference>3</e2servicereference>\
<e2servicename>Channel 3</e2servicename>\
</e2service>\
</e2servicelist>\
</e2bouquet>\
</e2servicelistrecursive>\
""");
}
}