Merge pull request #189 from querdenker2k/let-quantityitem-extend-num…

…beritem

quantity item should extend number item

src/main/java/org/openhab/automation/jrule/items/JRuleQuantityItem.java

@@ -12,7 +12,6 @@
  */
 package org.openhab.automation.jrule.items;
 
-import java.time.ZonedDateTime;
 import java.util.Optional;
 
 import org.openhab.automation.jrule.exception.JRuleItemNotFoundException;
@@ -27,7 +26,7 @@
  *
  * @author Robert Delbrück - Initial contribution
  */
-public interface JRuleQuantityItem extends JRuleItem {
+public interface JRuleQuantityItem extends JRuleNumberItem {
     static JRuleQuantityItem forName(String itemName) throws JRuleItemNotFoundException {
         return JRuleItemRegistry.get(itemName, JRuleInternalQuantityItem.class);
     }
@@ -131,46 +130,10 @@ default void postUpdate(int state) {
     }
 
     default JRuleDecimalValue getStateAsDecimal() {
-        return JRuleEventHandler.get().getValue(getName(), JRuleDecimalValue.class);
+        return new JRuleDecimalValue(getStateAsQuantity().doubleValue());
     }
 
     default JRuleQuantityValue getStateAsQuantity() {
         return JRuleEventHandler.get().getValue(getName(), JRuleQuantityValue.class);
     }
-
-    default Optional<Double> maximumSince(ZonedDateTime timestamp) {
-        return maximumSince(timestamp, null);
-    }
-
-    Optional<Double> maximumSince(ZonedDateTime timestamp, String persistenceServiceId);
-
-    default Optional<Double> minimumSince(ZonedDateTime timestamp) {
-        return minimumSince(timestamp, null);
-    }
-
-    Optional<Double> minimumSince(ZonedDateTime timestamp, String persistenceServiceId);
-
-    default Optional<Double> varianceSince(ZonedDateTime timestamp) {
-        return varianceSince(timestamp, null);
-    }
-
-    Optional<Double> varianceSince(ZonedDateTime timestamp, String persistenceServiceId);
-
-    default Optional<Double> deviationSince(ZonedDateTime timestamp) {
-        return deviationSince(timestamp, null);
-    }
-
-    Optional<Double> deviationSince(ZonedDateTime timestamp, String persistenceServiceId);
-
-    default Optional<Double> averageSince(ZonedDateTime timestamp) {
-        return averageSince(timestamp, null);
-    }
-
-    Optional<Double> averageSince(ZonedDateTime timestamp, String persistenceServiceId);
-
-    default Optional<Double> sumSince(ZonedDateTime timestamp) {
-        return sumSince(timestamp, null);
-    }
-
-    Optional<Double> sumSince(ZonedDateTime timestamp, String persistenceServiceId);
 }