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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 2d528ffbea Post-merge automatic reorganization of imports order.
2d528ffbea is described below
commit 2d528ffbeada237cc164509cd3a12ccac9d126ed
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Apr 7 18:44:19 2025 +0200
Post-merge automatic reorganization of imports order.
---
.../main/org/apache/sis/filter/internal/Node.java | 2 +-
.../main/org/apache/sis/filter/privy/WarningEvent.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/duckdb/ExtendedClauseWriter.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 +-
.../test/org/apache/sis/cql/ExpressionReadingTest.java | 2 +-
.../test/org/apache/sis/cql/ExpressionWritingTest.java | 2 +-
11 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
index 8afbdfd5d0..ba1ae0bdda 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
@@ -22,9 +22,9 @@ import java.util.IdentityHashMap;
import java.util.Collection;
import java.util.Collections;
import java.util.function.Predicate;
+import java.util.function.Consumer;
import java.util.logging.Logger;
import java.io.Serializable;
-import java.util.function.Consumer;
import org.opengis.util.CodeList;
import org.opengis.util.LocalName;
import org.opengis.util.ScopedName;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
index 09a6f891d5..edba134a81 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/privy/WarningEvent.java
@@ -18,11 +18,11 @@ package org.apache.sis.filter.privy;
import java.util.Optional;
import java.util.function.Consumer;
-import org.opengis.util.CodeList;
import org.opengis.util.ScopedName;
import org.apache.sis.filter.internal.Node;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.util.CodeList;
import org.opengis.filter.Filter;
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
index c6ade06582..ab0ac8cd31 100644
---
a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
+++
b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java
@@ -53,6 +53,7 @@ import org.opengis.referencing.operation.TransformException;
import org.opengis.parameter.GeneralParameterValue;
import org.opengis.parameter.ParameterValue;
import org.apache.sis.measure.Units;
+import org.apache.sis.measure.Longitude;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.privy.Strings;
@@ -80,7 +81,6 @@ import org.apache.sis.storage.geotiff.base.Resources;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.math.MathFunctions;
-import org.apache.sis.measure.Longitude;
import org.apache.sis.pending.jdk.JDK15;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
index 8b7c08cc6f..7b997b63d4 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
@@ -52,11 +52,11 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Exceptions;
import org.apache.sis.util.CharSequences;
+import org.apache.sis.util.Version;
import org.apache.sis.util.iso.Names;
import org.apache.sis.util.privy.Strings;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.setup.OptionKey;
-import org.apache.sis.util.Version;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/duckdb/ExtendedClauseWriter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/duckdb/ExtendedClauseWriter.java
index a6232bda80..e19880fcdc 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/duckdb/ExtendedClauseWriter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/duckdb/ExtendedClauseWriter.java
@@ -17,6 +17,8 @@
package org.apache.sis.storage.sql.duckdb;
import org.apache.sis.storage.sql.feature.SelectionClauseWriter;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.SpatialOperatorName;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
index 940afb0440..ee585a3dfc 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
@@ -24,6 +24,7 @@ import java.util.WeakHashMap;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Optional;
+import java.util.Collections;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.concurrent.locks.ReadWriteLock;
@@ -34,12 +35,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.Types;
-import java.util.Collections;
import javax.sql.DataSource;
import org.opengis.util.GenericName;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.metadata.spatial.SpatialRepresentationType;
+import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.metadata.sql.privy.Syntax;
import org.apache.sis.metadata.sql.privy.Dialect;
import org.apache.sis.metadata.sql.privy.Reflection;
@@ -62,7 +63,6 @@ import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.resources.Vocabulary;
-import org.opengis.metadata.citation.PresentationForm;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
index c2a226c459..d2a5b14106 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
@@ -33,13 +33,13 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.apache.sis.filter.Optimization;
import org.apache.sis.filter.privy.ListingPropertyVisitor;
+import org.apache.sis.filter.privy.SortByComparator;
+import org.apache.sis.filter.privy.WarningEvent;
import org.apache.sis.metadata.sql.privy.SQLBuilder;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.stream.DeferredStream;
import org.apache.sis.util.stream.PaginedStream;
-import org.apache.sis.filter.privy.SortByComparator;
-import org.apache.sis.filter.privy.WarningEvent;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.base.FeatureProjection;
diff --git
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
index aa0d7a92ab..c94c5e4de6 100644
---
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
@@ -25,7 +25,6 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.function.Consumer;
import java.sql.Connection;
-import org.opengis.util.CodeList;
import org.opengis.geometry.Envelope;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -41,6 +40,7 @@ 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;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
index f9ed98cc6b..0ee3a909d0 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
@@ -43,6 +43,7 @@ import org.apache.sis.setup.OptionKey;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.storage.StorageConnector;
+import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.sql.SQLStore;
import org.apache.sis.storage.sql.SQLStoreProvider;
import org.apache.sis.storage.sql.SimpleFeatureStore;
@@ -50,7 +51,6 @@ import org.apache.sis.storage.sql.ResourceDefinition;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.io.stream.ChannelDataInput;
-import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.sql.feature.BinaryEncoding;
import org.apache.sis.geometry.wrapper.jts.JTS;
import org.apache.sis.referencing.CommonCRS;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
index a510b64bd2..e8af013a94 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionReadingTest.java
@@ -19,8 +19,8 @@ package org.apache.sis.cql;
import java.time.Instant;
import java.time.Duration;
import java.time.Period;
-import java.text.ParseException;
import java.time.LocalDate;
+import java.text.ParseException;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAccessor;
import org.locationtech.jts.geom.Coordinate;
diff --git
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
index a180d6856d..9c1293d37a 100644
---
a/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
+++
b/incubator/src/org.apache.sis.cql/test/org/apache/sis/cql/ExpressionWritingTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.cql;
import java.time.Instant;
-import java.text.ParseException;
import java.time.LocalDate;
+import java.text.ParseException;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
