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 2330bb247ded208d8722cbb88753310cd9b0bd68 Merge: 763417be3b 84d2ffda54 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Dec 30 15:02:11 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 +- .../org/apache/sis/referencing/internal/ServicesForMetadata.java | 1 - .../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/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 | 5 ++--- .../test/org/apache/sis/storage/shapefile/Snippets.java | 6 +++--- .../test/org/apache/sis/storage/shapefile/dbf/Snippets.java | 1 + .../test/org/apache/sis/storage/shapefile/shp/Snippets.java | 5 +++-- 19 files changed, 27 insertions(+), 28 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java index 788de0ff10,ebbf8fe086..27244392e9 --- 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 @@@ -24,9 -24,9 +24,9 @@@ import org.apache.sis.util.internal.Num 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; +// Specific to the main branch: - import org.apache.sis.coverage.CannotEvaluateException; +import org.opengis.geometry.MismatchedDimensionException; ++import org.apache.sis.coverage.CannotEvaluateException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java index 6431f96a16,5e65868b06..36cd10d2ce --- 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 @@@ -60,7 -59,7 +60,6 @@@ import org.apache.sis.metadata.iso.exte import org.apache.sis.metadata.iso.extent.DefaultTemporalExtent; import org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent; import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox; --import org.apache.sis.metadata.internal.ReferencingServices; import org.apache.sis.measure.Latitude; import org.apache.sis.measure.Longitude; import org.apache.sis.system.Modules; diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index b656460dfd,b3db8bf79b..24c056852f --- 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 @@@ -63,8 -63,9 +61,11 @@@ import org.opengis.metadata.Metadata import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.TransformException; +import org.opengis.util.FactoryException; +import org.opengis.util.GenericName; + 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; diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java index 2c8c04de8e,a5f743e706..7de025af78 --- 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 @@@ -47,12 -47,12 +47,11 @@@ import static org.junit.jupiter.api.Ass import org.junit.Ignore; import org.junit.Test; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.AttributeType; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.filter.BinaryComparisonOperator; -import org.opengis.filter.FilterFactory; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.DefaultAttributeType; - import org.apache.sis.filter.DefaultFilterFactory; +import org.apache.sis.filter.Filter; /** diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java index 64f8f10b9a,ef5acb82c4..f76cb70704 --- 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 @@@ -26,14 -29,12 +29,11 @@@ import org.apache.sis.geometry.GeneralE 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; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.filter.Filter; /**
