This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 1b0454313171c1d4d409661a997c78eeeaf0b0a1 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Jul 17 18:06:26 2026 +0200 Remove the use of an internal interface from public API. --- .../main/org/apache/sis/coverage/grid/GridCoordinatesView.java | 2 +- .../main/org/apache/sis/storage/aggregate/JoinFeatureSet.java | 9 +++++---- .../main/org/apache/sis/storage/aggregate/package-info.java | 2 +- .../main/org/apache/sis/gui/dataset/ExpandedFeature.java | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoordinatesView.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoordinatesView.java index d8e064a5e4..dc41863ac2 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoordinatesView.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoordinatesView.java @@ -71,7 +71,7 @@ final class GridCoordinatesView { return coordinates[offset + Objects.checkIndex(index, getDimension())]; } - /** + /* * Do not allow modification of grid coordinates since they are backed by {@link GridExtent}. */ // public void setCoordinateValue(final int index, long value) { diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java index de3c2152ea..49b14c55ae 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/JoinFeatureSet.java @@ -68,7 +68,7 @@ import org.apache.sis.pending.geoapi.filter.BinaryComparisonOperator; * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.6 + * @version 1.7 * @since 1.0 */ public class JoinFeatureSet extends AggregatedFeatureSet { @@ -175,7 +175,7 @@ public class JoinFeatureSet extends AggregatedFeatureSet { * This condition specifies also if the comparison is {@linkplain BinaryComparisonOperator#isMatchingCase() case * sensitive} and {@linkplain BinaryComparisonOperator#getMatchAction() how to compare multi-values}. */ - public final BinaryComparisonOperator<AbstractFeature> condition; + private final BinaryComparisonOperator<AbstractFeature> condition; /** * The factory to use for creating {@code Query} expressions for retrieving subsets of feature sets. @@ -208,7 +208,8 @@ public class JoinFeatureSet extends AggregatedFeatureSet { public JoinFeatureSet(final Resource parent, final FeatureSet left, String leftAlias, final FeatureSet right, String rightAlias, - final Type joinType, final BinaryComparisonOperator<AbstractFeature> condition, + final Type joinType, + final Filter<AbstractFeature> condition, Map<String,?> featureInfo) throws DataStoreException { @@ -225,7 +226,7 @@ public class JoinFeatureSet extends AggregatedFeatureSet { this.rightName = rightAlias; this.swapSides = joinType.swapSides; this.isOuterJoin = joinType.isOuterJoin; - this.condition = condition; + this.condition = (BinaryComparisonOperator<AbstractFeature>) condition; this.factory = DefaultFilterFactory.forFeatures(); /* * We could build the FeatureType only when first needed, but the type is required by the iterators. diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java index fa46716426..86340d39db 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/package-info.java @@ -22,7 +22,7 @@ * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) - * @version 1.6 + * @version 1.7 * @since 1.3 */ package org.apache.sis.storage.aggregate; diff --git a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandedFeature.java b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandedFeature.java index 89eeadfe75..40d3e9dcfd 100644 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandedFeature.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ExpandedFeature.java @@ -35,6 +35,7 @@ import org.apache.sis.feature.DefaultFeatureType; * * @author Martin Desruisseaux (Geomatys) */ +@SuppressWarnings("serial") final class ExpandedFeature extends AbstractFeature { /** * The array for properties having no value.
