This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 7f9cbaea89 Post-merge reorganization of import statements.
7f9cbaea89 is described below
commit 7f9cbaea893ad2d46871c8eb973bbff6c0998519
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Nov 7 18:58:57 2026 +0100
Post-merge reorganization of import statements.
---
.../xml/bind/metadata/replace/ReferenceSystemMetadata.java | 2 +-
.../sis/style/se1/function/AbstractLookupFunction.java | 2 --
.../main/org/apache/sis/style/se1/function/Categorize.java | 2 --
.../main/org/apache/sis/style/se1/function/ChangeCase.java | 2 --
.../main/org/apache/sis/style/se1/function/Concatenate.java | 2 --
.../main/org/apache/sis/style/se1/function/FormatDate.java | 2 --
.../main/org/apache/sis/style/se1/function/FormatNumber.java | 2 --
.../main/org/apache/sis/style/se1/function/Interpolate.java | 2 --
.../main/org/apache/sis/style/se1/function/Recode.java | 2 --
.../main/org/apache/sis/style/se1/function/StringLength.java | 2 --
.../org/apache/sis/style/se1/function/StringPosition.java | 2 --
.../main/org/apache/sis/style/se1/function/Substring.java | 2 --
.../org/apache/sis/style/se1/function/SymbologyFunction.java | 6 ++----
.../apache/sis/style/se1/function/SymbologyFunctions.java | 6 ++----
.../main/org/apache/sis/style/se1/function/Trim.java | 2 --
.../test/org/apache/sis/style/se1/ColorMapTest.java | 8 +++++---
.../test/org/apache/sis/style/se1/ColorReplacementTest.java | 9 +++++----
.../org/apache/sis/style/se1/function/CategorizeTest.java | 12 +++++-------
.../sis/style/se1/function/FormattingFunctionsTest.java | 10 ++++------
.../org/apache/sis/style/se1/function/InterpolateTest.java | 12 +++++-------
.../test/org/apache/sis/style/se1/function/RecodeTest.java | 10 ++++------
.../main/org/apache/sis/referencing/CRS.java | 4 +++-
.../operation/CoordinateOperationRegistryTest.java | 2 +-
.../main/org/apache/sis/geometries/GeometryCollection.java | 1 +
.../geometries/internal/shared/DefaultOffsetLineString.java | 6 +++---
.../org/apache/sis/geometries/internal/shared/Vertex.java | 3 ++-
.../main/org/apache/sis/geometries/mesh/MeshPrimitive.java | 2 +-
.../apache/sis/geometries/operation/GeometryProcessor.java | 2 +-
.../main/org/apache/sis/maths/Sample.java | 1 +
.../main/org/apache/sis/maths/Vector1D.java | 1 +
.../main/org/apache/sis/maths/VectorAsDirectPosition.java | 1 +
.../operation/triangulate/delaunay/OrientedEdgeTest.java | 2 +-
.../storage/dggs/DiscreteGlobalGridCoverageProcessor.java | 2 +-
.../main/org/apache/sis/storage/rs/CodedDerivation.java | 2 +-
.../storage/rs/internal/shared/CompoundCodedResource.java | 6 +++---
35 files changed, 54 insertions(+), 80 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
index 85fd851038..3dd30b68f2 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.xml.bind.metadata.replace;
-import java.util.Optional;
import java.lang.reflect.Type;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.annotation.XmlType;
@@ -30,6 +29,7 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
import org.opengis.referencing.ReferenceSystemType;
import org.apache.sis.util.collection.Containers;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/AbstractLookupFunction.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/AbstractLookupFunction.java
index ff1bad4955..8450c70271 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/AbstractLookupFunction.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/AbstractLookupFunction.java
@@ -19,8 +19,6 @@ package org.apache.sis.style.se1.function;
import java.util.Optional;
import java.util.function.Function;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Categorize.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Categorize.java
index c3be4c80e9..648901b5df 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Categorize.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Categorize.java
@@ -20,8 +20,6 @@ package org.apache.sis.style.se1.function;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Function;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/ChangeCase.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/ChangeCase.java
index c2c1f2de3c..4c2b7f9605 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/ChangeCase.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/ChangeCase.java
@@ -19,8 +19,6 @@ package org.apache.sis.style.se1.function;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Concatenate.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Concatenate.java
index 89f127651e..6a98e2fcf4 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Concatenate.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Concatenate.java
@@ -17,8 +17,6 @@
package org.apache.sis.style.se1.function;
import java.util.List;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatDate.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatDate.java
index fdb8bc2be8..84a8e5f208 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatDate.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatDate.java
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatNumber.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatNumber.java
index 796e0824ea..14c0e5f035 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatNumber.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/FormatNumber.java
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Optional;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Interpolate.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Interpolate.java
index 546a1e79a4..dd2fce7d96 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Interpolate.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Interpolate.java
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Recode.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Recode.java
index 39e9ebabc5..2de02e3f09 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Recode.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Recode.java
@@ -25,8 +25,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringLength.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringLength.java
index 704591dba9..a299481b34 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringLength.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringLength.java
@@ -18,8 +18,6 @@ package org.apache.sis.style.se1.function;
import java.util.List;
import java.util.Objects;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringPosition.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringPosition.java
index 4bd4fd1214..79479b1064 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringPosition.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/StringPosition.java
@@ -18,8 +18,6 @@ package org.apache.sis.style.se1.function;
import java.util.List;
import java.util.Objects;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Substring.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Substring.java
index b667b6d327..097d9431cb 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Substring.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Substring.java
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunction.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunction.java
index 8836f944b4..2bb6a0d5b1 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunction.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunction.java
@@ -25,14 +25,12 @@ import java.util.Locale;
import java.util.Objects;
import org.opengis.util.LocalName;
import org.opengis.util.ScopedName;
+import org.opengis.filter.Expression;
+import org.opengis.filter.Literal;
import org.apache.sis.util.ObjectConverters;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.iso.Names;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.Expression;
-import org.opengis.filter.Literal;
-
/**
* Base class of the functions defined by Symbology Encoding.
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunctions.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunctions.java
index bc77fd80fb..fcb3526bfe 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunctions.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/SymbologyFunctions.java
@@ -22,13 +22,11 @@ import java.util.List;
import java.util.Set;
import org.opengis.util.LocalName;
import org.opengis.util.TypeName;
-import org.apache.sis.filter.FunctionRegister;
-import org.apache.sis.util.iso.Names;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
import org.opengis.filter.Literal;
import org.opengis.filter.capability.AvailableFunction;
+import org.apache.sis.filter.FunctionRegister;
+import org.apache.sis.util.iso.Names;
/**
diff --git
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Trim.java
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Trim.java
index 1236c113fe..aa04750408 100644
---
a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Trim.java
+++
b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/style/se1/function/Trim.java
@@ -19,8 +19,6 @@ package org.apache.sis.style.se1.function;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
-
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.filter.Expression;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorMapTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorMapTest.java
index 8084985996..ffc24e546a 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorMapTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorMapTest.java
@@ -17,12 +17,14 @@
package org.apache.sis.style.se1;
import java.awt.Color;
-import java.util.List;
-import org.apache.sis.style.se1.function.Categorize;
-import org.apache.sis.style.se1.function.Interpolate;
// Test dependencies
import org.junit.jupiter.api.Test;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.List;
+import org.apache.sis.style.se1.function.Categorize;
+import org.apache.sis.style.se1.function.Interpolate;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorReplacementTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorReplacementTest.java
index bbf91d1657..179f59f9b7 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorReplacementTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/ColorReplacementTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.style.se1;
+// Test dependencies
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.awt.Color;
import java.util.List;
import org.apache.sis.style.se1.function.Recode.MapItem;
import org.apache.sis.style.se1.function.Recode;
-// Test dependencies
-import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
-
/**
* Tests for {@link ColorReplacement}.
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/CategorizeTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/CategorizeTest.java
index ab7c516255..31285f5cec 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/CategorizeTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/CategorizeTest.java
@@ -18,6 +18,11 @@ package org.apache.sis.style.se1.function;
import java.awt.Color;
import java.util.List;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureType;
+import org.opengis.filter.Expression;
+import org.opengis.filter.FilterFactory;
+import org.opengis.filter.Literal;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
@@ -26,13 +31,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
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.filter.Expression;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.Literal;
-
/**
* Tests for {@link Categorize}.
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/FormattingFunctionsTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/FormattingFunctionsTest.java
index 85ef41d1f3..e46785ce4c 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/FormattingFunctionsTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/FormattingFunctionsTest.java
@@ -21,6 +21,10 @@ import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Date;
import java.util.List;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureType;
+import org.opengis.filter.Expression;
+import org.opengis.filter.FilterFactory;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
@@ -29,12 +33,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
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.filter.Expression;
-import org.opengis.filter.FilterFactory;
-
/**
* Tests the Symbology Encoding formatting functions: {@link FormatNumber},
{@link FormatDate}, {@link Substring},
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/InterpolateTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/InterpolateTest.java
index 8fa6cb10a8..359d2c3e33 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/InterpolateTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/InterpolateTest.java
@@ -19,6 +19,11 @@ package org.apache.sis.style.se1.function;
import java.awt.Color;
import java.util.List;
import java.util.Optional;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureType;
+import org.opengis.filter.Expression;
+import org.opengis.filter.FilterFactory;
+import org.opengis.filter.Literal;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
@@ -27,13 +32,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
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.filter.Expression;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.Literal;
-
/**
* Tests for {@link Interpolate} and {@link InterpolationPoint}.
diff --git
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/RecodeTest.java
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/RecodeTest.java
index 1fc0368b5f..74b04c3ac5 100644
---
a/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/RecodeTest.java
+++
b/endorsed/src/org.apache.sis.portrayal/test/org/apache/sis/style/se1/function/RecodeTest.java
@@ -18,6 +18,10 @@ package org.apache.sis.style.se1.function;
import java.awt.Color;
import java.util.List;
+import org.opengis.feature.Feature;
+import org.opengis.feature.FeatureType;
+import org.opengis.filter.Expression;
+import org.opengis.filter.FilterFactory;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
@@ -26,12 +30,6 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
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.filter.Expression;
-import org.opengis.filter.FilterFactory;
-
/**
* Tests for {@link Recode} and {@link MapItem}.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index bfa6a59116..0ab5dcaacd 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@ -96,11 +96,13 @@ import org.apache.sis.util.logging.Logging;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
-import org.opengis.referencing.crs.DerivedCRS;
import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.datum.DynamicReferenceFrame;
import org.opengis.coordinate.CoordinateMetadata;
+// Specific to the geoapi-4.0 branch:
+import org.opengis.referencing.crs.DerivedCRS;
+
/**
* Static methods working on Coordinate Reference System (<abbr>CRS</abbr>)
objects.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
index 17fe6ab0c0..7b012055f1 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java
@@ -36,6 +36,7 @@ import org.apache.sis.referencing.internal.shared.Formulas;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.referencing.cs.AxesConvention;
import org.apache.sis.io.wkt.WKTFormat;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
// Test dependencies
import org.junit.jupiter.api.BeforeEach;
@@ -48,7 +49,6 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
import static
org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual;
-import org.apache.sis.referencing.operation.transform.MathTransforms;
import static org.apache.sis.test.TestCase.assumeConnectionToEPSG;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
index f74ad8d24d..49a0eb34f0 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
@@ -40,6 +40,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
+
/**
* A typed collection of geometric objects which behaves as the set union of
its elements.
*
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultOffsetLineString.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultOffsetLineString.java
index 0c025798ee..99c6f94b53 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultOffsetLineString.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultOffsetLineString.java
@@ -18,13 +18,13 @@ package org.apache.sis.geometries.internal.shared;
import java.util.HashMap;
import java.util.Map;
-import javax.measure.IncommensurableException;
-import javax.measure.Quantity;
-import javax.measure.Unit;
import static java.lang.StrictMath.abs;
import static java.lang.StrictMath.hypot;
import static java.lang.StrictMath.max;
import static java.lang.StrictMath.min;
+import javax.measure.IncommensurableException;
+import javax.measure.Quantity;
+import javax.measure.Unit;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/Vertex.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/Vertex.java
index 255a16b738..4126fcb8d3 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/Vertex.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/Vertex.java
@@ -18,11 +18,12 @@ package org.apache.sis.geometries.internal.shared;
import java.util.Arrays;
import java.util.TreeSet;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Point;
import org.apache.sis.maths.Vector;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* An indexed point in the {@code DataPoints}
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 8523cc7c08..cbad7e6f46 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
@@ -37,6 +37,7 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.GeometryType;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.DataPointsType;
+import org.apache.sis.geometries.GeometryCollection;
import static org.apache.sis.geometries.DataPointsType.ATT_COLOR;
import static org.apache.sis.geometries.DataPointsType.ATT_JOINTS;
import static org.apache.sis.geometries.DataPointsType.ATT_NORMAL;
@@ -44,7 +45,6 @@ import static
org.apache.sis.geometries.DataPointsType.ATT_POSITION;
import static org.apache.sis.geometries.DataPointsType.ATT_TANGENT;
import static org.apache.sis.geometries.DataPointsType.ATT_TEXCOORD;
import static org.apache.sis.geometries.DataPointsType.ATT_WEIGHTS;
-import org.apache.sis.geometries.GeometryCollection;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.internal.shared.ArrayDataPoints;
import org.apache.sis.geometries.internal.shared.Vertex;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
index c7cb6bc6a1..c76a5b74f8 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
@@ -59,8 +59,8 @@ import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.SampleSystem;
import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
-import org.apache.sis.referencing.CRS;
import org.apache.sis.measure.Units;
+import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Sample.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Sample.java
index 16516f0653..06134f138c 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Sample.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Sample.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.maths;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
index 6418c1d2a9..db2b4db63b 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/Vector1D.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.maths;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorAsDirectPosition.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorAsDirectPosition.java
index 1963d0c309..9688b2b342 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorAsDirectPosition.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/maths/VectorAsDirectPosition.java
@@ -19,6 +19,7 @@ package org.apache.sis.maths;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
index 0ff36599c9..3a2c2f732c 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdgeTest.java
@@ -17,8 +17,8 @@
package org.apache.sis.geometries.operation.triangulate.delaunay;
import java.util.Iterator;
-import org.apache.sis.geometries.internal.shared.Vertex;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.internal.shared.Vertex;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Array;
diff --git
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
index 53376a06af..b12f0eca86 100644
---
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
+++
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/dggs/DiscreteGlobalGridCoverageProcessor.java
@@ -643,7 +643,7 @@ public final class DiscreteGlobalGridCoverageProcessor {
//remove any extra slice information
coverage = ad.getSource();
}
-
+
final DiscreteGlobalGridReferenceSystem dggrs =
dggGrid.getReferenceSystem();
final DiscreteGlobalGridHierarchy dggh =
dggrs.getGridSystem().getHierarchy();
final List<SampleDimension> sampleDimensions =
coverage.getSampleDimensions();
diff --git
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/CodedDerivation.java
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/CodedDerivation.java
index 39f125fc86..2012cf70d3 100644
---
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/CodedDerivation.java
+++
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/CodedDerivation.java
@@ -23,8 +23,8 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;
-import javax.measure.IncommensurableException;
import com.google.common.geometry.S2Polygon;
+import javax.measure.IncommensurableException;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/CompoundCodedResource.java
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/CompoundCodedResource.java
index bc7f993e00..4cf34868b9 100644
---
a/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/CompoundCodedResource.java
+++
b/incubator/src/org.apache.sis.referencing.dggs/main/org/apache/sis/storage/rs/internal/shared/CompoundCodedResource.java
@@ -24,8 +24,10 @@ import java.util.Set;
import java.util.TreeSet;
import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.operation.TransformException;
+import org.opengis.referencing.operation.MathTransform;
import org.opengis.util.FactoryException;
import org.opengis.util.GenericName;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
@@ -37,10 +39,8 @@ import org.apache.sis.storage.AbstractResource;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.rs.CodedCoverage;
import org.apache.sis.storage.rs.CodedGeometry;
-import static org.apache.sis.storage.rs.CodedGeometry.compound;
import org.apache.sis.storage.rs.CodedResource;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
+import static org.apache.sis.storage.rs.CodedGeometry.compound;
/**
