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

13
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/AirVisualNodeBindingConstants.java
View File

@@ -12,9 +12,6 @@
*/
package org.openhab.binding.airvisualnode.internal;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -51,12 +48,10 @@ public class AirVisualNodeBindingConstants {
.getUID().getId();
// List of all supported Thing UIDs
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections
.unmodifiableSet(new HashSet<>(Arrays.asList(THING_TYPE_AVNODE)));
public static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Set.of(THING_TYPE_AVNODE);
// List of all supported Channel ids
public static final Set<String> SUPPORTED_CHANNEL_IDS = Collections
.unmodifiableSet(new HashSet<>(Arrays.asList(CHANNEL_CO2, CHANNEL_HUMIDITY, CHANNEL_AQI_US, CHANNEL_PM_25,
CHANNEL_PM_10, CHANNEL_PM_01, CHANNEL_TEMP_CELSIUS, CHANNEL_BATTERY_LEVEL, CHANNEL_WIFI_STRENGTH,
CHANNEL_TIMESTAMP, CHANNEL_USED_MEMORY)));
public static final Set<String> SUPPORTED_CHANNEL_IDS = Set.of(CHANNEL_CO2, CHANNEL_HUMIDITY, CHANNEL_AQI_US,
CHANNEL_PM_25, CHANNEL_PM_10, CHANNEL_PM_01, CHANNEL_TEMP_CELSIUS, CHANNEL_BATTERY_LEVEL,
CHANNEL_WIFI_STRENGTH, CHANNEL_TIMESTAMP, CHANNEL_USED_MEMORY);
}

4
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/discovery/AirVisualNodeDiscoveryService.java
View File

