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 48705908fc000a3d1d996670fa6848b37fa9e490
Merge: 9c3e588d3c 3a2127e98a
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Jul 10 16:56:05 2024 +0200
Merge of automatic reorganization of imports order.
.../test/org/apache/sis/temporal/DefaultInstantTest.java | 10 +++++-----
.../test/org/apache/sis/temporal/DefaultPeriodTest.java | 2 +-
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 4 ++--
.../apache/sis/referencing/internal/PositionTransformer.java | 1 -
.../sis/referencing/operation/CoordinateOperationRegistry.java | 2 ++
.../apache/sis/referencing/operation/DefaultConversion.java | 2 +-
.../operation/DefaultCoordinateOperationFactory.java | 2 +-
.../operation/transform/DefaultMathTransformFactory.java | 4 ++--
.../referencing/operation/transform/MathTransformBuilder.java | 2 +-
.../main/org/apache/sis/referencing/privy/AxisDirections.java | 2 +-
.../org/apache/sis/referencing/privy/CoordinateOperations.java | 8 +++++---
.../operation/provider/GeocentricTranslationTest.java | 2 ++
.../referencing/operation/provider/Geographic3Dto2DTest.java | 2 +-
.../operation/transform/DefaultMathTransformFactoryTest.java | 2 +-
.../operation/transform/MathTransformFactoryBase.java | 8 +++++---
.../operation/transform/MathTransformFactoryMock.java | 6 ++++--
.../operation/transform/MolodenskyTransformTest.java | 2 ++
.../apache/sis/test/integration/CoordinateOperationTest.java | 2 +-
.../main/org/apache/sis/storage/netcdf/base/CRSBuilder.java | 2 +-
.../main/org/apache/sis/storage/sql/postgis/RasterReader.java | 2 +-
.../main/org/apache/sis/measure/RangeFormat.java | 4 ++--
21 files changed, 41 insertions(+), 30 deletions(-)
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
index 4607c106c1,9767aca743..955a15141c
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultInstantTest.java
@@@ -35,6 -30,11 +30,11 @@@ import org.junit.jupiter.api.function.E
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.temporal.IndeterminateValue;
-import org.opengis.temporal.IndeterminatePositionException;
-import org.opengis.filter.TemporalOperatorName;
++// Specific to the main branch:
++import java.time.DateTimeException;
++import org.apache.sis.pending.geoapi.temporal.IndeterminateValue;
++import org.apache.sis.pending.geoapi.temporal.TemporalOperatorName;
+
/**
* Tests the {@link DefaultInstant} class.
diff --cc
endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
index 73829fe91b,a51a608a8d..b519510f2f
---
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
+++
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/temporal/DefaultPeriodTest.java
@@@ -26,8 -26,8 +26,8 @@@ import org.junit.jupiter.api.Test
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.test.TestCase;
- // Specific to the main branch
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.filter.TemporalOperatorName;
++// Specific to the main branch:
+import org.apache.sis.pending.geoapi.temporal.TemporalOperatorName;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index 42910bd8b4,cb56a5e8f7..12423894d1
---
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
@@@ -121,12 -121,9 +121,12 @@@ import static org.apache.sis.util.privy
import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
import static
org.apache.sis.referencing.internal.ServicesForMetadata.CONNECTION;
-// 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.apache.sis.temporal.TemporalDate;
+import org.apache.sis.referencing.internal.ServicesForMetadata;
++import org.apache.sis.temporal.TemporalDate;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
index 6351b85d53,25866b05e7..914cb6be33
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java
@@@ -30,9 -30,9 +30,8 @@@ import org.apache.sis.referencing.opera
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.util.Utilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.RegisterOperations;
-import org.opengis.coordinate.MismatchedDimensionException;
+// Specific to the main branch:
+import org.opengis.geometry.MismatchedDimensionException;
- import org.apache.sis.referencing.MultiRegisterOperations;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index 7d2693cf16,8f900fd7a8..c489e9e8af
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@@ -83,8 -83,7 +83,10 @@@ import org.apache.sis.util.resources.Vo
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.crs.GeneralDerivedCRS;
+
++// Specific to the main branch:
+import org.apache.sis.referencing.operation.transform.MathTransformBuilder;
+
/**
* Base class of code that search for coordinate operation, either by looking
in a registry maintained by an authority
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 29d81b5abc,311c3a3d02..909d3972b0
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@@ -55,8 -53,13 +53,10 @@@ import org.apache.sis.parameter.Default
import org.apache.sis.system.Reflect;
// Specific to the main and geoapi-3.1 branches:
+ import org.opengis.parameter.ParameterDescriptorGroup;
+ import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.util.resources.Errors;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.matrix.Matrices;
-
/**
* Low level factory for creating {@linkplain AbstractMathTransform math
transforms}.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
index b9b6151db1,9ca49145f5..6a08c4bbbe
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
@@@ -25,12 -25,6 +25,12 @@@ import org.apache.sis.metadata.iso.cita
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.util.privy.Strings;
- // Specific to the main and geoapi-3.1 branches:
++// Specific to the main branch:
+import org.opengis.util.FactoryException;
+import org.opengis.referencing.datum.Ellipsoid;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.parameter.ParameterValueGroup;
+
/**
* Builder of a parameterized math transform using a method identified by a
name or code.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
index ac99deb2b9,f1a452946a..ff3bfae289
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/AxisDirections.java
@@@ -35,11 -34,6 +34,12 @@@ import org.apache.sis.util.iso.Types
import org.apache.sis.measure.Units;
import static org.apache.sis.util.CharSequences.*;
+// Specific to the main branch:
++import java.util.HashMap;
+import org.opengis.annotation.UML;
+import static org.opengis.annotation.Obligation.CONDITIONAL;
+import static org.opengis.annotation.Specification.ISO_19111;
+
/**
* Utilities methods related to {@link AxisDirection}.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
index 5614bc7fe9,109b3b1a0d..43fa16e026
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/CoordinateOperations.java
@@@ -56,11 -56,7 +56,13 @@@ import org.apache.sis.system.Loggers
// Specific to the main and geoapi-3.1 branches:
import org.opengis.referencing.crs.GeneralDerivedCRS;
+
++// Specific to the main branch:
++import org.opengis.util.FactoryException;
++import org.opengis.referencing.operation.MathTransform;
+import org.apache.sis.referencing.operation.transform.MathTransformBuilder;
+import org.apache.sis.referencing.internal.ParameterizedTransformBuilder;
- import org.opengis.referencing.operation.MathTransform;
- import org.opengis.util.FactoryException;
+
/**
* Utility methods related to coordinate operations.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
index 922e97f98c,986da2a0d2..ccd22f6be8
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/GeocentricTranslationTest.java
@@@ -37,7 -37,11 +37,9 @@@ import org.apache.sis.referencing.opera
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Arrays;
-import org.opengis.test.ToleranceModifier;
-import org.apache.sis.referencing.datum.HardCodedDatum;
++// Specific to the main branch:
+import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
index 86898f4ce1,c9a324b527..a115eee586
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/Geographic3Dto2DTest.java
@@@ -30,9 -30,8 +30,9 @@@ 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 static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
- import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
+import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index 4f5c80b158,c8fa84b027..12816ae529
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@@ -49,9 -49,8 +49,9 @@@ import org.apache.sis.referencing.cs.Ha
import org.apache.sis.referencing.crs.HardCodedCRS;
import static org.apache.sis.test.Assertions.assertMessageContains;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
- import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
+import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
index d0a30413cd,0789a11e12..22d4a0679e
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryBase.java
@@@ -32,6 -29,6 +29,11 @@@ import org.opengis.referencing.operatio
// Test dependencies
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
++// Specific to the main branch:
++import org.opengis.parameter.ParameterValueGroup;
++import org.opengis.referencing.cs.CoordinateSystem;
++import org.opengis.referencing.crs.CoordinateReferenceSystem;
++
/**
* Skeleton for {@link MathTransformFactory} custom implementations.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
index b5ef45d8ea,cefcc5686f..f11b949bab
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformFactoryMock.java
@@@ -34,6 -32,10 +32,10 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.util.Optional;
-import org.apache.sis.referencing.operation.matrix.Matrices;
++// Specific to the main branch:
++import org.opengis.referencing.crs.CoordinateReferenceSystem;
++import org.opengis.referencing.cs.CoordinateSystem;
+
/**
* A dummy implementation of {@link MathTransformFactory}, which contains
exactly one operation method.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
index fc45bed6a7,8c44de1097..04255fa62c
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
@@@ -35,7 -35,19 +35,9 @@@ import org.apache.sis.referencing.opera
import
org.apache.sis.referencing.operation.provider.GeocentricTranslationTest;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.referencing.datum.HardCodedDatum;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.io.IOException;
-import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.referencing.operation.provider.AbridgedMolodensky;
-import org.apache.sis.math.StatisticsFormat;
-import org.apache.sis.math.Statistics;
-import static org.apache.sis.metadata.privy.ReferencingServices.NAUTICAL_MILE;
-import org.opengis.test.CalculationType;
-import org.opengis.test.ToleranceModifier;
-import org.opengis.test.ToleranceModifiers;
-import org.opengis.test.referencing.ParameterizedTransformTest;
-import org.apache.sis.test.TestCase;
++// Specific to the main branch:
+import static org.apache.sis.referencing.privy.CoordinateOperations.builder;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
index 1c64e94349,87352f7e20..a7abf5c1b0
---
a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/CRSBuilder.java
@@@ -60,10 -60,6 +60,10 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Units;
+// Specific to the main branch:
- import org.apache.sis.temporal.TemporalDate;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
++import org.apache.sis.temporal.TemporalDate;
+
/**
* Temporary object for building a coordinate reference system from the
variables in a netCDF file.
