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 770e730bd6 Post-merge automatic import reorganization.
770e730bd6 is described below
commit 770e730bd610a83c3c0cafcd0a5b47e5b8741736
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Apr 6 00:24:36 2024 +0200
Post-merge automatic import reorganization.
---
.../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +-
.../test/org/apache/sis/test/mock/VerticalCRSMock.java | 2 +-
.../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 8 ++++----
.../org/apache/sis/referencing/datum/DefaultVerticalDatum.java | 2 +-
.../org/apache/sis/referencing/internal/EPSGFactoryProxy.java | 4 +++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 4 +---
.../apache/sis/referencing/report/CoordinateReferenceSystems.java | 2 +-
.../test/org/apache/sis/test/integration/MetadataTest.java | 6 +++---
.../test/org/apache/sis/test/FailureDetailsReporter.java | 2 +-
11 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
index 22c99e5890..9bbd7005c4 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java
@@ -64,8 +64,8 @@ import static
org.apache.sis.metadata.Assertions.assertTitleEquals;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.content.AttributeGroup;
-import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.ObjectDomain;
+import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.temporal.Duration;
// Specific to the geoapi-4.0 branch:
diff --git
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
index aecb15b43e..e3e3e59eea 100644
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/VerticalCRSMock.java
@@ -16,7 +16,6 @@
*/
package org.apache.sis.test.mock;
-import java.util.Optional;
import javax.measure.Unit;
import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.crs.VerticalCRS;
@@ -30,6 +29,7 @@ import org.opengis.util.InternationalString;
import org.apache.sis.measure.Units;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
import org.opengis.referencing.datum.RealizationMethod;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
index facb63e4c2..a5ee561b56 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java
@@ -22,11 +22,11 @@ import java.io.Serializable;
import java.time.temporal.Temporal;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.privy.WKTUtilities;
import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.internal.Epoch;
-import org.apache.sis.referencing.CRS;
import org.apache.sis.io.wkt.FormattableObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.util.ComparisonMode;
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 3e50020cb0..8a4f1e6ab5 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
@@ -95,9 +95,9 @@ import org.apache.sis.util.logging.Logging;
import org.opengis.geometry.Geometry;
import org.opengis.referencing.ObjectDomain;
import org.opengis.referencing.datum.DynamicReferenceFrame;
-import org.opengis.coordinate.CoordinateMetadata;
import org.opengis.metadata.extent.BoundingPolygon;
import org.opengis.metadata.extent.GeographicExtent;
+import org.opengis.coordinate.CoordinateMetadata;
/**
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 43869b2b63..caa6a6ae97 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
@@ -21,8 +21,6 @@ import java.util.List;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Objects;
-import java.util.Collection;
-import java.util.NoSuchElementException;
import java.io.IOException;
import java.io.ObjectInputStream;
import jakarta.xml.bind.annotation.XmlType;
@@ -54,14 +52,16 @@ import org.apache.sis.util.collection.CheckedContainer;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.metadata.privy.Identifiers;
import org.apache.sis.xml.bind.referencing.SC_CRS;
-import org.apache.sis.xml.NilObject;
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.io.wkt.Convention;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+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;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
index 5405bca909..f7584808d6 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
@@ -35,8 +35,8 @@ import org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.metadata.privy.ImplementationHelper;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
import org.opengis.referencing.datum.RealizationMethod;
+import org.opengis.metadata.Identifier;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
index a4a079fcdf..d95a07f53a 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGFactoryProxy.java
@@ -17,7 +17,6 @@
package org.apache.sis.referencing.internal;
import java.util.Set;
-import java.util.Optional;
import org.opengis.metadata.citation.Citation;
import org.opengis.referencing.AuthorityFactory;
import org.opengis.referencing.IdentifiedObject;
@@ -25,6 +24,9 @@ import org.opengis.util.FactoryException;
import org.opengis.util.InternationalString;
import org.apache.sis.referencing.GeodeticException;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
+
/**
* A factory that redirect all method to another factory. This factory is
normally useless and not used by Apache SIS.
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
index a49e94a3c5..e9032f4814 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTParserTest.java
@@ -19,6 +19,7 @@ package org.apache.sis.io.wkt;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.crs.VerticalCRS;
import org.opengis.util.FactoryException;
+import org.opengis.referencing.datum.RealizationMethod;
import org.apache.sis.metadata.privy.AxisNames;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import org.apache.sis.system.Loggers;
@@ -33,9 +34,6 @@ import org.opengis.test.wkt.CRSParserTest;
import org.apache.sis.test.LoggingWatcher;
import org.apache.sis.test.FailureDetailsReporter;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-
/**
* Tests Well-Known Text parser using the tests defined in GeoAPI. Those tests
use the
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index 3a80d5f6e6..945607b763 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -22,9 +22,9 @@ import java.util.Map;
import java.util.HashSet;
import java.util.TreeMap;
import java.util.NavigableMap;
+import java.util.Optional;
import java.io.File;
import java.io.IOException;
-import java.util.Optional;
import org.opengis.metadata.Identifier;
import org.opengis.util.FactoryException;
import org.opengis.util.InternationalString;
diff --git
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
index 2f6d75b62d..f948473262 100644
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
@@ -63,9 +63,6 @@ import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.privy.Constants;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
-
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -73,6 +70,9 @@ import org.apache.sis.test.TestUtilities;
import org.apache.sis.xml.test.DocumentComparator;
import org.apache.sis.xml.test.TestCase;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.datum.RealizationMethod;
+
/**
* Tests XML (un)marshalling of a metadata object containing various elements
diff --git
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
index 4bb02bcf7f..fff3e277e2 100644
---
a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
+++
b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/FailureDetailsReporter.java
@@ -17,9 +17,9 @@
package org.apache.sis.test;
import java.io.PrintStream;
+import org.opentest4j.TestAbortedException;
// Test dependencies
-import org.opentest4j.TestAbortedException;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
