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

34
bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/action/EnergiDataServiceActions.java
View File

@@ -280,11 +280,11 @@ public class EnergiDataServiceActions implements ThingActions {
* @return Map of prices
*/
public static Map<Instant, BigDecimal> getPrices(@Nullable ThingActions actions, @Nullable String priceElements) {
if (actions instanceof EnergiDataServiceActions) {
if (actions instanceof EnergiDataServiceActions serviceActions) {
if (priceElements != null && !priceElements.isBlank()) {
return ((EnergiDataServiceActions) actions).getPrices(priceElements);
return serviceActions.getPrices(priceElements);
} else {
return ((EnergiDataServiceActions) actions).getPrices();
return serviceActions.getPrices();
}
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
@@ -305,8 +305,8 @@ public class EnergiDataServiceActions implements ThingActions {
if (start == null || end == null || power == null) {
return BigDecimal.ZERO;
}
if (actions instanceof EnergiDataServiceActions) {
return ((EnergiDataServiceActions) actions).calculatePrice(start, end, power);
if (actions instanceof EnergiDataServiceActions serviceActions) {
return serviceActions.calculatePrice(start, end, power);
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
}
@@ -314,11 +314,11 @@ public class EnergiDataServiceActions implements ThingActions {
public static Map<String, Object> calculateCheapestPeriod(@Nullable ThingActions actions,
@Nullable Instant earliestStart, @Nullable Instant latestEnd, @Nullable Duration duration) {
if (actions instanceof EnergiDataServiceActions) {
if (actions instanceof EnergiDataServiceActions serviceActions) {
if (earliestStart == null || latestEnd == null || duration == null) {
return Map.of();
}
return ((EnergiDataServiceActions) actions).calculateCheapestPeriod(earliestStart, latestEnd, duration);
return serviceActions.calculateCheapestPeriod(earliestStart, latestEnd, duration);
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
}
@@ -327,12 +327,11 @@ public class EnergiDataServiceActions implements ThingActions {
public static Map<String, Object> calculateCheapestPeriod(@Nullable ThingActions actions,
@Nullable Instant earliestStart, @Nullable Instant latestEnd, @Nullable Duration duration,
@Nullable QuantityType<Power> power) {
if (actions instanceof EnergiDataServiceActions) {
if (actions instanceof EnergiDataServiceActions serviceActions) {
if (earliestStart == null || latestEnd == null || duration == null || power == null) {
return Map.of();
}
return ((EnergiDataServiceActions) actions).calculateCheapestPeriod(earliestStart, latestEnd, duration,
power);
return serviceActions.calculateCheapestPeriod(earliestStart, latestEnd, duration, power);
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
}
@@ -341,13 +340,13 @@ public class EnergiDataServiceActions implements ThingActions {
public static Map<String, Object> calculateCheapestPeriod(@Nullable ThingActions actions,
@Nullable Instant earliestStart, @Nullable Instant latestEnd, @Nullable Duration totalDuration,
@Nullable List<Duration> durationPhases, @Nullable QuantityType<Energy> energyUsedPerPhase) {
if (actions instanceof EnergiDataServiceActions) {
if (actions instanceof EnergiDataServiceActions serviceActions) {
if (earliestStart == null || latestEnd == null || totalDuration == null || durationPhases == null
|| energyUsedPerPhase == null) {
return Map.of();
}
return ((EnergiDataServiceActions) actions).calculateCheapestPeriod(earliestStart, latestEnd, totalDuration,
durationPhases, energyUsedPerPhase);
return serviceActions.calculateCheapestPeriod(earliestStart, latestEnd, totalDuration, durationPhases,
energyUsedPerPhase);
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
}
@@ -356,12 +355,11 @@ public class EnergiDataServiceActions implements ThingActions {
public static Map<String, Object> calculateCheapestPeriod(@Nullable ThingActions actions,
@Nullable Instant earliestStart, @Nullable Instant latestEnd, @Nullable List<Duration> durationPhases,
@Nullable List<QuantityType<Power>> powerPhases) {
if (actions instanceof EnergiDataServiceActions) {
if (actions instanceof EnergiDataServiceActions serviceActions) {
if (earliestStart == null || latestEnd == null || durationPhases == null || powerPhases == null) {
return Map.of();
}
return ((EnergiDataServiceActions) actions).calculateCheapestPeriod(earliestStart, latestEnd,
durationPhases, powerPhases);
return serviceActions.calculateCheapestPeriod(earliestStart, latestEnd, durationPhases, powerPhases);
} else {
throw new IllegalArgumentException("Instance is not an EnergiDataServiceActions class.");
}
@@ -369,8 +367,8 @@ public class EnergiDataServiceActions implements ThingActions {
@Override
public void setThingHandler(@Nullable ThingHandler handler) {
if (handler instanceof EnergiDataServiceHandler) {
this.handler = (EnergiDataServiceHandler) handler;
if (handler instanceof EnergiDataServiceHandler serviceHandler) {
this.handler = serviceHandler;
}
}

3
bundles/org.openhab.binding.energidataservice/src/main/java/org/openhab/binding/energidataservice/internal/retry/strategy/FixedTime.java
View File

@@ -80,7 +80,6 @@ public class FixedTime implements RetryStrategy {
@Override
public final int hashCode() {
final int result = 1;
return result;
return 1;
}
}