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 cec9c38ae6a393b4aba8f57aaa532fc2f76e982d
Merge: 7bc26353fd 52303614bb
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Oct 6 19:20:34 2024 +0200
Merge of automatic reorganization of imports order.
.../test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 ++-
.../main/org/apache/sis/util/iso/AbstractFactory.java | 2 +-
.../test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +-
.../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java | 2 +-
.../org/apache/sis/referencing/internal/ServicesForMetadata.java | 6 +++---
.../sis/referencing/operation/transform/MathTransformBuilder.java | 2 +-
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +-
.../test/org/apache/sis/referencing/StandardDefinitionsTest.java | 2 +-
.../test/org/apache/sis/referencing/crs/HardCodedCRS.java | 2 +-
.../sis/referencing/operation/projection/EquirectangularTest.java | 2 +-
.../operation/projection/LambertAzimuthalEqualAreaTest.java | 2 +-
.../sis/referencing/operation/projection/MapProjectionTestCase.java | 4 ++--
.../apache/sis/referencing/operation/projection/MercatorTest.java | 2 +-
.../test/org/apache/sis/referencing/operation/projection/NoOp.java | 4 +++-
.../referencing/operation/projection/PolarStereographicTest.java | 2 +-
.../sis/referencing/operation/projection/ProjectionBenchmark.java | 2 +-
.../sis/referencing/operation/projection/SatelliteTrackingTest.java | 2 +-
.../sis/referencing/operation/projection/ZonedGridSystemTest.java | 2 +-
.../sis/referencing/operation/transform/CoordinateDomain.java | 4 +++-
.../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java | 2 +-
.../test/org/apache/sis/storage/netcdf/base/TestCase.java | 2 +-
.../test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java | 2 +-
.../main/org/apache/sis/storage/base/MetadataBuilder.java | 2 +-
.../test/org/apache/sis/storage/event/StoreListenersTest.java | 2 +-
.../main/org/apache/sis/storage/gimi/GimiProvider.java | 2 +-
.../main/org/apache/sis/storage/gimi/Group.java | 3 ++-
.../main/org/apache/sis/storage/gimi/ResourceGrid.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java | 2 +-
.../main/org/apache/sis/storage/gimi/ResourcePyramid.java | 4 ++--
.../main/org/apache/sis/storage/gimi/ResourceUnknown.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java | 2 +-
.../sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java | 1 +
.../sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java | 4 ++--
.../main/org/apache/sis/storage/gsf/GSF.java | 1 +
.../main/org/apache/sis/storage/gsf/GSFException.java | 1 +
.../main/org/apache/sis/storage/gsf/GSFStore.java | 5 +++--
.../main/org/apache/sis/storage/gdal/Driver.java | 2 +-
.../main/org/apache/sis/storage/gdal/Subdataset.java | 2 +-
.../main/org/apache/sis/storage/gdal/TiledResource.java | 2 +-
.../test/org/apache/sis/storage/gdal/GDALStoreTest.java | 3 ++-
41 files changed, 55 insertions(+), 44 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index 0938b0c1f5,367b7508d5..36e58e702e
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@@ -69,24 -69,12 +69,24 @@@ import org.apache.sis.util.privy.Consta
import org.apache.sis.util.resources.Vocabulary;
import org.apache.sis.util.logging.Logging;
+ // Specific to the main and geoapi-3.1 branches:
+ import org.apache.sis.util.collection.BackingStoreException;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
+// Specific to the main branch:
+import java.util.Map;
+import org.opengis.util.TypeName;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.opengis.referencing.crs.CRSFactory;
+import org.opengis.referencing.cs.CSFactory;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.opengis.referencing.datum.Datum;
+import org.opengis.referencing.datum.DatumFactory;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
+import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
+import org.apache.sis.metadata.iso.citation.DefaultCitation;
- // Specific to the geoapi-3.1 and master branches:
- import org.apache.sis.util.collection.BackingStoreException;
-
/**
* Implements the referencing services needed by the {@code
org.apache.sis.metadata} module.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java
index a88b76e8fb,0602b67706..1b15e02d65
---
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
@@@ -22,15 -22,9 +22,15 @@@ import org.opengis.referencing.operatio
import org.opengis.referencing.operation.MathTransformFactory;
import org.opengis.referencing.operation.OperationMethod;
import org.apache.sis.referencing.IdentifiedObjects;
- import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.Classes;
+ import org.apache.sis.util.privy.Strings;
+// 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/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
index 094d22ae17,2e91454f12..50b0ef70de
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
@@@ -36,10 -35,14 +35,11 @@@ import org.apache.sis.referencing.opera
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+ import
org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
import org.apache.sis.referencing.operation.transform.MathTransformTestCase;
+ import org.apache.sis.referencing.datum.GeodeticDatumMock;
import org.apache.sis.test.TestUtilities;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.referencing.ParameterizedTransformTest;
-
/**
* Base class of map projection tests.
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index e51dbdd10b,edf84fa636..0de1b47146
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@@ -36,11 -35,12 +35,12 @@@ import static org.apache.sis.referencin
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+ import
org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.apache.sis.referencing.operation.provider.MercatorSpherical;
-import org.apache.sis.referencing.operation.provider.RegionalMercator;
-import static org.opengis.test.Assertions.assertBetween;
+// Specific to the main branch:
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+import static org.apache.sis.test.GeoapiAssert.assertBetween;
+import static org.apache.sis.test.GeoapiAssert.PENDING_NEXT_GEOAPI_RELEASE;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
index 8152b8e88c,c9856d40bf..d8eabed1be
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/NetcdfStoreProviderTest.java
@@@ -30,10 -29,11 +29,11 @@@ import org.apache.sis.util.Version
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
+ import org.apache.sis.storage.DataStoreMock;
import org.apache.sis.storage.netcdf.base.TestCase;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
+// Specific to the main branch:
+import org.apache.sis.storage.netcdf.base.TestData;
/**
diff --cc
endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
index 18686f9927,c34b3efeeb..662b4faa3f
---
a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
+++
b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/base/TestCase.java
@@@ -41,7 -40,11 +40,8 @@@ import org.junit.jupiter.api.TestInstan
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+ import org.apache.sis.storage.DataStoreMock;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.test.dataset.TestData;
-
/**
* Base class of netCDF tests. The base class uses the UCAR decoder, which is
taken as a reference implementation.
diff --cc
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index e36b1806ab,83d43908ba..f314de78aa
---
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@@ -106,9 -106,8 +106,9 @@@ import org.apache.sis.coverage.grid.Gri
import org.apache.sis.pending.jdk.JDK21;
import org.apache.sis.measure.Units;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.FeatureType;
+// Specific to the main branch:
- import org.apache.sis.feature.DefaultFeatureType;
+import org.opengis.referencing.ReferenceIdentifier;
++import org.apache.sis.feature.DefaultFeatureType;
/**
