You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2021/09/08 16:39:54 UTC
[sis] 06/09: Rename `ComparisonFunction` as `ComparisonFilter`.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit aadd236f921ffcca87b6b62703eeda7d49535054
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 8 11:11:09 2021 +0200
Rename `ComparisonFunction` as `ComparisonFilter`.
---
...ComparisonFunction.java => ComparisonFilter.java} | 20 ++++++++++----------
.../org/apache/sis/filter/DefaultFilterFactory.java | 14 +++++++-------
.../java/org/apache/sis/filter/TemporalFilter.java | 6 +++---
...onFunctionTest.java => ComparisonFilterTest.java} | 12 ++++++------
.../org/apache/sis/test/suite/FeatureTestSuite.java | 2 +-
.../apache/sis/internal/converter/DateConverter.java | 2 +-
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
similarity index 98%
rename from core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
rename to core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
index 94310b3..76d4a0b 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFilter.java
@@ -76,7 +76,7 @@ import org.opengis.filter.BetweenComparisonOperator;
* @since 1.1
* @module
*/
-abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
+abstract class ComparisonFilter<R> extends BinaryFunction<R,Object,Object>
implements BinaryComparisonOperator<R>, Optimization.OnFilter<R>
{
/**
@@ -103,7 +103,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
* @param isMatchingCase specifies whether comparisons are case sensitive.
* @param matchAction specifies how the comparisons shall be evaluated for a collection of values.
*/
- ComparisonFunction(final Expression<? super R, ?> expression1,
+ ComparisonFilter(final Expression<? super R, ?> expression1,
final Expression<? super R, ?> expression2,
final boolean isMatchingCase, final MatchAction matchAction)
{
@@ -161,7 +161,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
@Override
public final boolean equals(final Object obj) {
if (super.equals(obj)) {
- final ComparisonFunction<?> other = (ComparisonFunction<?>) obj;
+ final ComparisonFilter<?> other = (ComparisonFilter<?>) obj;
return other.isMatchingCase == isMatchingCase && matchAction.equals(other.matchAction);
}
return false;
@@ -243,7 +243,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
private boolean evaluate(Object left, Object right) {
/*
* For numbers, the apply(…) method inherited from parent class will delegate to specialized methods like
- * applyAsDouble(…). All implementations of those specialized methods in ComparisonFunction return integer,
+ * applyAsDouble(…). All implementations of those specialized methods in ComparisonFilter return integer,
* so call to intValue() will not cause information lost.
*/
if (left instanceof Number && right instanceof Number) {
@@ -542,7 +542,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsLessThan"} {@literal (<)} filter.
*/
- static final class LessThan<R> extends ComparisonFunction<R> {
+ static final class LessThan<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = 6126039112844823196L;
@@ -582,7 +582,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsLessThanOrEqualTo"} (≤) filter.
*/
- static final class LessThanOrEqualTo<R> extends ComparisonFunction<R> {
+ static final class LessThanOrEqualTo<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = 6357459227911760871L;
@@ -622,7 +622,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsGreaterThan"} {@literal (>)} filter.
*/
- static final class GreaterThan<R> extends ComparisonFunction<R> {
+ static final class GreaterThan<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = 8605517892232632586L;
@@ -662,7 +662,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsGreaterThanOrEqualTo"} (≥) filter.
*/
- static final class GreaterThanOrEqualTo<R> extends ComparisonFunction<R> {
+ static final class GreaterThanOrEqualTo<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = 1514185657159141882L;
@@ -702,7 +702,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsEqualTo"} (=) filter.
*/
- static final class EqualTo<R> extends ComparisonFunction<R> {
+ static final class EqualTo<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = 8502612221498749667L;
@@ -742,7 +742,7 @@ abstract class ComparisonFunction<R> extends BinaryFunction<R,Object,Object>
/**
* The {@code "PropertyIsNotEqualTo"} (≠) filter.
*/
- static final class NotEqualTo<R> extends ComparisonFunction<R> {
+ static final class NotEqualTo<R> extends ComparisonFilter<R> {
/** For cross-version compatibility during (de)serialization. */
private static final long serialVersionUID = -3295957142249035362L;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
index 74966e6..c662076 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFilterFactory.java
@@ -249,7 +249,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.EqualTo<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.EqualTo<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -269,7 +269,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.NotEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.NotEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -289,7 +289,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.LessThan<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.LessThan<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -309,7 +309,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.GreaterThan<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.GreaterThan<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -329,7 +329,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.LessThanOrEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.LessThanOrEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -349,7 +349,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> expression2,
boolean isMatchingCase, MatchAction matchAction)
{
- return new ComparisonFunction.GreaterThanOrEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
+ return new ComparisonFilter.GreaterThanOrEqualTo<>(expression1, expression2, isMatchingCase, matchAction);
}
/**
@@ -367,7 +367,7 @@ public abstract class DefaultFilterFactory<R,G,T> extends AbstractFactory implem
final Expression<? super R, ?> lowerBoundary,
final Expression<? super R, ?> upperBoundary)
{
- return new ComparisonFunction.Between<>(expression, lowerBoundary, upperBoundary);
+ return new ComparisonFilter.Between<>(expression, lowerBoundary, upperBoundary);
}
/**
diff --git a/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java b/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
index b62ee30..a242531 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/filter/TemporalFilter.java
@@ -156,14 +156,14 @@ abstract class TemporalFilter<T> extends BinaryFunction<T,Object,Object>
if (right instanceof Period) {
return evaluate((Period) left, (Period) right);
}
- final Instant t = ComparisonFunction.toInstant(right);
+ final Instant t = ComparisonFilter.toInstant(right);
if (t != null) {
return evaluate((Period) left, t);
}
} else {
- final Instant t = ComparisonFunction.toInstant(left);
+ final Instant t = ComparisonFilter.toInstant(left);
if (t != null) {
- final Instant t2 = ComparisonFunction.toInstant(expression2.apply(candidate));
+ final Instant t2 = ComparisonFilter.toInstant(expression2.apply(candidate));
if (t2 != null) {
return evaluate(t, t2);
}
diff --git a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFunctionTest.java b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
similarity index 95%
rename from core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFunctionTest.java
rename to core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
index 02af5ab..0be250d 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFunctionTest.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/filter/ComparisonFilterTest.java
@@ -33,7 +33,7 @@ import org.opengis.filter.BetweenComparisonOperator;
/**
- * Tests {@link ComparisonFunction} implementations.
+ * Tests {@link ComparisonFilter} implementations.
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -41,7 +41,7 @@ import org.opengis.filter.BetweenComparisonOperator;
* @since 1.1
* @module
*/
-public final strictfp class ComparisonFunctionTest extends TestCase {
+public final strictfp class ComparisonFilterTest extends TestCase {
/**
* The factory to use for creating the objects to test.
*/
@@ -54,7 +54,7 @@ public final strictfp class ComparisonFunctionTest extends TestCase {
/**
* Expected name of the filter to be evaluated. The {@code evaluate(…)} methods
- * will compare {@link ComparisonFunction#getFunctionName()} against this value.
+ * will compare {@link ComparisonFilter#getFunctionName()} against this value.
*/
private ComparisonOperatorName expectedName;
@@ -66,7 +66,7 @@ public final strictfp class ComparisonFunctionTest extends TestCase {
/**
* Creates a new test case.
*/
- public ComparisonFunctionTest() {
+ public ComparisonFilterTest() {
factory = DefaultFilterFactory.forFeatures();
c05 = factory.literal(5);
c10 = factory.literal(10);
@@ -79,7 +79,7 @@ public final strictfp class ComparisonFunctionTest extends TestCase {
*/
private boolean evaluate(final BinaryComparisonOperator<Feature> filter) {
this.filter = filter;
- assertInstanceOf("Expected SIS implementation.", ComparisonFunction.class, filter);
+ assertInstanceOf("Expected SIS implementation.", ComparisonFilter.class, filter);
assertEquals("operatorType", expectedName, filter.getOperatorType());
assertSame("expression[0]", c10, filter.getExpressions().get(0));
return filter.test(null);
@@ -90,7 +90,7 @@ public final strictfp class ComparisonFunctionTest extends TestCase {
*/
private boolean evaluate(final BetweenComparisonOperator<Feature> filter) {
this.filter = filter;
- assertInstanceOf("Expected SIS implementation.", ComparisonFunction.Between.class, filter);
+ assertInstanceOf("Expected SIS implementation.", ComparisonFilter.Between.class, filter);
assertEquals("operatorType", expectedName, filter.getOperatorType());
return filter.test(null);
}
diff --git a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
index 93c7fcd..6cd77c5 100644
--- a/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
+++ b/core/sis-feature/src/test/java/org/apache/sis/test/suite/FeatureTestSuite.java
@@ -55,7 +55,7 @@ import org.junit.runners.Suite;
org.apache.sis.filter.LogicalFilterTest.class,
org.apache.sis.filter.FilterByIdentifierTest.class,
org.apache.sis.filter.ArithmeticFunctionTest.class,
- org.apache.sis.filter.ComparisonFunctionTest.class,
+ org.apache.sis.filter.ComparisonFilterTest.class,
org.apache.sis.filter.LikeFilterTest.class,
org.apache.sis.filter.TemporalFilterTest.class,
org.apache.sis.filter.BinarySpatialFilterUsingJTS_Test.class,
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/DateConverter.java b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/DateConverter.java
index f93b650..f2c258a 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/converter/DateConverter.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/converter/DateConverter.java
@@ -178,6 +178,6 @@ abstract class DateConverter<T> extends SystemConverter<Date,T> {
* Date.toInstant() method throws UnsupportedOperationException), but java.sql.Timestamp is.
*
* If conversion to/from java.time.Instant is added, see if some code can be shared with
- * org.apache.sis.filter.ComparisonFunction.
+ * org.apache.sis.filter.ComparisonFilter.
*/
}