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 d75cee37d2 Post-merge automatic reorganization of imports order.
d75cee37d2 is described below
commit d75cee37d2d94b625d8516b6309a408308d28311
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Thu Nov 27 10:26:25 2025 +0100
Post-merge automatic reorganization of imports order.
---
.../sis/feature/internal/shared/FeatureProjection.java | 2 +-
.../sis/feature/internal/shared/OperationView.java | 8 ++++----
.../main/org/apache/sis/filter/Capabilities.java | 16 ++++++++--------
.../main/org/apache/sis/filter/DefaultFilterFactory.java | 2 +-
.../main/org/apache/sis/filter/Optimization.java | 2 +-
.../main/org/apache/sis/filter/TemporalFilter.java | 2 +-
.../org/apache/sis/filter/sqlmm/FunctionDescription.java | 4 +++-
.../main/org/apache/sis/filter/sqlmm/SQLMM.java | 4 ++--
.../org/apache/sis/filter/visitor/FunctionNames.java | 4 +++-
.../feature/internal/shared/FeatureProjectionTest.java | 14 +++++++-------
.../wrapper/jts/PackedCoordinateSequenceTest.java | 2 +-
.../sis/referencing/factory/MultiAuthoritiesFactory.java | 2 +-
.../org/apache/sis/storage/sql/feature/Database.java | 4 +++-
.../apache/sis/storage/sql/feature/FeatureStream.java | 2 +-
.../sis/storage/sql/feature/SelectionClauseWriter.java | 2 +-
.../main/org/apache/sis/storage/base/PseudoResource.java | 2 +-
.../main/org/apache/sis/geometries/Geometries.java | 4 ++--
.../main/org/apache/sis/geometries/GeometryFactory.java | 2 +-
.../main/org/apache/sis/geometries/PointSequence.java | 2 +-
.../sis/geometries/csg/ConstructiveSolidGeometry.java | 1 +
.../sis/geometries/internal/shared/ArraySequence.java | 2 +-
.../org/apache/sis/geometries/mesh/MeshPrimitive.java | 4 ++--
.../sis/geometries/mesh/MeshPrimitiveComparator.java | 2 +-
.../apache/sis/geometries/mesh/MeshPrimitiveVisitor.java | 2 +-
.../sis/geometries/operation/GeometryOperations.java | 2 +-
.../geometries/operation/spatialanalysis2d/ISOLine.java | 2 +-
.../sis/geometries/processor/spatialedition/To3D.java | 4 ++--
.../geometries/processor/spatialedition/ToPrimitive.java | 2 +-
.../geometries/processor/spatialedition/Transform.java | 2 +-
.../sis/geometries/simplify/greedyinsert/TINBuilder.java | 2 +-
.../apache/sis/geometries/triangulate/EarClipping.java | 2 +-
.../sis/geometries/triangulate/delaunay/Delaunay.java | 2 +-
.../test/org/apache/sis/geometries/TriangleTest.java | 2 +-
.../geometries/internal/shared/ArraySequenceTest.java | 2 +-
.../apache/sis/geometries/mesh/PrimitiveIndexesTest.java | 2 +-
.../sis/geometries/operation/SutherlandHogmanTest.java | 2 +-
.../processor/spatialanalysis2d/IntersectionTest.java | 2 +-
.../processor/spatialedition/ToPrimitiveTest.java | 2 +-
.../geometries/triangulate/delaunay/DelaunayTest.java | 2 +-
.../triangulate/delaunay/OrientedEdgeTest.java | 2 +-
.../org/apache/sis/storage/shapefile/ShapefileStore.java | 2 +-
41 files changed, 67 insertions(+), 60 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
index 3d6dbc3552..297d4257f5 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java
@@ -29,9 +29,9 @@ import java.util.function.UnaryOperator;
import org.opengis.util.GenericName;
import org.apache.sis.util.Debug;
import org.apache.sis.util.ArraysExt;
+import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.pending.jdk.Record;
import org.apache.sis.pending.jdk.JDK19;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java
index ddbeebe36b..3fbaa29f5e 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java
@@ -16,24 +16,24 @@
*/
package org.apache.sis.feature.internal.shared;
-import java.util.Optional;
-import java.io.Serializable;
import org.opengis.util.GenericName;
-import org.opengis.util.InternationalString;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.feature.AbstractOperation;
import org.apache.sis.feature.DefaultFeatureType;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.util.Deprecable;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
+import java.io.Serializable;
+import org.opengis.util.InternationalString;
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureOperationException;
import org.opengis.feature.IdentifiedType;
import org.opengis.feature.Operation;
import org.opengis.feature.Property;
import org.opengis.feature.PropertyNotFoundException;
+import org.apache.sis.util.Deprecable;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
index edf21afb88..1ea516ee5d 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Capabilities.java
@@ -16,26 +16,23 @@
*/
package org.apache.sis.filter;
-import java.util.Map;
-import java.util.Set;
-import java.util.Collection;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Spliterator;
import java.util.ServiceLoader;
-import java.util.Optional;
-import org.opengis.util.LocalName;
import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.collection.CodeListSet;
-import org.apache.sis.util.internal.shared.AbstractMap;
import org.apache.sis.referencing.internal.shared.LazySet;
-import org.apache.sis.feature.internal.shared.AttributeConvention;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.filter.sqlmm.Registry;
import org.apache.sis.system.Reflect;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Map;
+import java.util.Set;
+import java.util.Collection;
+import java.util.Optional;
+import org.opengis.util.LocalName;
import org.opengis.filter.Expression;
import org.opengis.filter.ComparisonOperatorName;
import org.opengis.filter.capability.Conformance;
@@ -45,6 +42,9 @@ import org.opengis.filter.capability.FilterCapabilities;
import org.opengis.filter.capability.ScalarCapabilities;
import org.opengis.filter.capability.SpatialCapabilities;
import org.opengis.filter.capability.TemporalCapabilities;
+import org.apache.sis.util.collection.CodeListSet;
+import org.apache.sis.util.internal.shared.AbstractMap;
+import org.apache.sis.feature.internal.shared.AttributeConvention;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
index 9afd590393..b25e35aa0e 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
@@ -30,6 +30,7 @@ import org.apache.sis.filter.base.UnaryFunction;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.AbstractFactory;
import org.apache.sis.util.resources.Errors;
+import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.internal.shared.LazyCandidate;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
@@ -37,7 +38,6 @@ import java.time.Instant;
import org.opengis.filter.*;
import org.opengis.feature.Feature;
import org.opengis.filter.capability.FilterCapabilities;
-import org.apache.sis.util.internal.shared.Strings;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
index 014a1b26b0..8e8e96667b 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
@@ -23,13 +23,13 @@ import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.ConcurrentModificationException;
import java.util.function.Predicate;
-import org.opengis.util.CodeList;
import org.apache.sis.math.FunctionProperty;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.filter.base.Node;
import org.apache.sis.util.internal.shared.CollectionsExt;
// 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.Literal;
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
index 70f5b43df8..a1cabfcc7b 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/TemporalFilter.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.filter;
-import org.apache.sis.filter.base.BinaryFunction;
import java.time.DateTimeException;
+import org.apache.sis.filter.base.BinaryFunction;
import org.apache.sis.util.Classes;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.temporal.TimeMethods;
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
index 78c8aaf0a3..94825bd148 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionDescription.java
@@ -23,7 +23,6 @@ import org.opengis.util.TypeName;
import org.opengis.util.LocalName;
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterDescriptor;
-import org.opengis.filter.capability.AvailableFunction;
import org.apache.sis.pending.jdk.Record;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
@@ -34,6 +33,9 @@ import org.apache.sis.metadata.simple.SimpleIdentifiedObject;
import org.apache.sis.parameter.DefaultParameterValue;
import org.apache.sis.referencing.NamedIdentifier;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.filter.capability.AvailableFunction;
+
/**
* Description of a <abbr>SQLMM</abbr> function with its parameters.
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
index 95ff407e76..8ba60b51ae 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/SQLMM.java
@@ -16,19 +16,19 @@
*/
package org.apache.sis.filter.sqlmm;
-import java.util.EnumMap;
import java.util.Optional;
import javax.measure.Quantity;
import org.opengis.geometry.Envelope;
-import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.filter.visitor.FunctionIdentifier;
import static org.apache.sis.geometry.wrapper.GeometryType.*;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.EnumMap;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.capability.AvailableFunction;
+import org.apache.sis.setup.GeometryLibrary;
/**
diff --git
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/visitor/FunctionNames.java
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/visitor/FunctionNames.java
index 74d073f832..e2c5d6b89b 100644
---
a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/visitor/FunctionNames.java
+++
b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/visitor/FunctionNames.java
@@ -16,10 +16,12 @@
*/
package org.apache.sis.filter.visitor;
-import org.opengis.util.CodeList;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.filter.sqlmm.SQLMM;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.util.CodeList;
+
/**
* Names of some filters and expressions used in Apache <abbr>SIS</abbr>.
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java
index d2d84de843..2d58afe83e 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java
@@ -23,13 +23,6 @@ import org.apache.sis.util.iso.Names;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
-// 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.AttributeType;
-import org.opengis.feature.Operation;
-import org.opengis.filter.FilterFactory;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@@ -37,6 +30,13 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.apache.sis.test.Assertions.assertSetEquals;
import org.apache.sis.test.TestCase;
+// 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.AttributeType;
+import org.opengis.feature.Operation;
+import org.opengis.filter.FilterFactory;
+
/**
* Tests {@link FeatureProjection} and {@link FeatureProjectionBuilder}.
diff --git
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/PackedCoordinateSequenceTest.java
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/PackedCoordinateSequenceTest.java
index 87199f5409..0992d502f4 100644
---
a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/PackedCoordinateSequenceTest.java
+++
b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/PackedCoordinateSequenceTest.java
@@ -17,12 +17,12 @@
package org.apache.sis.geometry.wrapper.jts;
import java.util.function.DoubleFunction;
+import static java.lang.Double.NaN;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateXY;
import org.locationtech.jts.geom.CoordinateXYM;
import org.locationtech.jts.geom.CoordinateXYZM;
import org.locationtech.jts.geom.CoordinateSequence;
-import static java.lang.Double.NaN;
// Test dependencies
import org.junit.jupiter.api.Test;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
index fcdfa5282c..e4cc8667e6 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
@@ -58,6 +58,7 @@ import org.apache.sis.util.internal.shared.AbstractIterator;
import org.apache.sis.util.internal.shared.DefinitionURI;
import org.apache.sis.util.internal.shared.CollectionsExt;
import org.apache.sis.util.collection.SetOfUnknownSize;
+import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.metadata.internal.shared.NameMeaning;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.IdentifiedObjects;
@@ -68,7 +69,6 @@ import
org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.collection.BackingStoreException;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.Identifier;
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 43a30133fa..532294129a 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
@@ -67,8 +67,10 @@ import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
import org.apache.sis.util.resources.Vocabulary;
-import org.opengis.filter.ValueReference;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.CodeList;
+import org.opengis.filter.ValueReference;
/**
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 bdc5cb16a6..77e62ca76a 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
@@ -32,13 +32,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import org.apache.sis.filter.Optimization;
+import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.base.SortByComparator;
import org.apache.sis.metadata.sql.internal.shared.SQLBuilder;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.stream.DeferredStream;
import org.apache.sis.util.stream.PaginedStream;
-import org.apache.sis.storage.DataStoreException;
import org.apache.sis.feature.internal.shared.FeatureProjection;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
index 04982ee265..750d6e6095 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
@@ -27,7 +27,6 @@ import java.sql.DatabaseMetaData;
import java.sql.JDBCType;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.sis.filter.base.XPathSource;
import org.apache.sis.filter.visitor.FunctionIdentifier;
import org.apache.sis.filter.visitor.FunctionNames;
import org.apache.sis.filter.visitor.Visitor;
@@ -47,6 +46,7 @@ import org.opengis.filter.BinaryComparisonOperator;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.BetweenComparisonOperator;
import org.opengis.filter.ResourceId;
+import org.apache.sis.filter.base.XPathSource;
/**
diff --git
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/PseudoResource.java
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/PseudoResource.java
index 145edfcd84..90520002b3 100644
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/PseudoResource.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/PseudoResource.java
@@ -17,10 +17,10 @@
package org.apache.sis.storage.base;
import java.util.Locale;
+import org.opengis.metadata.Metadata;
import org.apache.sis.storage.AbstractResource;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.util.Localized;
-import org.opengis.metadata.Metadata;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
index c5eb00aed0..42d95d729a 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
@@ -50,6 +50,8 @@ import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometries.math.Cursor;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.internal.shared.ArraySequence;
@@ -66,8 +68,6 @@ import
org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
index 14f4dd5ff1..5bdc74bfcf 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
@@ -26,6 +26,7 @@ import org.apache.sis.geometries.conics.Circle;
import org.apache.sis.geometries.conics.CircularString;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.internal.shared.ArraySequence;
import org.apache.sis.geometries.internal.shared.DefaultGeometryCollection;
import org.apache.sis.geometries.internal.shared.DefaultLineString;
@@ -43,7 +44,6 @@ import org.apache.sis.geometry.wrapper.Dimensions;
import org.apache.sis.geometry.wrapper.GeometryType;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.setup.GeometryLibrary;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
index 16e6775607..e2d93fbabb 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
@@ -22,8 +22,8 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometries.math.Array;
+import org.apache.sis.geometry.GeneralEnvelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/csg/ConstructiveSolidGeometry.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/csg/ConstructiveSolidGeometry.java
index f1f6718131..f7076cae57 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/csg/ConstructiveSolidGeometry.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/csg/ConstructiveSolidGeometry.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.csg;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArraySequence.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArraySequence.java
index e157652bb4..ebeed0c9df 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArraySequence.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArraySequence.java
@@ -31,9 +31,9 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.math.Cursor;
import org.apache.sis.geometries.math.Array;
+import org.apache.sis.util.ArgumentChecks;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
index e9f528b17f..ec0fc12baa 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
@@ -54,12 +54,12 @@ import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vector1D;
import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometries.math.Cursor;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.internal.shared.UnmodifiableArrayList;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
index e5ba7dd09a..5b6170323e 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
@@ -28,8 +28,8 @@ import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.referencing.CRS;
import org.apache.sis.geometries.math.Array;
+import org.apache.sis.referencing.CRS;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
index 8115dd672e..77954297f4 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
@@ -24,9 +24,9 @@ import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.math.NDArrays;
-import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.geometries.math.Cursor;
import org.apache.sis.geometries.math.Array;
+import org.apache.sis.util.ArgumentChecks;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
index 2a5c8fb1af..f58fbc0f36 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
@@ -43,6 +43,7 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.operation.spatialanalysis2d.Buffer;
@@ -68,7 +69,6 @@ import
org.apache.sis.geometries.operation.spatialrelations2d.Relate;
import org.apache.sis.geometries.operation.spatialrelations2d.Touches;
import org.apache.sis.geometries.operation.spatialrelations2d.Within;
import org.apache.sis.geometries.processor.Processor;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
index 19dceae565..a2d2e67c48 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
@@ -31,9 +31,9 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
index ff17b14926..d344ebb26f 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
@@ -27,13 +27,13 @@ import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Cursor;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.internal.shared.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.geometries.math.Cursor;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
index b58421c28a..cfb7487153 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
@@ -23,12 +23,12 @@ import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.internal.shared.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.geometries.triangulate.EarClipping;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
index 6a05d17237..1254da8a7e 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
@@ -29,12 +29,12 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.internal.shared.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
index 1bb0d38650..73c1f4b690 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
@@ -36,10 +36,10 @@ import org.apache.sis.geometries.Triangle;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
index 35ab254c8d..b4b5cf3195 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
@@ -28,10 +28,10 @@ import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector2D;
+import org.apache.sis.geometries.math.Array;
import static org.apache.sis.geometries.math.Vectors.*;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
index e8562fa0e9..faf3a19b63 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
@@ -32,10 +32,10 @@ import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
index 3552d5d4d7..4ad61def8d 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
@@ -17,12 +17,12 @@
package org.apache.sis.geometries;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
index 68e5965b53..5aa6f6cd57 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/internal/shared/ArraySequenceTest.java
@@ -25,12 +25,12 @@ import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector2D;
import org.apache.sis.geometries.math.Vector3D;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
index b870ffa827..bf73abe666 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
@@ -22,11 +22,11 @@ import java.util.List;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveIndexes;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
index d79cc7c68d..3630bf791a 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
@@ -20,11 +20,11 @@ import java.util.List;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.NDArrays;
import org.apache.sis.geometries.math.Vector2D;
+import org.apache.sis.geometries.math.Array;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
index b1fcbb39cb..11cb41282c 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
@@ -20,13 +20,13 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
index 54dd884a3c..0618cf31f8 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
@@ -30,13 +30,13 @@ import org.apache.sis.geometries.Polygon;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
index 8a16d2671b..cfe9104c2c 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
@@ -20,11 +20,11 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveComparator;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
index ad51516ae1..69fb59e600 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
@@ -21,12 +21,12 @@ import
org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.math.NDArrays;
+import org.apache.sis.geometries.math.Array;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.geometries.math.Array;
/**
diff --git
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
index 6fec90354d..2f7f9f5e87 100644
---
a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
+++
b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
@@ -113,6 +113,7 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Classes;
import org.apache.sis.util.Utilities;
import org.apache.sis.util.collection.BackingStoreException;
+import org.apache.sis.storage.base.WarningAdapter;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.util.CodeList;
@@ -128,7 +129,6 @@ import org.opengis.filter.LogicalOperatorName;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.ValueReference;
import org.apache.sis.geometry.wrapper.*;
-import org.apache.sis.storage.base.WarningAdapter;
/**
