public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[transform.vat] Suppress warnings for NULL/UNDEF (#15089) 

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2023-06-13 17:31:45 +02:00 committed by GitHub
parent 5e010db738
commit 3cfb048739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.transform.vat/src/main/java/org/openhab/transform/vat/internal/VATTransformationService.java
View File

@ -21,6 +21,7 @@ import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.library.types.QuantityType; import org.openhab.core.library.types.QuantityType;
import org.openhab.core.transform.TransformationException; import org.openhab.core.transform.TransformationException;
import org.openhab.core.transform.TransformationService; import org.openhab.core.transform.TransformationService;
import org.openhab.core.types.UnDefType;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -42,6 +43,9 @@ public class VATTransformationService implements TransformationService {
try { try {
source = new QuantityType<>(sourceString); source = new QuantityType<>(sourceString);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
if (UnDefType.NULL.toString().equals(sourceString) || UnDefType.UNDEF.toString().equals(sourceString)) {
return sourceString;
}
logger.warn("Input value '{}' could not be converted to a valid number", sourceString); logger.warn("Input value '{}' could not be converted to a valid number", sourceString);
throw new TransformationException("VAT Transformation can only be used with numeric inputs", e); throw new TransformationException("VAT Transformation can only be used with numeric inputs", e);
} }

8
bundles/org.openhab.transform.vat/src/main/java/org/openhab/transform/vat/internal/profile/VATTransformationProfile.java
View File

@ -30,6 +30,7 @@ import org.openhab.core.transform.TransformationService;
import org.openhab.core.types.Command; import org.openhab.core.types.Command;
import org.openhab.core.types.State; import org.openhab.core.types.State;
import org.openhab.core.types.Type; import org.openhab.core.types.Type;
import org.openhab.core.types.UnDefType;
import org.openhab.transform.vat.internal.config.VATConfig; import org.openhab.transform.vat.internal.config.VATConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -84,11 +85,12 @@ public class VATTransformationProfile implements StateProfile {
private Type transformState(Type state) { private Type transformState(Type state) {
String result = state.toFullString(); String result = state.toFullString();
String percentage = getVATPercentage();
try { try {
result = TransformationHelper.transform(service, getVATPercentage(), "%s", result); result = TransformationHelper.transform(service, percentage, "%s", result);
} catch (TransformationException e) { } catch (TransformationException e) {
logger.warn("Could not apply '{}' transformation on state '{}' with value '{}'.", PROFILE_TYPE_UID.getId(), logger.warn("Could not apply '{}' transformation on state '{}' with value '{}'.", PROFILE_TYPE_UID.getId(),
state, getVATPercentage()); state, percentage);
} }
Type resultType = state; Type resultType = state;
if (result != null) { if (result != null) {
@ -96,6 +98,8 @@ public class VATTransformationProfile implements StateProfile {
resultType = DecimalType.valueOf(result); resultType = DecimalType.valueOf(result);
} else if (state instanceof QuantityType) { } else if (state instanceof QuantityType) {
resultType = QuantityType.valueOf(result); resultType = QuantityType.valueOf(result);
} else if (state instanceof UnDefType) {
resultType = UnDefType.valueOf(result);
} }
logger.debug("Transformed '{}' into '{}'", state, resultType); logger.debug("Transformed '{}' into '{}'", state, resultType);
} }