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 ecf5857313 Post-merge automatic import reorganization.
ecf5857313 is described below
commit ecf58573132347e11b9cc910038361b863522e76
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Apr 9 14:32:27 2024 +0200
Post-merge automatic import reorganization.
---
.../test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java | 2 +-
.../sis/referencing/gazetteer/ReferencingByIdentifiersTest.java | 6 +++---
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 6 +++---
.../main/org/apache/sis/referencing/Properties.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 4 +++-
.../main/org/apache/sis/referencing/internal/Legacy.java | 2 +-
.../org/apache/sis/referencing/AbstractReferenceSystemTest.java | 8 ++++----
.../test/org/apache/sis/referencing/CRSTest.java | 6 +++---
.../test/org/apache/sis/referencing/GeodeticObjectVerifier.java | 8 ++++----
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 6 +++---
.../test/org/apache/sis/referencing/datum/HardCodedDatum.java | 6 +++---
.../test/org/apache/sis/test/TestUtilities.java | 8 ++++----
13 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index 85bd4a9132..c9f6cc706c 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -30,7 +30,6 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlElementRef;
import jakarta.xml.bind.annotation.XmlElementRefs;
import jakarta.xml.bind.annotation.XmlRootElement;
-import org.opentest4j.AssertionFailedError;
import org.opengis.annotation.UML;
import org.opengis.annotation.Obligation;
import org.opengis.annotation.Specification;
@@ -42,6 +41,7 @@ import org.apache.sis.xml.bind.Context;
import org.apache.sis.xml.bind.cat.CodeListUID;
// Test dependencies
+import org.opentest4j.AssertionFailedError;
import org.junit.jupiter.api.Test;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCaseWithLogs;
diff --git
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
index 04e97af060..f7cc6fb91d 100644
---
a/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
+++
b/endorsed/src/org.apache.sis.referencing.gazetteer/test/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiersTest.java
@@ -21,15 +21,15 @@ import java.util.HashMap;
import org.apache.sis.metadata.iso.citation.DefaultOrganisation;
import org.apache.sis.metadata.iso.extent.DefaultExtent;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
/**
* Tests {@link ReferencingByIdentifiers}.
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index b882cec7f4..5ee05e7d77 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -84,13 +84,13 @@ import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
// Specific to the geoapi-4.0 branch:
import org.apache.sis.referencing.crs.DefaultImageCRS;
import org.apache.sis.referencing.datum.DefaultImageDatum;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
/**
* Well Known Text (WKT) parser for referencing objects. This include, but is
not limited too,
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index a52462666a..289b12216a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@ -35,9 +35,9 @@ import org.apache.sis.referencing.privy.CoordinateOperations;
import org.opengis.referencing.ObjectDomain;
// Specific to the geoapi-4.0 branch:
+import org.opengis.util.InternationalString;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.extent.Extent;
-import org.opengis.util.InternationalString;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
index caa6a6ae97..5350bd8984 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
@@ -60,8 +60,8 @@ import org.apache.sis.io.wkt.Convention;
import java.util.Collection;
import java.util.NoSuchElementException;
import org.opengis.referencing.crs.ParametricCRS;
-import org.apache.sis.metadata.privy.Identifiers;
import org.apache.sis.xml.NilObject;
+import org.apache.sis.metadata.privy.Identifiers;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
index 36d9ba831f..ace9227994 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@ -44,6 +44,9 @@ import org.apache.sis.io.wkt.Formatter;
import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
+// Specific to the main and geoapi-4.0 branches:
+import org.apache.sis.referencing.internal.Legacy;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
@@ -51,7 +54,6 @@ import org.opengis.metadata.Identifier;
import org.opengis.annotation.UML;
import static org.opengis.annotation.Obligation.*;
import static org.opengis.annotation.Specification.*;
-import org.apache.sis.referencing.internal.Legacy;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
index a0af157c4f..9adb3d80ce 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Legacy.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.cs.DefaultCartesianCS;
import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
import org.apache.sis.referencing.privy.ReferencingUtilities;
-// Specific to the geoapi-4.0 branch:
+// Specific to the main and geoapi-4.0 branches:
import java.util.Date;
import java.time.Instant;
import java.time.Year;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
index 5314c05016..6f13ffc51d 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AbstractReferenceSystemTest.java
@@ -27,10 +27,6 @@ import
org.apache.sis.metadata.iso.extent.DefaultTemporalExtent;
import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.IdentifiedObject.*;
-import static org.opengis.referencing.ObjectDomain.*;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -41,6 +37,10 @@ import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
import static org.apache.sis.referencing.Assertions.assertWktEquals;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import static org.opengis.referencing.IdentifiedObject.*;
+import static org.opengis.referencing.ObjectDomain.*;
+
/**
* Tests the {@link AbstractReferenceSystem} class.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
index ce31a2b664..57725b19c5 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
@@ -37,9 +37,6 @@ import org.apache.sis.system.Loggers;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Utilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -50,6 +47,9 @@ import
org.apache.sis.referencing.operation.HardCodedConversions;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.Assertions.assertMessageContains;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
/**
* Tests the {@link CRS} class.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
index 0163c3330c..b3c38e3346 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java
@@ -20,6 +20,7 @@ import org.opengis.metadata.Identifier;
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.GeographicBoundingBox;
+import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.datum.Ellipsoid;
import org.opengis.referencing.datum.PrimeMeridian;
import org.opengis.referencing.datum.GeodeticDatum;
@@ -34,13 +35,12 @@ import org.opengis.referencing.crs.GeodeticCRS;
import org.apache.sis.metadata.privy.AxisNames;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-import org.opengis.referencing.IdentifiedObject;
-
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+
/**
* Verifies the values of some geodetic objects. Methods in this class ignore
most textual properties like remarks,
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
index b13e1cdc69..a0739e7e8b 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/HardCodedCRS.java
@@ -25,14 +25,14 @@ import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.referencing.datum.GeodeticDatumMock;
import static org.apache.sis.referencing.IdentifiedObjects.getProperties;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
-
// Test dependencies
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.datum.HardCodedDatum;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import static org.opengis.referencing.ObjectDomain.DOMAIN_OF_VALIDITY_KEY;
+
/**
* Collection of coordinate reference systems for testing purpose.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index bd7f3702d2..a675f73064 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
@@ -26,13 +26,13 @@ import
org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.measure.Units;
import static
org.apache.sis.util.privy.StandardDateFormat.MILLISECONDS_PER_DAY;
+// Test dependencies
+import org.apache.sis.metadata.iso.citation.HardCodedCitations;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import static org.opengis.referencing.IdentifiedObject.*;
import static org.opengis.referencing.ObjectDomain.*;
-// Test dependencies
-import org.apache.sis.metadata.iso.citation.HardCodedCitations;
-
/**
* Collection of datum for testing purpose.
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
index d8e2de7ce1..78f81fc12e 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/TestUtilities.java
@@ -38,7 +38,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import org.opengis.util.InternationalString;
import org.opengis.referencing.IdentifiedObject;
-import org.opengis.metadata.extent.GeographicExtent;
import org.opengis.metadata.extent.GeographicBoundingBox;
import org.apache.sis.util.Debug;
import org.apache.sis.util.Static;
@@ -50,12 +49,13 @@ import org.apache.sis.util.collection.TreeTableFormat;
import org.apache.sis.util.privy.X364;
import static org.apache.sis.util.privy.StandardDateFormat.UTC;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.ObjectDomain;
-
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.ObjectDomain;
+import org.opengis.metadata.extent.GeographicExtent;
+
/**
* Miscellaneous utility methods for test cases.
