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 9e3ec5335f Post-merge automatic import order. 9e3ec5335f is described below commit 9e3ec5335ffe27fb001a8cdbd1c95f06634a26a1 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sun Oct 6 18:57:09 2024 +0200 Post-merge automatic import order. --- .../test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java | 3 ++- .../main/org/apache/sis/util/iso/AbstractFactory.java | 4 +++- .../test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java | 2 +- .../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 | 4 ++-- .../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 +++- .../sis/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 +- .../apache/sis/referencing/operation/transform/CoordinateDomain.java | 4 +++- .../main/org/apache/sis/storage/netcdf/base/VariableTransformer.java | 2 +- .../test/org/apache/sis/storage/netcdf/MetadataReaderTest.java | 4 ++-- .../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 +- .../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 + .../apache/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 ++- 39 files changed, 55 insertions(+), 42 deletions(-) diff --git a/endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java b/endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java index d885cff380..afcefb3975 100644 --- a/endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java +++ b/endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java @@ -16,8 +16,9 @@ */ package org.apache.sis.cloud.aws.s3; -// Test dependencies import java.util.Locale; + +// Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.test.TestCase; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java index 63ffdc7d42..cdab28291a 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/AbstractFactory.java @@ -17,11 +17,13 @@ package org.apache.sis.util.iso; import org.opengis.util.Factory; -import org.opengis.util.FactoryException; import org.opengis.metadata.citation.Citation; import org.apache.sis.metadata.simple.SimpleCitation; import org.apache.sis.util.privy.Strings; +// Specific to the geoapi-4.0 branch: +import org.opengis.util.FactoryException; + /** * Base class of factories provided in the Apache SIS library. diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java index 868c5e734b..0bd63cd1e5 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gco/PropertyTypeTest.java @@ -21,11 +21,11 @@ import org.apache.sis.util.SimpleInternationalString; import org.apache.sis.xml.XLink; import org.apache.sis.xml.MarshalContext; import org.apache.sis.xml.IdentifierSpace; -import org.apache.sis.xml.ReferenceResolverMock; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.xml.ReferenceResolverMock; import org.apache.sis.xml.test.TestCase; diff --git 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 index 27b845bc66..d1ef0d216f 100644 --- 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,8 +22,8 @@ import org.opengis.referencing.operation.MathTransform; 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; /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java index c00f93cd6d..c7903baafe 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTFormatTest.java @@ -29,11 +29,11 @@ import org.apache.sis.referencing.crs.DefaultProjectedCRS; import org.apache.sis.referencing.datum.DefaultPrimeMeridian; import org.apache.sis.parameter.DefaultParameterValue; import org.apache.sis.parameter.Parameterized; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.test.TestCase; import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; import static org.apache.sis.test.Assertions.assertMessageContains; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java index 769d2d261b..062644db92 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java @@ -32,13 +32,13 @@ import org.opengis.referencing.datum.VerticalDatum; import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.util.privy.Constants; import org.apache.sis.measure.Units; -import org.apache.sis.referencing.datum.GeodeticDatumMock; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; import org.opengis.test.Validators; import org.apache.sis.test.TestCase; +import org.apache.sis.referencing.datum.GeodeticDatumMock; import org.apache.sis.referencing.datum.HardCodedDatum; import org.apache.sis.referencing.crs.HardCodedCRS; import org.apache.sis.referencing.cs.HardCodedAxes; 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 1a87f0bbb6..a1151b90e3 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 @@ -21,12 +21,12 @@ import java.util.HashMap; import static org.opengis.referencing.IdentifiedObject.*; import org.apache.sis.referencing.NamedIdentifier; import org.apache.sis.metadata.iso.extent.Extents; -import org.apache.sis.referencing.datum.GeodeticDatumMock; import static org.apache.sis.referencing.IdentifiedObjects.getProperties; // Test dependencies -import org.apache.sis.referencing.cs.HardCodedCS; +import org.apache.sis.referencing.datum.GeodeticDatumMock; import org.apache.sis.referencing.datum.HardCodedDatum; +import org.apache.sis.referencing.cs.HardCodedCS; import org.apache.sis.metadata.iso.citation.HardCodedCitations; // Specific to the geoapi-3.1 and geoapi-4.0 branches: diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/EquirectangularTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/EquirectangularTest.java index 00302f78b9..fe4fac88cc 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/EquirectangularTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/EquirectangularTest.java @@ -25,12 +25,12 @@ import org.apache.sis.referencing.privy.Formulas; import org.apache.sis.referencing.operation.provider.Equirectangular; import org.apache.sis.io.wkt.Convention; import org.apache.sis.referencing.operation.transform.CoordinateDomain; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS; // Test dependencies import org.junit.jupiter.api.Test; import org.apache.sis.referencing.Assertions; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java index d58e2954f0..bd44bff53c 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualAreaTest.java @@ -21,7 +21,6 @@ import static java.lang.StrictMath.*; import org.opengis.util.FactoryException; import org.opengis.referencing.operation.TransformException; import org.apache.sis.referencing.operation.transform.CoordinateDomain; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.referencing.operation.provider.MapProjection; import org.apache.sis.metadata.privy.ReferencingServices; import org.apache.sis.parameter.Parameters; @@ -32,6 +31,7 @@ import static org.apache.sis.referencing.privy.Formulas.ANGULAR_TOLERANCE; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; /** diff --git 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 index e653311165..2e91454f12 100644 --- 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 @@ -30,14 +30,14 @@ import org.apache.sis.util.privy.Constants; import org.apache.sis.referencing.operation.provider.MapProjection; import org.apache.sis.referencing.operation.provider.AbstractProvider; import org.apache.sis.referencing.operation.transform.CoordinateDomain; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.referencing.operation.transform.MathTransformProvider; import org.apache.sis.referencing.operation.transform.MathTransforms; -import org.apache.sis.referencing.datum.GeodeticDatumMock; // 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: diff --git 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 index 8e508081cc..edf84fa636 100644 --- 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 @@ -29,13 +29,13 @@ import org.apache.sis.referencing.operation.provider.MercatorAuxiliarySphere; import org.apache.sis.referencing.operation.provider.PseudoMercator; import org.apache.sis.referencing.operation.provider.MillerCylindrical; import org.apache.sis.referencing.operation.transform.CoordinateDomain; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.parameter.Parameters; import static org.apache.sis.referencing.operation.projection.ConformalProjectionTest.LN_INFINITY; // 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; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java index 4d8d8c721d..8e674bad83 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java @@ -20,13 +20,15 @@ import java.util.Map; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.datum.Ellipsoid; import org.opengis.referencing.operation.Matrix; -import org.apache.sis.referencing.datum.GeodeticDatumMock; import org.apache.sis.referencing.operation.DefaultOperationMethod; import org.apache.sis.parameter.ParameterBuilder; import org.apache.sis.parameter.Parameters; import org.apache.sis.util.Workaround; import org.apache.sis.util.privy.Constants; +// Test dependencies +import org.apache.sis.referencing.datum.GeodeticDatumMock; + /** * A simple implementation of {@link NormalizedProjection} as a "no-operation". diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java index b57c1e54b7..30707f921f 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java @@ -28,11 +28,11 @@ import org.apache.sis.referencing.operation.provider.PolarStereographicC; import org.apache.sis.referencing.operation.provider.PolarStereographicNorth; import org.apache.sis.referencing.operation.provider.PolarStereographicSouth; import org.apache.sis.referencing.operation.transform.CoordinateDomain; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.parameter.Parameters; // Test dependencies import org.junit.jupiter.api.Test; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ProjectionBenchmark.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ProjectionBenchmark.java index 86a9f9c9c7..dc529263a8 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ProjectionBenchmark.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ProjectionBenchmark.java @@ -31,9 +31,9 @@ import org.apache.sis.util.privy.Constants; import org.apache.sis.referencing.operation.provider.AbstractProvider; import org.apache.sis.referencing.operation.transform.LinearTransform; import org.apache.sis.referencing.operation.transform.MathTransforms; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; // Test dependencies +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.test.Benchmark; diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java index a54df0f84f..2683c54928 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/SatelliteTrackingTest.java @@ -26,11 +26,11 @@ import org.apache.sis.referencing.privy.NilReferencingObject; import org.apache.sis.referencing.operation.provider.SatelliteTracking; import org.apache.sis.measure.Units; import org.apache.sis.referencing.datum.DefaultEllipsoid; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java index 3a1af70f3a..aa4dba298d 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java @@ -19,7 +19,6 @@ package org.apache.sis.referencing.operation.projection; import org.opengis.util.FactoryException; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.operation.TransformException; -import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; import org.apache.sis.referencing.operation.provider.ZonedTransverseMercator; import org.apache.sis.referencing.privy.Formulas; import org.apache.sis.util.privy.Constants; @@ -30,6 +29,7 @@ import org.apache.sis.measure.Units; // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock; /** diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateDomain.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateDomain.java index 226b663ceb..535fefbae1 100644 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateDomain.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/CoordinateDomain.java @@ -20,9 +20,11 @@ import java.util.Random; import static java.lang.StrictMath.*; import org.apache.sis.measure.Latitude; import org.apache.sis.measure.Longitude; -import org.apache.sis.referencing.datum.GeodeticDatumMock; import static org.apache.sis.metadata.privy.ReferencingServices.AUTHALIC_RADIUS; +// Test dependencies +import org.apache.sis.referencing.datum.GeodeticDatumMock; + /** * The domain of input coordinates. diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/VariableTransformer.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/VariableTransformer.java index 3a15424bb4..a40600866b 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/VariableTransformer.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/VariableTransformer.java @@ -23,10 +23,10 @@ import java.time.ZoneOffset; import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; +import ucar.nc2.constants.CDM; import javax.measure.Unit; import javax.measure.UnitConverter; import javax.measure.quantity.Time; -import ucar.nc2.constants.CDM; import org.apache.sis.math.Vector; import org.apache.sis.measure.Units; import org.apache.sis.storage.DataStoreException; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java index ceabb95e9e..e9ce2f1d81 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/test/org/apache/sis/storage/netcdf/MetadataReaderTest.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.time.ZoneOffset; import java.time.LocalDateTime; import java.time.temporal.Temporal; +import static java.util.Map.entry; import org.opengis.metadata.Metadata; import org.opengis.metadata.citation.Role; import org.opengis.metadata.citation.Citation; @@ -32,17 +33,16 @@ import org.opengis.metadata.spatial.DimensionNameType; import org.opengis.metadata.spatial.CellGeometry; import org.opengis.metadata.maintenance.ScopeCode; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.DataStoreMock; import org.apache.sis.storage.netcdf.base.Decoder; // 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; import org.apache.sis.storage.netcdf.classic.ChannelDecoderTest; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import static java.util.Map.entry; import org.opengis.test.dataset.ContentVerifier; import org.opengis.test.dataset.TestData; diff --git 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 index 5bf3b2ffa8..c9856d40bf 100644 --- 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 @@ -21,7 +21,6 @@ import ucar.nc2.NetcdfFile; import org.apache.sis.storage.ProbeResult; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.DataStoreMock; import org.apache.sis.storage.netcdf.base.Decoder; import org.apache.sis.storage.netcdf.ucar.DecoderWrapper; import org.apache.sis.storage.netcdf.classic.ChannelDecoder; @@ -30,6 +29,7 @@ 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: diff --git 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 index 8bb79e7d3d..c34b3efeeb 100644 --- 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 @@ -28,7 +28,6 @@ import ucar.nc2.dataset.NetcdfDatasets; import ucar.nc2.dataset.NetcdfDataset; import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.DataStoreMock; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.netcdf.ucar.DecoderWrapper; import org.apache.sis.temporal.TemporalDate; @@ -41,6 +40,7 @@ import org.junit.jupiter.api.TestInstance; 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; diff --git a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java index c84a671fa1..96e31ebc8b 100644 --- a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java +++ b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java @@ -38,9 +38,9 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import static org.junit.jupiter.api.Assertions.*; +import org.apache.sis.storage.DataStoreMock; import static org.apache.sis.test.Assertions.assertMessageContains; import org.apache.sis.test.TestCase; -import org.apache.sis.storage.DataStoreMock; import org.apache.sis.metadata.sql.TestDatabase; import org.apache.sis.referencing.cs.HardCodedCS; import org.apache.sis.referencing.crs.HardCodedCRS; diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/event/StoreListenersTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/event/StoreListenersTest.java index d2175478cd..c2521dd2fc 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/event/StoreListenersTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/event/StoreListenersTest.java @@ -19,11 +19,11 @@ package org.apache.sis.storage.event; import java.util.logging.Level; import java.util.logging.LogRecord; import org.apache.sis.storage.Resource; -import org.apache.sis.storage.DataStoreMock; // 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.test.TestCase; diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java index 60e84b428b..f575f4e5ac 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java @@ -27,8 +27,8 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.ProbeResult; import org.apache.sis.storage.StorageConnector; -import static org.apache.sis.storage.DataStoreProvider.LOCATION; import org.apache.sis.storage.GridCoverageResource; +import static org.apache.sis.storage.DataStoreProvider.LOCATION; import org.apache.sis.storage.base.Capability; import org.apache.sis.storage.base.StoreMetadata; import org.apache.sis.storage.tiling.TiledResource; diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Group.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Group.java index 1626befc54..d97feb22ad 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Group.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Group.java @@ -20,13 +20,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Optional; +import org.opengis.util.GenericName; import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.Aggregate; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.Resource; import org.apache.sis.storage.gimi.isobmff.iso14496_12.EntityToGroup; import org.apache.sis.util.iso.Names; -import org.opengis.util.GenericName; + /** * An unidentified group of entities. diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java index 97ec9991e7..ee2ae02db3 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java @@ -22,6 +22,7 @@ import java.util.Optional; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.MathTransform; import org.opengis.util.GenericName; +import org.opengis.util.FactoryException; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.grid.GridExtent; import org.apache.sis.coverage.grid.GridGeometry; @@ -40,7 +41,6 @@ import org.apache.sis.storage.tiling.TileMatrix; import org.apache.sis.storage.tiling.TileMatrixSet; import org.apache.sis.storage.tiling.TiledResource; import org.apache.sis.util.iso.Names; -import org.opengis.util.FactoryException; /** diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java index 13aeacf04f..a1c44bb3d4 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java @@ -35,6 +35,7 @@ import java.util.Optional; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.util.FactoryException; import org.opengis.util.GenericName; +import org.opengis.referencing.operation.MathTransform; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.grid.GridCoverage; import org.apache.sis.coverage.grid.GridExtent; @@ -56,7 +57,6 @@ import org.apache.sis.storage.gimi.isobmff.iso23001_17.UncompressedFrameConfig; import org.apache.sis.storage.gimi.isobmff.iso23008_12.ImageSpatialExtents; import org.apache.sis.storage.gimi.isobmff.iso23008_12.PixelInformationProperty; import org.apache.sis.util.iso.Names; -import org.opengis.referencing.operation.MathTransform; /** diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java index 85dc8d3051..2c2d388b98 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java @@ -25,6 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Optional; import org.opengis.util.GenericName; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.opengis.referencing.operation.MathTransform; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.grid.GridCoverage; import org.apache.sis.coverage.grid.GridExtent; @@ -47,8 +49,6 @@ import org.apache.sis.storage.tiling.TileMatrix; import org.apache.sis.storage.tiling.TileMatrixSet; import org.apache.sis.storage.tiling.TiledResource; import org.apache.sis.util.iso.Names; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; /** diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java index 0994f09d74..b9e5d58f9c 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java @@ -17,12 +17,12 @@ package org.apache.sis.storage.gimi; import java.util.Optional; +import org.opengis.util.GenericName; import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.base.StoreResource; import org.apache.sis.util.iso.Names; -import org.opengis.util.GenericName; /** diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java index d3f422c45a..ead0898e57 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java @@ -17,10 +17,10 @@ package org.apache.sis.storage.gimi.isobmff.gimi; import java.io.IOException; +import org.opengis.referencing.operation.MathTransform; import org.apache.sis.referencing.privy.AffineTransform2D; import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader; import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty; -import org.opengis.referencing.operation.MathTransform; /** diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java index 922213d3db..c727eb3db9 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/TiledImageConfigurationBox.java @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.sis.storage.gimi.isobmff.FullBox; import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader; + /** * Definition from OGC TestBed 20 : tild.pdf * diff --git a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java index 2b5560e9fd..52eb9e091c 100644 --- a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java +++ b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java @@ -17,11 +17,11 @@ package org.apache.sis.storage.gimi.isobmff.gimi; import java.io.IOException; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.opengis.util.FactoryException; import org.apache.sis.referencing.CRS; import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader; import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.util.FactoryException; /** diff --git a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java index e08338175f..9fd88dddc9 100644 --- a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java +++ b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java @@ -34,6 +34,7 @@ import org.apache.sis.storage.gsf.panama.LibraryStatus; import org.apache.sis.storage.gsf.panama.NativeFunctions; import org.apache.sis.util.logging.Logging; + /** * Binding for GSFLib version 3.09. * Version 3.10 introduce breaking changes. diff --git a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFException.java b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFException.java index 5edddac68f..cebc9b7c07 100644 --- a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFException.java +++ b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFException.java @@ -18,6 +18,7 @@ package org.apache.sis.storage.gsf; import org.apache.sis.storage.DataStoreException; + /** * * @author Johann Sorel (Geomatys) diff --git a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStore.java b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStore.java index 644c74445c..8e75d2d67c 100644 --- a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStore.java +++ b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFStore.java @@ -19,14 +19,15 @@ package org.apache.sis.storage.gsf; import java.net.URI; import java.nio.file.Path; import java.util.Optional; +import org.opengis.metadata.Metadata; +import org.opengis.parameter.ParameterValueGroup; import org.apache.sis.parameter.Parameters; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.base.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; -import org.opengis.metadata.Metadata; -import org.opengis.parameter.ParameterValueGroup; + /** * diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Driver.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Driver.java index aa71bf3d03..81a5d23b2b 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Driver.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Driver.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.Optional; import java.util.Objects; import java.net.URI; -import java.nio.file.Path; import java.io.IOException; +import java.nio.file.Path; import java.lang.foreign.Arena; import java.lang.foreign.FunctionDescriptor; import java.lang.foreign.MemorySegment; diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Subdataset.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Subdataset.java index 842e3d357f..fe9a7d1ee6 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Subdataset.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Subdataset.java @@ -18,8 +18,8 @@ package org.apache.sis.storage.gdal; import java.util.List; import java.util.Optional; -import org.apache.sis.storage.DataStoreException; import org.opengis.parameter.ParameterValueGroup; +import org.apache.sis.storage.DataStoreException; /** diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java index c72bc57fa3..7aa9d08744 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledResource.java @@ -48,8 +48,8 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.base.MetadataBuilder; import org.apache.sis.storage.base.TiledGridResource; -import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.ArraysExt; +import org.apache.sis.util.resources.Vocabulary; /** diff --git a/optional/src/org.apache.sis.storage.gdal/test/org/apache/sis/storage/gdal/GDALStoreTest.java b/optional/src/org.apache.sis.storage.gdal/test/org/apache/sis/storage/gdal/GDALStoreTest.java index 09f2b0e091..8524810b19 100644 --- a/optional/src/org.apache.sis.storage.gdal/test/org/apache/sis/storage/gdal/GDALStoreTest.java +++ b/optional/src/org.apache.sis.storage.gdal/test/org/apache/sis/storage/gdal/GDALStoreTest.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.gdal; import java.util.Collection; +import java.io.IOException; import java.nio.file.Path; import java.nio.file.Files; -import java.io.IOException; import java.awt.image.DataBuffer; import java.awt.image.RenderedImage; import org.opengis.util.GenericName; @@ -41,6 +41,7 @@ import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.ProbeResult; +// Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;