sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] branch geoapi-3.1 updated (62129dd -> 76eabab)
Date Sat, 08 Jun 2019 16:09:15 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git.


    from 62129dd  Merge branch 'geoapi-4.0' into geoapi-3.1
     add 76d0e34  Refator the filter implementation in order to share more common implementations.
Also try to perform a more elaborated analysis of types during arithmetic operations. This
work is not final; we still need to do a deeper review of filter interfaces: https://github.com/opengeospatial/geoapi/issues/32
     new 76eabab  Merge branch 'geoapi-4.0' into geoapi-3.1: refactoring of filter implementations.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../filter/AbstractBinaryComparisonOperator.java   | 219 ---------
 .../sis/filter/AbstractBinaryExpression.java       | 116 -----
 .../apache/sis/filter/AbstractBinaryOperator.java  | 114 -----
 .../sis/filter/AbstractComparisonOperator.java     | 114 -----
 .../org/apache/sis/filter/AbstractExpression.java  | 102 -----
 .../apache/sis/filter/AbstractUnaryOperator.java   |  94 ----
 .../org/apache/sis/filter/ArithmeticFunction.java  | 252 ++++++++++
 .../java/org/apache/sis/filter/BinaryFunction.java | 186 ++++++++
 .../org/apache/sis/filter/ComparisonFunction.java  | 508 +++++++++++++++++++++
 .../java/org/apache/sis/filter/DefaultAdd.java     |  80 ----
 .../java/org/apache/sis/filter/DefaultAnd.java     | 101 ----
 .../java/org/apache/sis/filter/DefaultDivide.java  |  80 ----
 .../org/apache/sis/filter/DefaultFeatureId.java    |  92 ----
 .../apache/sis/filter/DefaultFilterFactory.java    | 194 ++++----
 .../main/java/org/apache/sis/filter/DefaultId.java | 131 ------
 .../java/org/apache/sis/filter/DefaultLiteral.java | 148 ------
 .../org/apache/sis/filter/DefaultMultiply.java     |  80 ----
 .../java/org/apache/sis/filter/DefaultNot.java     |  91 ----
 .../org/apache/sis/filter/DefaultObjectId.java     | 111 +++++
 .../main/java/org/apache/sis/filter/DefaultOr.java | 101 ----
 .../sis/filter/DefaultPropertyIsEqualTo.java       |  96 ----
 .../sis/filter/DefaultPropertyIsGreaterThan.java   |  64 ---
 .../DefaultPropertyIsGreaterThanOrEqualTo.java     |  64 ---
 .../sis/filter/DefaultPropertyIsLessThan.java      |  64 ---
 .../filter/DefaultPropertyIsLessThanOrEqualTo.java |  64 ---
 .../apache/sis/filter/DefaultPropertyIsLike.java   |  93 ----
 .../apache/sis/filter/DefaultPropertyIsNull.java   |  73 ---
 .../org/apache/sis/filter/DefaultPropertyName.java | 156 -------
 .../org/apache/sis/filter/DefaultSubtract.java     |  81 ----
 .../org/apache/sis/filter/FilterByIdentifier.java  | 136 ++++++
 .../java/org/apache/sis/filter/LeafExpression.java | 254 +++++++++++
 .../org/apache/sis/filter/LogicalFunction.java     | 158 +++++++
 .../src/main/java/org/apache/sis/filter/Node.java  | 171 +++++++
 .../java/org/apache/sis/filter/UnaryFunction.java  | 170 +++++++
 .../sis/internal/feature/FeatureExpression.java    |   2 +-
 .../apache/sis/filter/ArithmeticFunctionTest.java  |  80 ++++
 .../java/org/apache/sis/filter/DefaultAddTest.java |  63 ---
 .../java/org/apache/sis/filter/DefaultAndTest.java | 104 -----
 .../org/apache/sis/filter/DefaultDivideTest.java   |  63 ---
 .../org/apache/sis/filter/DefaultLiteralTest.java  |  74 ---
 .../org/apache/sis/filter/DefaultMultiplyTest.java |  63 ---
 .../java/org/apache/sis/filter/DefaultNotTest.java |  79 ----
 ...FeatureIdTest.java => DefaultObjectIdTest.java} |  66 +--
 .../java/org/apache/sis/filter/DefaultOrTest.java  | 104 -----
 .../apache/sis/filter/DefaultPropertyNameTest.java |  80 ----
 .../org/apache/sis/filter/DefaultSubtractTest.java |  63 ---
 ...aultIdTest.java => FilterByIdentifierTest.java} |  33 +-
 .../org/apache/sis/filter/LeafExpressionTest.java  | 123 +++++
 .../org/apache/sis/filter/LogicalFunctionTest.java | 146 ++++++
 .../org/apache/sis/filter/UnaryFunctionTest.java   |  76 +++
 .../apache/sis/test/suite/FeatureTestSuite.java    |  17 +-
 .../sis/internal/converter/DateConverter.java      |  15 +-
 .../org/apache/sis/internal/system/Loggers.java    |   7 +-
 53 files changed, 2542 insertions(+), 3274 deletions(-)
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractBinaryComparisonOperator.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractBinaryExpression.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractBinaryOperator.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractComparisonOperator.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractExpression.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/AbstractUnaryOperator.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/ArithmeticFunction.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/BinaryFunction.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/ComparisonFunction.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultAdd.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultAnd.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultDivide.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultFeatureId.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultId.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultLiteral.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultMultiply.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultNot.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultObjectId.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultOr.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsEqualTo.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsGreaterThan.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsGreaterThanOrEqualTo.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsLessThan.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsLessThanOrEqualTo.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsLike.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyIsNull.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultPropertyName.java
 delete mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/DefaultSubtract.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/FilterByIdentifier.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/LeafExpression.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/LogicalFunction.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/Node.java
 create mode 100644 core/sis-feature/src/main/java/org/apache/sis/filter/UnaryFunction.java
 create mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/ArithmeticFunctionTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultAddTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultAndTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultDivideTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultLiteralTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultMultiplyTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultNotTest.java
 rename core/sis-feature/src/test/java/org/apache/sis/filter/{DefaultFeatureIdTest.java =>
DefaultObjectIdTest.java} (62%)
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultOrTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultPropertyNameTest.java
 delete mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/DefaultSubtractTest.java
 rename core/sis-feature/src/test/java/org/apache/sis/filter/{DefaultIdTest.java => FilterByIdentifierTest.java}
(75%)
 create mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/LeafExpressionTest.java
 create mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/LogicalFunctionTest.java
 create mode 100644 core/sis-feature/src/test/java/org/apache/sis/filter/UnaryFunctionTest.java


Mime
View raw message