Simplified Expression interface by adding default for getSelf

Author: hylkevds

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/Expression.java

@@ -87,6 +87,8 @@ public default T addParameter(Expression parameter) {
      */
     public T newInstance();
 
-    public T getSelf();
+    public default T getSelf() {
+        return (T) this;
+    }
 
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/Path.java

@@ -180,9 +180,4 @@ public Path newInstance(PropertyPlaceholder rawElements) {
         return new Path(rawElements).setHandler(handler);
     }
 
-    @Override
-    public Path getSelf() {
-        return this;
-    }
-
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/BooleanConstant.java

@@ -40,9 +40,4 @@ public BooleanConstant(String value) {
     public String toUrl() {
         return getValue().toString();
     }
-
-    @Override
-    public BooleanConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/ConstantList.java

@@ -67,9 +67,4 @@ public String toUrl() {
         }
         return '(' + result.substring(0, result.length() - 1) + ')';
     }
-
-    @Override
-    public ConstantList getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/DateConstant.java

@@ -52,9 +52,4 @@ public String toUrl() {
     public static DateConstant parse(String value) {
         return new DateConstant(value);
     }
-
-    @Override
-    public DateConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/DateTimeConstant.java

@@ -63,9 +63,4 @@ public static DateTimeConstant parse(String value) {
             throw new IllegalArgumentException("Failed to parse PlainTimestamp " + StringHelper.cleanForLogging(value), ex);
         }
     }
-
-    @Override
-    public DateTimeConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/DoubleConstant.java

@@ -35,9 +35,4 @@ public DoubleConstant(Double value) {
     public DoubleConstant(String value) {
         super(EXPR_NAME_DOUBLECONSTANT, Double.valueOf(value));
     }
-
-    @Override
-    public DoubleConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/DurationConstant.java

@@ -56,9 +56,4 @@ public static DurationConstant parse(String value) {
             throw new IllegalArgumentException("Failed to parse Duration " + StringHelper.cleanForLogging(value), ex);
         }
     }
-
-    @Override
-    public DurationConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/IntegerConstant.java

@@ -39,9 +39,4 @@ public IntegerConstant(Long value) {
     public IntegerConstant(String value) {
         super(EXPR_NAME_INTCONSTANT, Long.valueOf(value));
     }
-
-    @Override
-    public IntegerConstant getSelf() {
-        return this;
-    }
 }

FROST-Server.Core.Model/src/main/java/de/fraunhofer/iosb/ilt/frostserver/query/expression/constant/IntervalConstant.java

@@ -53,9 +53,4 @@ public static IntervalConstant parse(String value) {
         }
     }
 
-    @Override
-    public IntervalConstant getSelf() {
-        return this;
-    }
-
 }