demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 19:55:48 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Use 'getStateAs()' instead of type casting (#1939)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-12-15 23:03:03 +01:00 committed by GitHub
parent 5bf3f2fd60
commit 990b579865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/extensions/PersistenceExtensions.java
View File

@ -398,10 +398,11 @@ public class PersistenceExtensions {
int count = 0;
while (it.hasNext()) {
State state = it.next().getState();
if (state instanceof DecimalType) {
HistoricItem historicItem = it.next();
DecimalType value = historicItem.getState().as(DecimalType.class);
if (value != null) {
count++;
sum = sum.add(((DecimalType) state).toBigDecimal().subtract(average, MathContext.DECIMAL64).pow(2,
sum = sum.add(value.toBigDecimal().subtract(average, MathContext.DECIMAL64).pow(2,
MathContext.DECIMAL64));
}
}
@ -567,12 +568,12 @@ public class PersistenceExtensions {
BigDecimal sum = BigDecimal.ZERO;
while (it.hasNext()) {
State state = it.next().getState();
if (state instanceof DecimalType) {
sum = sum.add(((DecimalType) state).toBigDecimal());
HistoricItem historicItem = it.next();
DecimalType value = historicItem.getState().as(DecimalType.class);
if (value != null) {
sum = sum.add(value.toBigDecimal());
}
}
return new DecimalType(sum);
}
@ -664,10 +665,9 @@ public class PersistenceExtensions {
public static DecimalType deltaSince(Item item, ZonedDateTime timestamp, String serviceId) {
HistoricItem itemThen = historicState(item, timestamp, serviceId);
if (itemThen != null) {
DecimalType valueThen = (DecimalType) itemThen.getState();
DecimalType valueThen = itemThen.getState().as(DecimalType.class);
DecimalType valueNow = item.getStateAs(DecimalType.class);
if (valueNow != null) {
if (valueThen != null && valueNow != null) {
return new DecimalType(valueNow.toBigDecimal().subtract(valueThen.toBigDecimal()));
}
}
@ -707,10 +707,9 @@ public class PersistenceExtensions {
public static DecimalType evolutionRate(Item item, ZonedDateTime timestamp, String serviceId) {
HistoricItem itemThen = historicState(item, timestamp, serviceId);
if (itemThen != null) {
DecimalType valueThen = (DecimalType) itemThen.getState();
DecimalType valueThen = itemThen.getState().as(DecimalType.class);
DecimalType valueNow = item.getStateAs(DecimalType.class);
if ((valueThen.toBigDecimal().compareTo(BigDecimal.ZERO) != 0) && (valueNow != null)) {
if (valueThen != null && valueThen.toBigDecimal().compareTo(BigDecimal.ZERO) != 0 && valueNow != null) {
// ((now - then) / then) * 100
return new DecimalType(valueNow.toBigDecimal().subtract(valueThen.toBigDecimal())
.divide(valueThen.toBigDecimal(), MathContext.DECIMAL64).movePointRight(2));