This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit ac4ad3f36a17457e51dce01a35a5a2ad5645ac39
Merge: 9b56572ba1 3e609d464e
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Apr 7 18:54:55 2025 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/filter/internal/Node.java | 2 +-
.../main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../main/org/apache/sis/storage/sql/feature/Database.java | 4 ++--
.../main/org/apache/sis/storage/sql/feature/FeatureStream.java | 4 ++--
.../main/org/apache/sis/storage/sql/feature/SelectionClause.java | 2 +-
.../test/org/apache/sis/storage/sql/postgis/PostgresTest.java | 2 +-
.../main/org/apache/sis/storage/base/FeatureProjection.java | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --cc
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
index a5e5c9dbac,77db061c20..db5eb5d5d4
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
@@@ -39,10 -39,11 +39,10 @@@ import org.apache.sis.system.Modules
import org.apache.sis.util.Utilities;
import org.apache.sis.util.Workaround;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.CodeList;
-import org.opengis.feature.Feature;
-import org.opengis.filter.Filter;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
- import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.filter.Filter;
++import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/FeatureProjection.java
index f31860f74d,5a25571e28..973d979cb4
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/FeatureProjection.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/FeatureProjection.java
@@@ -22,7 -22,8 +22,8 @@@ import java.util.Set
import java.util.ConcurrentModificationException;
import java.util.function.UnaryOperator;
import org.opengis.util.GenericName;
-import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.FeatureOperations;
++import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.feature.builder.PropertyTypeBuilder;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
@@@ -37,12 -38,13 +38,11 @@@ import org.apache.sis.util.logging.Logg
import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.resources.Vocabulary;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyNotFoundException;
-import org.opengis.filter.InvalidFilterValueException;
-import org.opengis.filter.Expression;
-import org.opengis.filter.ValueReference;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
- import org.apache.sis.feature.AbstractOperation;
+import org.apache.sis.filter.Expression;
+import org.apache.sis.pending.geoapi.filter.ValueReference;
/**
