a little bit more typesafe

seaside1 · Feb 19, 2025 · 5eb31ff · 5eb31ff
1 parent bde2164
commit 5eb31ff
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleIncreaseDecreaseValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleIncreaseDecreaseValue.java
@@ -57,7 +57,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleNextPreviousValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleNextPreviousValue.java
@@ -57,7 +57,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleOnOffValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleOnOffValue.java
@@ -59,7 +59,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleOpenClosedValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleOpenClosedValue.java
@@ -61,7 +61,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRulePlayPauseValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRulePlayPauseValue.java
@@ -61,7 +61,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleRefreshValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleRefreshValue.java
@@ -53,7 +53,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleRewindFastforwardValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleRewindFastforwardValue.java
@@ -57,7 +57,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleStopMoveValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleStopMoveValue.java
@@ -57,8 +57,8 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
-        return null;
+    public <T extends JRuleValue> T as(Class<T> target) {
+        throw new IllegalStateException("cannot cast");
     }
 
     @Override

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleUpDownValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleUpDownValue.java
@@ -61,7 +61,7 @@ public State toOhState() {
     }
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
+    public <T extends JRuleValue> T as(Class<T> target) {
         throw new IllegalStateException("cannot cast");
     }
 

diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleValue.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleValue.java
@@ -29,5 +29,5 @@ public interface JRuleValue {
 
     State toOhState();
 
-    JRuleValue as(Class<? extends JRuleValue> target);
+    <T extends JRuleValue> T as(Class<T> target);
 }
diff --git a/src/main/java/org/openhab/automation/jrule/rules/value/JRuleValueBase.java b/src/main/java/org/openhab/automation/jrule/rules/value/JRuleValueBase.java
@@ -49,7 +49,8 @@ public State toOhState() {
     protected abstract Type getOhType();
 
     @Override
-    public JRuleValue as(Class<? extends JRuleValue> target) {
-        return JRuleEventHandler.get().toValue(toOhState().as(JRuleEventHandler.mapJRuleToOhType(target)));
+    public <T extends JRuleValue> T as(Class<T> target) {
+        // noinspection unchecked
+        return (T) JRuleEventHandler.get().toValue(toOhState().as(JRuleEventHandler.mapJRuleToOhType(target)));
     }
 }