@@ -14,7 +14,7 @@ package org.openhab.binding.airvisualnode.internal.discovery;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
@@ -55,7 +55,7 @@ public class AirVisualNodeDiscoveryService extends AbstractDiscoveryService {
private @Nullable ScheduledFuture<?> backgroundDiscoveryFuture;
public AirVisualNodeDiscoveryService() {
super(Collections.singleton(AirVisualNodeBindingConstants.THING_TYPE_AVNODE), 600, true);
super(Set.of(AirVisualNodeBindingConstants.THING_TYPE_AVNODE), 600, true);
}
@Override

8
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/dto/airvisual/Measurements.java
View File

@@ -49,6 +49,7 @@ public class Measurements implements MeasurementsInterface {
this.vocPpb = vocPpb;
}
@Override
public int getCo2Ppm() {
return co2Ppm;
}
@@ -57,6 +58,7 @@ public class Measurements implements MeasurementsInterface {
this.co2Ppm = co2Ppm;
}
@Override
public int getHumidityRH() {
return humidityRH;
}
@@ -65,6 +67,7 @@ public class Measurements implements MeasurementsInterface {
this.humidityRH = humidityRH;
}
@Override
public int getPm25AQICN() {
return pm25AQICN;
}
@@ -73,6 +76,7 @@ public class Measurements implements MeasurementsInterface {
this.pm25AQICN = pm25AQICN;
}
@Override
public int getPm25AQIUS() {
return pm25AQIUS;
}
@@ -91,6 +95,7 @@ public class Measurements implements MeasurementsInterface {
return 0;
}
@Override
public float getPm25Ugm3() {
return pm25Ugm3;
}
@@ -99,6 +104,7 @@ public class Measurements implements MeasurementsInterface {
this.pm25Ugm3 = pm25Ugm3;
}
@Override
public float getTemperatureC() {
return temperatureC;
}
@@ -107,6 +113,7 @@ public class Measurements implements MeasurementsInterface {
this.temperatureC = temperatureC;
}
@Override
public float getTemperatureF() {
return temperatureF;
}
@@ -115,6 +122,7 @@ public class Measurements implements MeasurementsInterface {
this.temperatureF = temperatureF;
}
@Override
public int getVocPpb() {
return vocPpb;
}

5
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/dto/airvisual/NodeData.java
View File

@@ -40,6 +40,7 @@ public class NodeData implements NodeDataInterface {
this.status = status;
}
@Override
public DateAndTime getDateAndTime() {
return dateAndTime;
}
@@ -48,6 +49,7 @@ public class NodeData implements NodeDataInterface {
this.dateAndTime = dateAndTime;
}
@Override
public MeasurementsInterface getMeasurements() {
return measurements;
}
@@ -56,6 +58,7 @@ public class NodeData implements NodeDataInterface {
this.measurements = measurements;
}
@Override
public String getSerialNumber() {
return serialNumber;
}
@@ -64,6 +67,7 @@ public class NodeData implements NodeDataInterface {
this.serialNumber = serialNumber;
}
@Override
public Settings getSettings() {
return settings;
}
@@ -72,6 +76,7 @@ public class NodeData implements NodeDataInterface {
this.settings = settings;
}
@Override
public Status getStatus() {
return status;
}

10
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/dto/airvisualpro/Measurements.java
View File

@@ -66,6 +66,7 @@ public class Measurements implements MeasurementsInterface {
this.vocPpb = vocPpb;
}
@Override
public int getCo2Ppm() {
return co2Ppm;
}
@@ -74,6 +75,7 @@ public class Measurements implements MeasurementsInterface {
this.co2Ppm = co2Ppm;
}
@Override
public int getHumidityRH() {
return humidityRH;
}
@@ -82,6 +84,7 @@ public class Measurements implements MeasurementsInterface {
this.humidityRH = humidityRH;
}
@Override
public int getPm25AQICN() {
return pm25AQICN;
}
@@ -90,6 +93,7 @@ public class Measurements implements MeasurementsInterface {
this.pm25AQICN = pm25AQICN;
}
@Override
public int getPm25AQIUS() {
return pm25AQIUS;
}
@@ -98,6 +102,7 @@ public class Measurements implements MeasurementsInterface {
this.pm25AQIUS = pm25AQIUS;
}
@Override
public float getPm01Ugm3() {
return pm01Ugm3;
}
@@ -106,6 +111,7 @@ public class Measurements implements MeasurementsInterface {
this.pm01Ugm3 = pm01Ugm3;
}
@Override
public float getPm10Ugm3() {
return pm10Ugm3;
}
@@ -114,6 +120,7 @@ public class Measurements implements MeasurementsInterface {
this.pm10Ugm3 = pm10Ugm3;
}
@Override
public float getPm25Ugm3() {
return pm25Ugm3;
}
@@ -122,6 +129,7 @@ public class Measurements implements MeasurementsInterface {
this.pm25Ugm3 = pm25Ugm3;
}
@Override
public float getTemperatureC() {
return temperatureC;
}
@@ -130,6 +138,7 @@ public class Measurements implements MeasurementsInterface {
this.temperatureC = temperatureC;
}
@Override
public float getTemperatureF() {
return temperatureF;
}
@@ -138,6 +147,7 @@ public class Measurements implements MeasurementsInterface {
this.temperatureF = temperatureF;
}
@Override
public int getVocPpb() {
return vocPpb;
}

5
bundles/org.openhab.binding.airvisualnode/src/main/java/org/openhab/binding/airvisualnode/internal/dto/airvisualpro/ProNodeData.java
View File

@@ -44,6 +44,7 @@ public class ProNodeData implements NodeDataInterface {
this.status = status;
}
@Override
public DateAndTime getDateAndTime() {
return dateAndTime;
}
@@ -52,6 +53,7 @@ public class ProNodeData implements NodeDataInterface {
this.dateAndTime = dateAndTime;
}
@Override
public MeasurementsInterface getMeasurements() {
return measurements.get(0);
}
@@ -60,6 +62,7 @@ public class ProNodeData implements NodeDataInterface {
this.measurements = measurements;
}
@Override
public String getSerialNumber() {
return serialNumber;
}
@@ -68,6 +71,7 @@ public class ProNodeData implements NodeDataInterface {
this.serialNumber = serialNumber;
}
@Override
public Settings getSettings() {
return settings;
}
@@ -76,6 +80,7 @@ public class ProNodeData implements NodeDataInterface {
this.settings = settings;
}
@Override
public Status getStatus() {
return status;
}