METAMODEL-236: Fixed Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/aeddd80c Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/aeddd80c Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/aeddd80c
Branch: refs/heads/5.x Commit: aeddd80c384d409469b804af7725c6524f933ed9 Parents: 426396a Author: Kasper Sørensen <[email protected]> Authored: Mon Mar 7 09:10:47 2016 +0100 Committer: Kasper Sørensen <[email protected]> Committed: Mon Mar 7 09:10:47 2016 +0100 ---------------------------------------------------------------------- CHANGES.md | 4 ++++ .../org/apache/metamodel/query/AverageAggregateFunction.java | 2 ++ .../java/org/apache/metamodel/query/CountAggregateFunction.java | 2 ++ .../org/apache/metamodel/query/DefaultAggregateFunction.java | 2 ++ .../java/org/apache/metamodel/query/DefaultScalarFunction.java | 2 ++ .../java/org/apache/metamodel/query/FirstAggregateFunction.java | 2 ++ core/src/main/java/org/apache/metamodel/query/FunctionType.java | 4 +++- .../java/org/apache/metamodel/query/LastAggregateFunction.java | 2 ++ .../main/java/org/apache/metamodel/query/MapValueFunction.java | 2 ++ .../java/org/apache/metamodel/query/MaxAggregateFunction.java | 2 ++ .../java/org/apache/metamodel/query/MinAggregateFunction.java | 2 ++ core/src/main/java/org/apache/metamodel/query/OperatorType.java | 4 +++- .../main/java/org/apache/metamodel/query/OperatorTypeImpl.java | 2 ++ .../java/org/apache/metamodel/query/RandomAggregateFunction.java | 2 ++ .../java/org/apache/metamodel/query/SumAggregateFunction.java | 2 ++ .../main/java/org/apache/metamodel/query/ToBooleanFunction.java | 2 ++ .../src/main/java/org/apache/metamodel/query/ToDateFunction.java | 2 ++ .../main/java/org/apache/metamodel/query/ToNumberFunction.java | 2 ++ .../main/java/org/apache/metamodel/query/ToStringFunction.java | 2 ++ 19 files changed, 42 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index 368e0a2..9ed7dc4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +### Apache MetaModel 4.5.2 + + * [METAMODEL-236] - Made OperatorType and FunctionType Serializable to ensure that serialization of Query is possible. + ### Apache MetaModel 4.5.1 * [METAMODEL-227] - Fix for respecting CSV escape character also when no quote character is set. http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/AverageAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/AverageAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/AverageAggregateFunction.java index d80de09..338b088 100644 --- a/core/src/main/java/org/apache/metamodel/query/AverageAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/AverageAggregateFunction.java @@ -22,6 +22,8 @@ import org.apache.metamodel.util.AggregateBuilder; public class AverageAggregateFunction extends DefaultAggregateFunction<Double> { + private static final long serialVersionUID = 1L; + @Override public String getFunctionName() { return "AVG"; http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/CountAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/CountAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/CountAggregateFunction.java index c88b47e..4e2985a 100644 --- a/core/src/main/java/org/apache/metamodel/query/CountAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/CountAggregateFunction.java @@ -22,6 +22,8 @@ import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.util.AggregateBuilder; public class CountAggregateFunction extends DefaultAggregateFunction<Long> { + + private static final long serialVersionUID = 1L; public String getFunctionName() { return "COUNT"; http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/DefaultAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/DefaultAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/DefaultAggregateFunction.java index d904bb0..ef8ea57 100644 --- a/core/src/main/java/org/apache/metamodel/query/DefaultAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/DefaultAggregateFunction.java @@ -26,6 +26,8 @@ import org.apache.metamodel.util.AggregateBuilder; */ public abstract class DefaultAggregateFunction<T> implements AggregateFunction { + private static final long serialVersionUID = 1L; + @Override public ColumnType getExpectedColumnType(ColumnType type) { return type; http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/DefaultScalarFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/DefaultScalarFunction.java b/core/src/main/java/org/apache/metamodel/query/DefaultScalarFunction.java index e647b02..8926f60 100644 --- a/core/src/main/java/org/apache/metamodel/query/DefaultScalarFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/DefaultScalarFunction.java @@ -19,6 +19,8 @@ package org.apache.metamodel.query; public abstract class DefaultScalarFunction implements ScalarFunction { + + private static final long serialVersionUID = 1L; @Override public String toString() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/FirstAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/FirstAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/FirstAggregateFunction.java index b83f2e1..925b7d5 100644 --- a/core/src/main/java/org/apache/metamodel/query/FirstAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/FirstAggregateFunction.java @@ -21,6 +21,8 @@ package org.apache.metamodel.query; import org.apache.metamodel.util.AggregateBuilder; public class FirstAggregateFunction extends DefaultAggregateFunction<Object> { + + private static final long serialVersionUID = 1L; @Override public AggregateBuilder<?> createAggregateBuilder() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/FunctionType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/FunctionType.java b/core/src/main/java/org/apache/metamodel/query/FunctionType.java index 8d06dcc..ecedc97 100644 --- a/core/src/main/java/org/apache/metamodel/query/FunctionType.java +++ b/core/src/main/java/org/apache/metamodel/query/FunctionType.java @@ -18,6 +18,8 @@ */ package org.apache.metamodel.query; +import java.io.Serializable; + import org.apache.metamodel.schema.ColumnType; /** @@ -25,7 +27,7 @@ import org.apache.metamodel.schema.ColumnType; * * @see SelectItem */ -public interface FunctionType { +public interface FunctionType extends Serializable { public static final AggregateFunction COUNT = new CountAggregateFunction(); public static final AggregateFunction AVG = new AverageAggregateFunction(); http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/LastAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/LastAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/LastAggregateFunction.java index 4fa532e..909a19d 100644 --- a/core/src/main/java/org/apache/metamodel/query/LastAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/LastAggregateFunction.java @@ -21,6 +21,8 @@ package org.apache.metamodel.query; import org.apache.metamodel.util.AggregateBuilder; public class LastAggregateFunction extends DefaultAggregateFunction<Object> { + + private static final long serialVersionUID = 1L; @Override public AggregateBuilder<?> createAggregateBuilder() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/MapValueFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/MapValueFunction.java b/core/src/main/java/org/apache/metamodel/query/MapValueFunction.java index 5cb743a..099bcab 100644 --- a/core/src/main/java/org/apache/metamodel/query/MapValueFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/MapValueFunction.java @@ -29,6 +29,8 @@ import org.apache.metamodel.util.CollectionUtils; * {@link ColumnType#MAP} or similar. */ public final class MapValueFunction extends DefaultScalarFunction { + + private static final long serialVersionUID = 1L; @Override public Object evaluate(Row row, Object[] parameters, SelectItem operandItem) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/MaxAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/MaxAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/MaxAggregateFunction.java index 32ecc2a..805e506 100644 --- a/core/src/main/java/org/apache/metamodel/query/MaxAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/MaxAggregateFunction.java @@ -21,6 +21,8 @@ package org.apache.metamodel.query; import org.apache.metamodel.util.AggregateBuilder; public class MaxAggregateFunction extends DefaultAggregateFunction<Object> { + + private static final long serialVersionUID = 1L; @Override public String getFunctionName() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/MinAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/MinAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/MinAggregateFunction.java index 0181376..3962088 100644 --- a/core/src/main/java/org/apache/metamodel/query/MinAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/MinAggregateFunction.java @@ -21,6 +21,8 @@ package org.apache.metamodel.query; import org.apache.metamodel.util.AggregateBuilder; public class MinAggregateFunction extends DefaultAggregateFunction<Object> { + + private static final long serialVersionUID = 1L; @Override public String getFunctionName() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/OperatorType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/OperatorType.java b/core/src/main/java/org/apache/metamodel/query/OperatorType.java index d20f492..65f54b3 100644 --- a/core/src/main/java/org/apache/metamodel/query/OperatorType.java +++ b/core/src/main/java/org/apache/metamodel/query/OperatorType.java @@ -18,12 +18,14 @@ */ package org.apache.metamodel.query; +import java.io.Serializable; + /** * Defines the types of operators that can be used in filters. * * @see FilterItem */ -public interface OperatorType { +public interface OperatorType extends Serializable { public static final OperatorType EQUALS_TO = new OperatorTypeImpl("=", false); http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java b/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java index 9869c88..a48b337 100644 --- a/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java +++ b/core/src/main/java/org/apache/metamodel/query/OperatorTypeImpl.java @@ -24,6 +24,8 @@ import java.util.Objects; * Simple implementation of {@link OperatorType} */ public class OperatorTypeImpl implements OperatorType { + + private static final long serialVersionUID = 1L; private final String _sql; private final boolean _spaceDelimited; http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/RandomAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/RandomAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/RandomAggregateFunction.java index 1a53816..764a2e6 100644 --- a/core/src/main/java/org/apache/metamodel/query/RandomAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/RandomAggregateFunction.java @@ -21,6 +21,8 @@ package org.apache.metamodel.query; import org.apache.metamodel.util.AggregateBuilder; public class RandomAggregateFunction extends DefaultAggregateFunction<Object> { + + private static final long serialVersionUID = 1L; @Override public AggregateBuilder<?> createAggregateBuilder() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/SumAggregateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/SumAggregateFunction.java b/core/src/main/java/org/apache/metamodel/query/SumAggregateFunction.java index 655f130..23e4c4c 100644 --- a/core/src/main/java/org/apache/metamodel/query/SumAggregateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/SumAggregateFunction.java @@ -22,6 +22,8 @@ import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.util.AggregateBuilder; public class SumAggregateFunction extends DefaultAggregateFunction<Double> { + + private static final long serialVersionUID = 1L; @Override public String getFunctionName() { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/ToBooleanFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/ToBooleanFunction.java b/core/src/main/java/org/apache/metamodel/query/ToBooleanFunction.java index c8684cf..3a7f8ee 100644 --- a/core/src/main/java/org/apache/metamodel/query/ToBooleanFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/ToBooleanFunction.java @@ -23,6 +23,8 @@ import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.util.BooleanComparator; public class ToBooleanFunction extends DefaultScalarFunction { + + private static final long serialVersionUID = 1L; @Override public ColumnType getExpectedColumnType(ColumnType type) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/ToDateFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/ToDateFunction.java b/core/src/main/java/org/apache/metamodel/query/ToDateFunction.java index e6f932b..a55d513 100644 --- a/core/src/main/java/org/apache/metamodel/query/ToDateFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/ToDateFunction.java @@ -25,6 +25,8 @@ import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.util.TimeComparator; public class ToDateFunction extends DefaultScalarFunction { + + private static final long serialVersionUID = 1L; @Override public ColumnType getExpectedColumnType(ColumnType type) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/ToNumberFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/ToNumberFunction.java b/core/src/main/java/org/apache/metamodel/query/ToNumberFunction.java index a97a84a..5a8bac7 100644 --- a/core/src/main/java/org/apache/metamodel/query/ToNumberFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/ToNumberFunction.java @@ -23,6 +23,8 @@ import org.apache.metamodel.schema.ColumnType; import org.apache.metamodel.util.NumberComparator; public class ToNumberFunction extends DefaultScalarFunction { + + private static final long serialVersionUID = 1L; @Override public ColumnType getExpectedColumnType(ColumnType type) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/aeddd80c/core/src/main/java/org/apache/metamodel/query/ToStringFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/query/ToStringFunction.java b/core/src/main/java/org/apache/metamodel/query/ToStringFunction.java index ce85f0e..97d3fa9 100644 --- a/core/src/main/java/org/apache/metamodel/query/ToStringFunction.java +++ b/core/src/main/java/org/apache/metamodel/query/ToStringFunction.java @@ -22,6 +22,8 @@ import org.apache.metamodel.data.Row; import org.apache.metamodel.schema.ColumnType; public class ToStringFunction extends DefaultScalarFunction { + + private static final long serialVersionUID = 1L; @Override public ColumnType getExpectedColumnType(ColumnType type) {
