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 721b3a76efafac87b390b370349f97c1565df88b Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sat Dec 30 14:54:36 2023 +0100 Automatic import reorganization for tests and branch-specific dependencies. --- .../main/org/apache/sis/console/MimeTypeCommand.java | 2 +- .../main/org/apache/sis/coverage/grid/DimensionAppender.java | 2 +- .../sis/metadata/iso/extent/NotSpatioTemporalException.java | 2 +- .../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +- .../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +- .../main/org/apache/sis/storage/DataOptionKey.java | 2 +- .../main/org/apache/sis/storage/StorageConnector.java | 4 ++-- .../org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +- .../main/org/apache/sis/storage/aggregate/DimensionAppender.java | 4 +++- .../main/org/apache/sis/storage/base/URIDataStore.java | 2 +- .../main/org/apache/sis/measure/UnitFormat.java | 2 +- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 9 ++++----- .../apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java | 3 +-- .../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 1 + .../main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java | 2 +- .../org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 4 ++-- .../test/org/apache/sis/storage/shapefile/Snippets.java | 9 ++++++--- .../test/org/apache/sis/storage/shapefile/dbf/Snippets.java | 1 + .../test/org/apache/sis/storage/shapefile/shp/Snippets.java | 5 +++-- 19 files changed, 33 insertions(+), 27 deletions(-) diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java index 5ee89f7c6e..46bd3b4ca5 100644 --- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java +++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java @@ -17,9 +17,9 @@ package org.apache.sis.console; import java.util.Arrays; +import java.util.EnumSet; import java.net.URI; import java.net.URISyntaxException; -import java.util.EnumSet; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.NoSuchFileException; diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java index d3fac44fe9..ebbf8fe086 100644 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java @@ -20,13 +20,13 @@ import java.awt.image.RenderedImage; import org.opengis.util.FactoryException; import org.apache.sis.image.DataType; import org.apache.sis.util.ArraysExt; -import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.internal.Numerics; import org.apache.sis.feature.internal.Resources; import org.apache.sis.coverage.SubspaceNotSpecifiedException; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coverage.CannotEvaluateException; +import org.apache.sis.util.ArgumentChecks; /** diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java index b0cd09874f..b19f777cfa 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java @@ -20,8 +20,8 @@ import org.opengis.geometry.Envelope; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.TransformException; import org.apache.sis.metadata.internal.Resources; -import org.apache.sis.util.resources.Errors; import org.apache.sis.util.Workaround; +import org.apache.sis.util.resources.Errors; /** diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java index 141eef9d9a..8bcf51b700 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java @@ -20,11 +20,11 @@ import java.io.IOException; import jakarta.xml.bind.JAXBException; import org.opengis.metadata.citation.Citation; import org.opengis.metadata.identification.DataIdentification; +import org.apache.sis.metadata.xml.TestUsingFile; // Test dependencies import org.junit.Test; import static org.junit.jupiter.api.Assertions.*; -import org.apache.sis.metadata.xml.TestUsingFile; import org.apache.sis.metadata.iso.citation.DefaultCitationTest; import static org.apache.sis.test.TestUtilities.getSingleton; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java index 0477b3cfc4..7502cde1f8 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java @@ -57,11 +57,11 @@ import org.apache.sis.util.ArraysExt; import org.apache.sis.util.Numbers; import org.apache.sis.util.CharSequences; import org.apache.sis.util.resources.Vocabulary; +import org.apache.sis.util.resources.Errors; import org.apache.sis.util.internal.UnmodifiableArrayList; import org.apache.sis.util.internal.Numerics; import org.apache.sis.util.internal.Strings; import org.apache.sis.metadata.iso.DefaultMetadata; -import org.apache.sis.util.resources.Errors; import org.apache.sis.math.Vector; import org.apache.sis.measure.NumberRange; import org.apache.sis.image.DataType; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java index 116ff542cf..d9bff17d4d 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java @@ -16,8 +16,8 @@ */ package org.apache.sis.storage; -import java.nio.file.Path; import java.io.ObjectStreamException; +import java.nio.file.Path; import static java.util.logging.Logger.getLogger; import org.apache.sis.util.logging.Logging; import org.apache.sis.system.Modules; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java index cb71f7fcf5..5b48411fb2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java @@ -62,6 +62,8 @@ import org.apache.sis.util.collection.TableColumn; import org.apache.sis.util.collection.DefaultTreeTable; import org.apache.sis.util.collection.Containers; import org.apache.sis.storage.internal.Resources; +import org.apache.sis.storage.internal.InputStreamAdapter; +import org.apache.sis.storage.internal.RewindableLineReader; import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.io.InvalidSeekException; import org.apache.sis.io.stream.IOUtilities; @@ -72,8 +74,6 @@ import org.apache.sis.io.stream.ChannelDataOutput; import org.apache.sis.io.stream.ChannelImageInputStream; import org.apache.sis.io.stream.ChannelImageOutputStream; import org.apache.sis.io.stream.InternalOptionKey; -import org.apache.sis.storage.internal.InputStreamAdapter; -import org.apache.sis.storage.internal.RewindableLineReader; import org.apache.sis.system.Configuration; import org.apache.sis.setup.OptionKey; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java index 5e6b9c868a..087e8d04ec 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java @@ -35,9 +35,9 @@ import org.opengis.referencing.crs.SingleCRS; import org.opengis.referencing.datum.PixelInCell; import org.opengis.referencing.operation.MathTransform; import org.opengis.referencing.operation.NoninvertibleTransformException; +import org.apache.sis.referencing.CommonCRS; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.referencing.crs.DefaultTemporalCRS; -import org.apache.sis.referencing.CommonCRS; import org.apache.sis.image.Colorizer; import org.apache.sis.storage.Resource; import org.apache.sis.storage.Aggregate; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java index d25ac1af63..797856cbe2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java @@ -39,10 +39,12 @@ import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.event.StoreEvent; import org.apache.sis.storage.event.StoreListener; import org.apache.sis.storage.internal.Resources; -import org.apache.sis.util.ArraysExt; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.logging.Logging; +// Specific to the geoapi-3.1 and geoapi-4.0 branches: +import org.apache.sis.util.ArraysExt; + /** * A wrapper over an existing grid coverage resource with dimensions appended. diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java index 856b34f6f8..19f1594095 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java @@ -24,12 +24,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.io.IOException; import java.net.URI; +import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Files; import java.nio.file.OpenOption; import java.nio.file.StandardOpenOption; import java.nio.charset.Charset; -import java.net.URISyntaxException; import jakarta.xml.bind.JAXBException; import org.opengis.util.GenericName; import org.opengis.parameter.ParameterValueGroup; diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java index 640f7dac9e..5b3f7f4414 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java @@ -42,10 +42,10 @@ import org.apache.sis.util.Localized; import org.apache.sis.util.CorruptedObjectException; import org.apache.sis.util.internal.Constants; import org.apache.sis.util.internal.DefinitionURI; +import org.apache.sis.util.internal.Strings; import org.apache.sis.math.Fraction; import org.apache.sis.math.MathFunctions; import org.apache.sis.util.resources.Errors; -import org.apache.sis.util.internal.Strings; import org.apache.sis.util.collection.WeakValueHashMap; import org.apache.sis.util.logging.Logging; diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index 9a77f574bc..b3db8bf79b 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@ -18,8 +18,8 @@ package org.apache.sis.storage.shapefile; import java.awt.geom.Rectangle2D; import java.io.IOException; -import java.math.BigInteger; import java.nio.ByteBuffer; +import java.math.BigInteger; import java.nio.channels.SeekableByteChannel; import java.nio.channels.WritableByteChannel; import java.nio.charset.Charset; @@ -49,8 +49,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; import java.util.stream.StreamSupport; - -import org.apache.sis.geometry.ImmutableEnvelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.MultiLineString; @@ -65,6 +63,9 @@ import org.opengis.metadata.Metadata; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.TransformException; +import org.apache.sis.geometry.ImmutableEnvelope; +import org.apache.sis.geometry.Envelopes; +import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.feature.builder.AttributeRole; import org.apache.sis.feature.builder.AttributeTypeBuilder; import org.apache.sis.feature.builder.FeatureTypeBuilder; @@ -72,8 +73,6 @@ import org.apache.sis.feature.internal.AttributeConvention; import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.filter.Optimization; import org.apache.sis.filter.internal.FunctionNames; -import org.apache.sis.geometry.Envelopes; -import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.geometry.wrapper.Geometries; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.io.stream.ChannelDataOutput; diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java index 98aef27229..dc1e7a04c9 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java @@ -22,12 +22,11 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; - -import org.apache.sis.geometry.GeneralDirectPosition; import org.locationtech.jts.geom.*; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.locationtech.jts.algorithm.Orientation; import org.locationtech.jts.algorithm.RayCrossingCounter; +import org.apache.sis.geometry.GeneralDirectPosition; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.io.stream.ChannelDataOutput; diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java index f288e045f4..a0cdad14aa 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java @@ -24,6 +24,7 @@ import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.io.stream.ChannelDataOutput; + /** * A record in a shape file. * Contains a unique record number and it's associated geometry. diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java index ccce608141..d1cf62abc2 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java @@ -17,10 +17,10 @@ package org.apache.sis.storage.shapefile.shp; import java.io.IOException; +import org.locationtech.jts.geom.Geometry; import org.apache.sis.io.stream.ChannelDataOutput; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.geometry.ImmutableEnvelope; -import org.locationtech.jts.geom.Geometry; /** diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java index 4ea5bcbb25..a5f743e706 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java @@ -29,11 +29,11 @@ import java.util.Iterator; import java.util.List; import java.util.function.UnaryOperator; import java.util.stream.Stream; -import org.apache.sis.feature.builder.FeatureTypeBuilder; -import org.apache.sis.util.Utilities; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Point; +import org.apache.sis.feature.builder.FeatureTypeBuilder; +import org.apache.sis.util.Utilities; import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.referencing.CommonCRS; diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java index 99f9057133..ef5acb82c4 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java @@ -20,20 +20,23 @@ import java.io.IOException; import java.nio.file.Paths; import java.util.List; import java.util.stream.Stream; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.Point; import org.apache.sis.feature.builder.FeatureTypeBuilder; import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.referencing.CommonCRS; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.FeatureQuery; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.Point; + +// Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.feature.Feature; import org.opengis.feature.FeatureType; import org.opengis.filter.BinarySpatialOperator; import org.opengis.filter.FilterFactory; + /** * * @author Johann Sorel (Geomatys) diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java index 0813919903..b0f688c185 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java @@ -29,6 +29,7 @@ import org.apache.sis.setup.OptionKey; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.StorageConnector; + /** * * @author Johann Sorel (Geomatys) diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java index 9ba5ee2e12..cfaaa30550 100644 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java @@ -20,13 +20,14 @@ import java.io.IOException; import java.nio.file.OpenOption; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.GeometryFactory; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.io.stream.ChannelDataOutput; import org.apache.sis.setup.OptionKey; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.StorageConnector; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.GeometryFactory; + /** *