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 8d1d6522c4 Merge branch 'geoapi-4.0' into geoapi-3.1.
add eef1a6a166 Replace the `<? super R>` parameterized type by `<R>` in
filters and expressions. It is less generic, but the reason is because
expressions and filters are often chained. Following a chain of filters become
difficult if, when asking parameters of parameters, the `<? super R>` type
become a kind of `<? super ? super R>` type, which cannot be represented in the
Java language and is reported by the compiler as `<? super #CAP1>`. Experience
with implementation shows that i [...]
add 92777dd94e Bug fix in the computation of image bounds by
`ImageCombiner`. Workaround for `BufferedImage.setData(…)` bug, which does not
handle float and double types correctly.
add 26a0f263d2 Implement the `getResourceClass()` method added in `Filter`
and `Expression` interfaces. That method make possible to determine whether
some optimizations are allowed or not.
add cb0796b495 Remove the `FilterNode` class, replaced by default
implementation of `Optimization.OnFilter` methods.
new 7d712579ff Merge branch 'geoapi-4.0' into geoapi-3.1. Contains
parameterized type change in Filter and Expression for more type safety.
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:
.../src/main/java/org/apache/sis/cql/CQL.java | 34 ++---
.../org/apache/sis/cql/FilterToCQLVisitor.java | 30 ++--
.../apache/sis/feature/ExpressionOperation.java | 26 ++--
.../org/apache/sis/feature/FeatureOperations.java | 6 +-
.../org/apache/sis/filter/ArithmeticFunction.java | 30 ++--
.../org/apache/sis/filter/AssociationValue.java | 10 +-
.../java/org/apache/sis/filter/BinaryFunction.java | 25 ++-
.../apache/sis/filter/BinaryGeometryFilter.java | 71 +++++----
.../org/apache/sis/filter/BinarySpatialFilter.java | 16 +-
.../org/apache/sis/filter/ComparisonFilter.java | 83 +++++-----
.../org/apache/sis/filter/ConvertFunction.java | 10 +-
.../apache/sis/filter/DefaultFilterFactory.java | 170 ++++++++++-----------
.../org/apache/sis/filter/DefaultSortProperty.java | 8 +-
.../java/org/apache/sis/filter/DistanceFilter.java | 18 +--
.../java/org/apache/sis/filter/FilterNode.java | 89 -----------
.../org/apache/sis/filter/IdentifierFilter.java | 32 +++-
.../java/org/apache/sis/filter/LeafExpression.java | 6 +-
.../java/org/apache/sis/filter/LikeFilter.java | 23 ++-
.../java/org/apache/sis/filter/LogicalFilter.java | 78 ++++++----
.../java/org/apache/sis/filter/Optimization.java | 99 ++++++------
.../java/org/apache/sis/filter/PropertyValue.java | 12 +-
.../java/org/apache/sis/filter/TemporalFilter.java | 90 +++++------
.../java/org/apache/sis/filter/UnaryFunction.java | 28 ++--
.../java/org/apache/sis/filter/package-info.java | 2 +-
.../java/org/apache/sis/image/ImageCombiner.java | 11 +-
.../java/org/apache/sis/image/ImageProcessor.java | 6 +-
.../sis/internal/coverage/j2d/ObservableImage.java | 5 +-
.../apache/sis/internal/filter/CopyVisitor.java | 44 +++---
.../sis/internal/filter/FunctionRegister.java | 4 +-
.../sis/internal/filter/GeometryConverter.java | 18 ++-
.../java/org/apache/sis/internal/filter/Node.java | 24 ++-
.../sis/internal/filter/SortByComparator.java | 8 +-
.../org/apache/sis/internal/filter/Visitor.java | 21 +--
.../internal/filter/sqlmm/FunctionWithSRID.java | 15 +-
.../internal/filter/sqlmm/GeometryConstructor.java | 18 ++-
.../sis/internal/filter/sqlmm/GeometryParser.java | 6 +-
.../sis/internal/filter/sqlmm/OneGeometry.java | 36 +++--
.../apache/sis/internal/filter/sqlmm/Registry.java | 4 +-
.../sis/internal/filter/sqlmm/ST_FromBinary.java | 6 +-
.../sis/internal/filter/sqlmm/ST_FromText.java | 6 +-
.../apache/sis/internal/filter/sqlmm/ST_Point.java | 22 ++-
.../sis/internal/filter/sqlmm/ST_Transform.java | 18 ++-
.../sis/internal/filter/sqlmm/SpatialFunction.java | 2 +-
.../sis/internal/filter/sqlmm/TwoGeometries.java | 40 +++--
.../sis/internal/filter/sqlmm/package-info.java | 2 +-
.../sis/filter/BinarySpatialFilterTestCase.java | 6 +-
.../apache/sis/filter/IdentifierFilterTest.java | 4 +-
.../org/apache/sis/filter/LeafExpressionTest.java | 3 +-
.../org/apache/sis/filter/LogicalFilterTest.java | 27 +++-
.../org/apache/sis/filter/TemporalFilterTest.java | 4 +-
.../sis/internal/filter/FilterFactoryMock.java | 160 +++++++++----------
.../apache/sis/internal/filter/FunctionMock.java | 14 +-
.../sis/internal/filter/FunctionNamesTest.java | 2 +
.../sis/internal/filter/ValueReferenceMock.java | 8 +
.../internal/filter/sqlmm/RegistryTestCase.java | 4 +-
.../org/apache/sis/internal/map/SEPortrayer.java | 8 +-
.../sis/internal/sql/feature/FeatureStream.java | 2 +-
.../sql/feature/SelectionClauseWriter.java | 17 +--
.../sql/feature/SelectionClauseWriterTest.java | 4 +-
.../java/org/apache/sis/storage/FeatureQuery.java | 24 +--
.../java/org/apache/sis/storage/FeatureSubset.java | 4 +-
.../sis/storage/aggregate/JoinFeatureSet.java | 8 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 25 +--
63 files changed, 893 insertions(+), 743 deletions(-)
delete mode 100644
core/sis-feature/src/main/java/org/apache/sis/filter/FilterNode.java
