This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit f3170bc4ec629cffbfbcfa689bb13e3b1ad944fd
Merge: a4a443d79e 027cd1b753
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Sep 1 12:42:51 2025 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/referencing/AuthorityFactories.java | 2 +-
.../main/org/apache/sis/referencing/CRS.java | 4 ++--
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 2 +-
.../org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java | 8 ++++----
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 2 +-
.../org/apache/sis/referencing/factory/sql/EPSGInstaller.java | 2 +-
.../main/org/apache/sis/referencing/factory/sql/TableInfo.java | 2 +-
.../org/apache/sis/referencing/internal/VerticalDatumTypes.java | 2 +-
.../test/org/apache/sis/test/integration/ConsistencyTest.java | 4 +---
11 files changed, 15 insertions(+), 17 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 3ba6f78225,193647114c..6181ae9897
---
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
@@@ -100,13 -100,11 +100,13 @@@ import org.apache.sis.util.logging.Logg
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.crs.GeneralDerivedCRS;
-// 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.DynamicReferenceFrame;
-import org.opengis.coordinate.CoordinateMetadata;
+// Specific to the main branch:
- import org.apache.sis.coordinate.DefaultCoordinateMetadata;
+import org.apache.sis.referencing.DefaultObjectDomain;
+import org.apache.sis.referencing.crs.AbstractCRS;
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
+import org.apache.sis.referencing.datum.DefaultVerticalDatum;
++import org.apache.sis.coordinate.DefaultCoordinateMetadata;
+import static
org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index 028ec16420,457b834f88..7a216d89fa
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
@@@ -46,10 -46,8 +46,10 @@@ import org.apache.sis.util.resources.Er
import org.opengis.referencing.crs.GeneralDerivedCRS;
import org.opengis.geometry.MismatchedDimensionException;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.pending.geoapi.referencing.MissingMethods;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
++import org.apache.sis.pending.geoapi.referencing.MissingMethods;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index f9abebb02d,1f523146a1..937b448e27
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@@ -45,10 -44,11 +44,11 @@@ import org.apache.sis.util.ComparisonMo
import org.apache.sis.util.resources.Errors;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.datum.Datum;
import org.opengis.referencing.crs.GeneralDerivedCRS;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
index cf2b16bdf0,04ef599736..2f6132417f
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
@@@ -45,10 -45,9 +45,10 @@@ import org.apache.sis.io.wkt.Convention
import org.apache.sis.io.wkt.Formatter;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DatumEnsemble;
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.pending.geoapi.referencing.MissingMethods;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
++import org.apache.sis.pending.geoapi.referencing.MissingMethods;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
index acacea9a0a,e113272552..6bb1475b12
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
@@@ -64,13 -64,12 +64,13 @@@ import org.apache.sis.referencing.facto
import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory;
import static
org.apache.sis.metadata.privy.NameToIdentifier.Simplifier.ESRI_DATUM_PREFIX;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.opengis.referencing.crs.GeneralDerivedCRS;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.crs.ParametricCRS;
-import org.opengis.referencing.datum.ParametricDatum;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.referencing.crs.DefaultParametricCRS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
-
- // Specific to the main and geoapi-3.1 branches:
- import org.opengis.referencing.crs.GeneralDerivedCRS;
++import org.apache.sis.referencing.crs.DefaultParametricCRS;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index ec3bc59639,edf2c685d9..3f8fab53f4
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@@ -125,14 -126,9 +126,13 @@@ import org.apache.sis.measure.NumberRan
import org.apache.sis.measure.Units;
import org.apache.sis.pending.jdk.JDK16;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.opengis.referencing.ObjectFactory;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.AbstractDatum;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
- import org.apache.sis.referencing.internal.ServicesForMetadata;
+import org.apache.sis.temporal.TemporalDate;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
index 20bc526972,835c89fb5e..041b1402d3
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/TableInfo.java
@@@ -27,13 -27,6 +27,13 @@@ import org.opengis.referencing.operatio
import org.opengis.parameter.ParameterDescriptor;
import org.apache.sis.referencing.privy.WKTKeywords;
+// Specific to the main branch:
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
++import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.crs.DefaultParametricCRS;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
- import org.apache.sis.referencing.datum.DefaultParametricDatum;
+
/**
* Information (such as columns of particular interest) about a specific
<abbr>EPSG</abbr> table.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
index 22994f3543,e2aacdd5c1..c0fc47012b
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/VerticalDatumTypes.java
@@@ -24,16 -24,14 +24,16 @@@ import org.opengis.referencing.cs.Coord
import org.opengis.referencing.cs.AxisDirection;
import org.apache.sis.util.Characters;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.CodeLists;
import org.apache.sis.measure.Units;
++import org.apache.sis.util.privy.CodeLists;
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.datum.VerticalDatumType;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.RealizationMethod;
+// Specific to the main branch:
+import java.util.function.Predicate;
+import org.opengis.util.CodeList;
+import org.apache.sis.util.StringBuilders;
- import org.apache.sis.util.privy.CodeLists;
/**
