This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 63c9dc02ec675b9e42554e66ea002228a19987c0 Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri May 15 17:23:20 2026 +0200 Move the storage metadata helper classes to a separated package. This is in anticipation for the addition of more types. --- .../main/org/apache/sis/storage/landsat/BandGroup.java | 2 +- .../main/org/apache/sis/storage/landsat/MetadataReader.java | 2 +- .../main/org/apache/sis/storage/geotiff/GeoTiffStore.java | 2 +- .../main/org/apache/sis/storage/geotiff/Writer.java | 2 +- .../sis/storage/geotiff/reader/GridGeometryBuilder.java | 2 +- .../sis/storage/geotiff/reader/ImageMetadataBuilder.java | 2 +- .../org/apache/sis/storage/geotiff/reader/XMLMetadata.java | 2 +- .../org/apache/sis/storage/geotiff/writer/GeoEncoder.java | 2 +- .../apache/sis/storage/geotiff/reader/XMLMetadataTest.java | 2 +- .../main/org/apache/sis/storage/netcdf/MetadataReader.java | 2 +- .../main/org/apache/sis/storage/netcdf/base/Decoder.java | 2 +- .../org/apache/sis/storage/netcdf/base/RasterResource.java | 2 +- .../apache/sis/storage/netcdf/classic/ChannelDecoder.java | 2 +- .../org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java | 2 +- .../main/org/apache/sis/storage/sql/SQLStore.java | 2 +- .../main/org/apache/sis/storage/sql/feature/Database.java | 2 +- .../main/org/apache/sis/storage/gpx/Types.java | 2 +- endorsed/src/org.apache.sis.storage/main/module-info.java | 13 +++++++++++++ .../main/org/apache/sis/storage/AbstractFeatureSet.java | 2 +- .../apache/sis/storage/AbstractGridCoverageResource.java | 2 +- .../main/org/apache/sis/storage/AbstractResource.java | 2 +- .../main/org/apache/sis/storage/CoverageSubset.java | 2 +- .../main/org/apache/sis/storage/FeatureSubset.java | 2 +- .../apache/sis/storage/aggregate/AggregatedFeatureSet.java | 2 +- .../apache/sis/storage/aggregate/AggregatedResource.java | 2 +- .../sis/storage/aggregate/BandAggregateGridResource.java | 2 +- .../sis/storage/aggregate/ConcatenatedGridResource.java | 2 +- .../org/apache/sis/storage/aggregate/GroupAggregate.java | 2 +- .../main/org/apache/sis/storage/base/CodeType.java | 12 ++++++------ .../apache/sis/storage/base/DocumentedStoreProvider.java | 2 +- .../main/org/apache/sis/storage/base/URIDataStore.java | 1 + .../main/org/apache/sis/storage/base/package-info.java | 2 +- .../main/org/apache/sis/storage/csv/Store.java | 2 +- .../main/org/apache/sis/storage/esri/RasterStore.java | 2 +- .../main/org/apache/sis/storage/folder/Store.java | 2 +- .../main/org/apache/sis/storage/image/WorldFileStore.java | 2 +- .../apache/sis/storage/{base => metadata}/LegalSymbols.java | 3 ++- .../sis/storage/{base => metadata}/MetadataBuilder.java | 3 ++- .../sis/storage/{base => metadata}/MetadataFetcher.java | 8 ++++---- .../sis/storage/{base => metadata}/ResourceLineage.java | 2 +- .../apache/sis/storage/{base => metadata}/package-info.java | 4 ++-- .../main/org/apache/sis/storage/tiling/TileMatrix.java | 2 +- .../main/org/apache/sis/storage/tiling/TileMatrixSet.java | 2 +- .../main/org/apache/sis/storage/wkt/Store.java | 2 +- .../main/org/apache/sis/storage/xml/Store.java | 2 +- .../sis/storage/{base => metadata}/MetadataBuilderTest.java | 2 +- .../apache/sis/storage/coveragejson/CoverageJsonStore.java | 2 +- .../org/apache/sis/storage/geoheif/CoverageBuilder.java | 2 +- .../main/org/apache/sis/storage/geoheif/GeoHeifStore.java | 2 +- .../main/org/apache/sis/storage/isobmff/Box.java | 2 +- .../main/org/apache/sis/storage/isobmff/ContainerBox.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/Copyright.java | 2 +- .../sis/storage/isobmff/base/FDItemInfoExtension.java | 2 +- .../org/apache/sis/storage/isobmff/base/ItemInfoEntry.java | 2 +- .../org/apache/sis/storage/isobmff/base/ItemReference.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/Meta.java | 2 +- .../apache/sis/storage/isobmff/image/UserDescription.java | 2 +- .../main/org/apache/sis/storage/geopackage/Content.java | 2 +- .../main/org/apache/sis/storage/gsf/GSFStore.java | 2 +- .../main/org/apache/sis/storage/gdal/GDALStore.java | 2 +- .../main/org/apache/sis/storage/gdal/TiledResource.java | 2 +- 61 files changed, 84 insertions(+), 68 deletions(-) diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java index 44249a07d6..9259354c82 100644 --- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java +++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java @@ -32,7 +32,7 @@ import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.base.StoreResource; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.collection.Containers; diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java index af026e8858..348fa06f0b 100644 --- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java +++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java @@ -64,7 +64,7 @@ import org.apache.sis.referencing.internal.shared.GeodeticObjectBuilder; import org.apache.sis.referencing.internal.shared.ReferencingFactoryContainer; import org.apache.sis.referencing.operation.provider.PolarStereographicB; import org.apache.sis.referencing.operation.provider.TransverseMercator; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.operation.MathTransform; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java index b7eea15c13..d51bdcebcd 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java @@ -48,7 +48,7 @@ import org.apache.sis.storage.ReadOnlyStorageException; import org.apache.sis.storage.WriteOnlyStorageException; import org.apache.sis.storage.IncompatibleResourceException; import org.apache.sis.storage.IllegalNameException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.storage.base.URIDataStoreProvider; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java index 0dea85ff12..be885bc0f8 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java @@ -46,7 +46,7 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.IncompatibleResourceException; import org.apache.sis.storage.ReadOnlyStorageException; -import org.apache.sis.storage.base.MetadataFetcher; +import org.apache.sis.storage.metadata.MetadataFetcher; import org.apache.sis.storage.geotiff.writer.TagValue; import org.apache.sis.storage.geotiff.writer.TileMatrix; import org.apache.sis.storage.geotiff.writer.GeoEncoder; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/GridGeometryBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/GridGeometryBuilder.java index ec1d0d93ed..35b5c0a569 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/GridGeometryBuilder.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/GridGeometryBuilder.java @@ -38,7 +38,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS; import org.apache.sis.referencing.operation.matrix.Matrices; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.geotiff.base.Resources; import org.apache.sis.util.internal.shared.DoubleDouble; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java index bdc9dd1331..a0819d454e 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/ImageMetadataBuilder.java @@ -22,7 +22,7 @@ import javax.measure.quantity.Length; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.geotiff.GeoTiffStore; import org.apache.sis.storage.geotiff.base.Resources; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.util.resources.Errors; import org.apache.sis.measure.Units; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java index fc8ae4e450..2821586bff 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/reader/XMLMetadata.java @@ -40,7 +40,7 @@ import javax.xml.namespace.QName; import jakarta.xml.bind.JAXBException; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.temporal.LenientDateFormat; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.geotiff.base.Tags; import org.apache.sis.util.collection.TreeTable; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java index 50047389e1..8071320a7c 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/writer/GeoEncoder.java @@ -79,7 +79,7 @@ import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.PixelInCell; import org.apache.sis.coverage.grid.IncompleteGridGeometryException; import org.apache.sis.storage.IncompatibleResourceException; -import org.apache.sis.storage.base.MetadataFetcher; +import org.apache.sis.storage.metadata.MetadataFetcher; import org.apache.sis.storage.geotiff.base.UnitKey; import org.apache.sis.storage.geotiff.base.GeoKeys; import org.apache.sis.storage.geotiff.base.GeoCodes; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/XMLMetadataTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/XMLMetadataTest.java index bb3093b660..0f78c32b10 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/XMLMetadataTest.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/reader/XMLMetadataTest.java @@ -17,7 +17,7 @@ package org.apache.sis.storage.geotiff.reader; import org.apache.sis.metadata.iso.DefaultMetadata; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.xml.Namespaces; import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.util.collection.DefaultTreeTable; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java index 655c714107..191f1a4d7b 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java @@ -51,7 +51,7 @@ import org.apache.sis.metadata.iso.DefaultMetadata; import org.apache.sis.metadata.iso.citation.*; import org.apache.sis.metadata.iso.identification.*; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.netcdf.base.Axis; import org.apache.sis.storage.netcdf.base.Decoder; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java index 50634f326d..18b8f64d17 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java @@ -39,7 +39,7 @@ import org.apache.sis.system.Modules; import org.apache.sis.setup.GeometryLibrary; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.netcdf.internal.Resources; import org.apache.sis.util.Utilities; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java index ee90326291..d3165d88a2 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java @@ -35,7 +35,7 @@ import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.Resource; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.StoreResource; import org.apache.sis.util.CharSequences; import org.apache.sis.util.internal.shared.Strings; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java index c63353e35f..8c8c1ecd36 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java @@ -44,7 +44,7 @@ import org.opengis.parameter.InvalidParameterCardinalityException; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.netcdf.base.DataType; import org.apache.sis.storage.netcdf.base.Decoder; import org.apache.sis.storage.netcdf.base.Node; diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java index a6a8dc281e..697d959a21 100644 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DecoderWrapper.java @@ -52,7 +52,7 @@ import org.apache.sis.metadata.sql.MetadataSource; import org.apache.sis.metadata.sql.MetadataStoreException; import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.netcdf.base.Decoder; import org.apache.sis.storage.netcdf.base.Variable; diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java index 6c8bce2ee2..096efde53d 100644 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java @@ -47,7 +47,7 @@ import org.apache.sis.storage.sql.feature.Database; import org.apache.sis.storage.sql.feature.Resources; import org.apache.sis.storage.sql.feature.SchemaModifier; import org.apache.sis.storage.sql.feature.InfoStatements; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.io.stream.InternalOptionKey; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ArraysExt; diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java index bedd4d2668..f803411ac6 100644 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java @@ -54,7 +54,7 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.IllegalNameException; import org.apache.sis.storage.sql.SQLStore; import org.apache.sis.storage.sql.ResourceDefinition; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.filter.base.WarningEvent; import org.apache.sis.geometry.wrapper.Geometries; diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java index 2b438969be..3819d827c0 100644 --- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java +++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Types.java @@ -40,7 +40,7 @@ import org.apache.sis.feature.builder.PropertyTypeBuilder; import org.apache.sis.feature.builder.AttributeRole; import org.apache.sis.feature.internal.shared.AttributeConvention; import org.apache.sis.geometry.wrapper.Geometries; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.util.iso.DefaultNameFactory; // Specific to the geoapi-3.1 and geoapi-4.0 branches: diff --git a/endorsed/src/org.apache.sis.storage/main/module-info.java b/endorsed/src/org.apache.sis.storage/main/module-info.java index 5973ec510e..4a43ba85e5 100644 --- a/endorsed/src/org.apache.sis.storage/main/module-info.java +++ b/endorsed/src/org.apache.sis.storage/main/module-info.java @@ -65,6 +65,19 @@ module org.apache.sis.storage { org.apache.sis.openoffice, org.apache.sis.gui; // In the "optional" sub-project. + exports org.apache.sis.storage.metadata to + org.apache.sis.storage.xml, + org.apache.sis.storage.sql, + org.apache.sis.storage.netcdf, + org.apache.sis.storage.geotiff, + org.apache.sis.storage.earthobservation, + org.apache.sis.storage.coveragejson, // In the "incubator" sub-project. + org.apache.sis.storage.geoheif, // In the "incubator" sub-project. + org.apache.sis.storage.geopackage, // In the "incubator" sub-project. + org.apache.sis.storage.gsf, // In the "incubator" sub-project. + org.apache.sis.storage.gdal, // In the "optional" sub-project. + org.apache.sis.gui; // In the "optional" sub-project. + exports org.apache.sis.io.stream to org.apache.sis.storage.xml, org.apache.sis.storage.sql, diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractFeatureSet.java index d9cf12ac8a..7a4080689b 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractFeatureSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractFeatureSet.java @@ -23,7 +23,7 @@ import java.util.function.Consumer; import org.opengis.util.GenericName; import org.opengis.metadata.Metadata; import org.apache.sis.storage.event.StoreListeners; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.WarningAdapter; import org.apache.sis.filter.Optimization; import org.apache.sis.filter.base.WarningEvent; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java index 749208b422..1f25184b5f 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java @@ -39,7 +39,7 @@ import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridExtent; import org.apache.sis.coverage.grid.DisjointExtentException; import org.apache.sis.coverage.grid.PixelInCell; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.internal.Resources; import org.apache.sis.measure.Latitude; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractResource.java index 7efdf61d4f..65ac2e4767 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractResource.java @@ -30,7 +30,7 @@ import org.apache.sis.storage.event.StoreEvent; import org.apache.sis.storage.event.StoreListener; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.internal.Resources; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.logging.Logging; import org.apache.sis.xml.NilReason; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java index d1be9768ed..9191577413 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java @@ -34,7 +34,7 @@ import org.apache.sis.coverage.grid.DisjointExtentException; import org.apache.sis.coverage.internal.shared.RangeArgument; import org.apache.sis.referencing.internal.shared.DirectPositionView; import org.apache.sis.storage.internal.Resources; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.util.collection.BackingStoreException; import org.apache.sis.pending.jdk.JDK16; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java index df9e4468e4..e1cfd8b828 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java @@ -21,7 +21,7 @@ import java.util.stream.Stream; import org.opengis.metadata.Metadata; import org.apache.sis.filter.Optimization; import org.apache.sis.feature.internal.shared.FeatureProjection; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.internal.Resources; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java index 6a7e1f17b2..2fbc724929 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java @@ -30,7 +30,7 @@ import org.apache.sis.storage.Resource; import org.apache.sis.storage.FeatureSet; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.AbstractFeatureSet; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.feature.FeatureType; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedResource.java index 6483743206..53dab749ef 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/AggregatedResource.java @@ -27,7 +27,7 @@ import org.apache.sis.storage.DataSet; import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.event.StoreListeners; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.geometry.Envelopes; import org.apache.sis.geometry.ImmutableEnvelope; import org.apache.sis.util.internal.shared.Strings; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java index 5e465d0cdc..aeeb43b3c1 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java @@ -31,7 +31,7 @@ import org.apache.sis.storage.AbstractGridCoverageResource; import org.apache.sis.storage.RasterLoadingStrategy; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.MemoryGridCoverageResource; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.collection.BackingStoreException; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java index 3d5837f971..16f1f76de2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java @@ -37,7 +37,7 @@ import org.apache.sis.storage.GridCoverageResource; import org.apache.sis.storage.MemoryGridCoverageResource; import org.apache.sis.storage.RasterLoadingStrategy; import org.apache.sis.storage.event.StoreListeners; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.util.ArraysExt; import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.collection.BackingStoreException; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java index dcb0b27e05..f45602bc48 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java @@ -23,7 +23,7 @@ import org.apache.sis.storage.Aggregate; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.GridCoverageResource; import org.apache.sis.storage.event.StoreListeners; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.util.collection.Containers; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java index 2a1dcf9709..14e0859157 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java @@ -27,7 +27,7 @@ import org.apache.sis.util.internal.shared.DefinitionURI; /** * Heuristic rules for determining whether an authority code seems to be actually a file path, - * or a code defined in the URN namespace, or a simple code. + * or a code defined in the <abbr>URN</abbr> namespace, or a simple authority code. * * @author Martin Desruisseaux (IRD, Geomatys) */ @@ -39,9 +39,9 @@ public enum CodeType { FILE(false, false), /** - * The code is a URL like {@code "http:"} or {@code "file:"}, - * with the exception of HTTP in the "www.opengis.net" domain. - * The latter case is identified by {@link #HTTP_OGC} instead of this enum. + * The code is a <abbr>URL</abbr> like {@code "http:"} or {@code "file:"}, + * with the exception of <abbr>HTTP</abbr> in the {@code "www.opengis.net"} domain. + * The latter case is identified by {@link #HTTP_OGC} instead of this enumeration value. */ URL(false, true), @@ -51,7 +51,7 @@ public enum CodeType { URN(true, true), /** - * The code is an URL in the {@code "http://www.opengis.net"} namespace. + * The code is an <abbr>URL</abbr> in the {@code "http://www.opengis.net"} namespace. */ HTTP_OGC(true, true), @@ -114,7 +114,7 @@ public enum CodeType { * Infers the type for the given authority code. * * @param codeOrPath the code or file path. - * @return whether the given argument seems to be a file path, URL, URN of authority code. + * @return whether the given argument seems to be a file path, <abbr>URL</abbr>, <abbr>URN</abbr> of authority code. */ public static CodeType guess(final String codeOrPath) { final int length = codeOrPath.length(); diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java index 8231954996..6e33c3522d 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java @@ -27,7 +27,7 @@ import org.apache.sis.system.Modules; /** - * Base class of data store providers having an entry in the metadata SQL database. + * Base class of data store providers having an entry in the metadata <abbr>SQL</abbr> database. * The primary key in the {@code MD_Format} table must be the name given at construction time. * * @author Martin Desruisseaux (Geomatys) 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 33df2902b2..0e610d9174 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 @@ -47,6 +47,7 @@ import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.ReadOnlyStorageException; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.internal.Resources; import org.apache.sis.io.stream.IOUtilities; import org.apache.sis.util.ArraysExt; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java index 881aa66126..35acb306de 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java @@ -16,7 +16,7 @@ */ /** - * Base classes for the implementation of SIS storages. + * Base classes for the implementation of Apache <abbr>SIS</abbr> data stores. * * <STRONG>Do not use!</STRONG> * diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java index 74ba1d6c77..a773d56db7 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java @@ -61,7 +61,7 @@ import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.FeatureSet; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.storage.internal.RewindableLineReader; import org.apache.sis.storage.internal.Resources; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java index 3c41ec7eeb..225590bc00 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java @@ -42,7 +42,7 @@ import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.base.PRJDataStore; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.image.internal.shared.ColorModelFactory; import org.apache.sis.image.internal.shared.ColorModelBuilder; import org.apache.sis.image.internal.shared.ObservableImage; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java index a1e57ae6aa..6e50f868da 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java @@ -49,7 +49,7 @@ import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.UnsupportedStorageException; import org.apache.sis.storage.aggregate.CoverageAggregator; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.base.StoreResource; import org.apache.sis.storage.internal.Resources; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java index 460d453299..e3cbd3a9b2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java @@ -54,7 +54,7 @@ import org.apache.sis.storage.ReadOnlyStorageException; import org.apache.sis.storage.UnsupportedStorageException; import org.apache.sis.storage.modifier.CoverageModifier; import org.apache.sis.storage.base.PRJDataStore; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.AuxiliaryContent; import org.apache.sis.referencing.internal.shared.AffineTransform2D; import org.apache.sis.util.CharSequences; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/LegalSymbols.java similarity index 99% rename from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java rename to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/LegalSymbols.java index 457e23abe3..b972feb8fa 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/LegalSymbols.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/LegalSymbols.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; import java.time.Year; import java.util.Locale; @@ -26,6 +26,7 @@ import org.opengis.util.InternationalString; import org.apache.sis.util.DefaultInternationalString; import org.apache.sis.util.CharSequences; import org.apache.sis.util.logging.Logging; +import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.metadata.iso.citation.AbstractParty; import org.apache.sis.metadata.iso.citation.DefaultCitation; import org.apache.sis.metadata.iso.citation.DefaultCitationDate; diff --git 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/metadata/MetadataBuilder.java similarity index 99% rename from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java rename to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/MetadataBuilder.java index 46039d1a7d..117500d026 100644 --- 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/metadata/MetadataBuilder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; import java.time.Instant; import java.time.Duration; @@ -97,6 +97,7 @@ import org.apache.sis.storage.AbstractResource; import org.apache.sis.storage.AbstractFeatureSet; import org.apache.sis.storage.AbstractGridCoverageResource; import org.apache.sis.storage.DataStoreException; +import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.internal.Resources; import org.apache.sis.coverage.SampleDimension; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/MetadataFetcher.java similarity index 98% rename from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java rename to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/MetadataFetcher.java index 02d0a6715a..b3758ca040 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/MetadataFetcher.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; import java.util.ArrayList; import java.util.List; @@ -54,9 +54,9 @@ import org.opengis.metadata.citation.Responsibility; /** * Helper methods for fetching metadata to be written by {@code DataStore} implementations. - * This is not a general-purpose builder suitable for public API, because the methods provided - * in this class are tailored for Apache SIS data store needs. - * API of this class may change in any future SIS versions. + * This is not a general-purpose builder suitable for public <abbr>API</abbr>, + * because the methods provided in this class are tailored for Apache <abbr>SIS</abbr> data store needs. + * <abbr>API</abbr> of this class may change in any future <abbr>SIS</abbr> versions. * * @author Martin Desruisseaux (Geomatys) */ diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/ResourceLineage.java similarity index 99% rename from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java rename to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/ResourceLineage.java index 82c4e26070..ee3e8a514c 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/ResourceLineage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; import java.util.Collection; import org.opengis.metadata.Metadata; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/package-info.java similarity index 89% copy from endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java copy to endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/package-info.java index 881aa66126..62ffd4413b 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/package-info.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/metadata/package-info.java @@ -16,7 +16,7 @@ */ /** - * Base classes for the implementation of SIS storages. + * Helper methods for handling <abbr>ISO</abbr> or native metadata in data stores. * * <STRONG>Do not use!</STRONG> * @@ -26,4 +26,4 @@ * @author Martin Desruisseaux (Geomatys) * @author Johann Sorel (Geomatys) */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrix.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrix.java index 7112ba3919..257ef1afb2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrix.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrix.java @@ -26,7 +26,7 @@ import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.PixelInCell; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.NoSuchDataException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrixSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrixSet.java index a93afc0e17..11e37f43af 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrixSet.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/tiling/TileMatrixSet.java @@ -22,7 +22,7 @@ import org.opengis.util.GenericName; import org.opengis.geometry.Envelope; import org.opengis.metadata.Metadata; import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java index 75054c0733..9b85043f16 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java @@ -31,7 +31,7 @@ import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.internal.Resources; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.referencing.IdentifiedObjects; import org.apache.sis.setup.GeometryLibrary; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java index c96ba1d07a..344c2f4c05 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java @@ -37,7 +37,7 @@ import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.UnsupportedStorageException; import org.apache.sis.storage.base.URIDataStore; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.event.WarningEvent; import org.apache.sis.metadata.iso.DefaultMetadata; import org.apache.sis.util.resources.Errors; diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/metadata/MetadataBuilderTest.java similarity index 99% rename from endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java rename to endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/metadata/MetadataBuilderTest.java index f80fc6a943..96c46cc5db 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/base/MetadataBuilderTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/metadata/MetadataBuilderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.storage.base; +package org.apache.sis.storage.metadata; import java.time.Year; import java.util.Map; diff --git a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java index b5b87069e6..ebc5a6f9f5 100644 --- a/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java +++ b/incubator/src/org.apache.sis.storage.coveragejson/main/org/apache/sis/storage/coveragejson/CoverageJsonStore.java @@ -44,7 +44,7 @@ import org.apache.sis.storage.WritableAggregate; import org.apache.sis.storage.coveragejson.binding.Coverage; import org.apache.sis.storage.coveragejson.binding.CoverageCollection; import org.apache.sis.storage.coveragejson.binding.CoverageJsonObject; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.io.stream.IOUtilities; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java index c9e9f8489d..4c0adef74b 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java @@ -45,7 +45,7 @@ import org.apache.sis.coverage.grid.GridExtent; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.PixelInCell; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.modifier.CoverageModifier; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.base.ItemInfoEntry; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java index d5935cdcbb..7b6ab9a994 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java @@ -41,7 +41,7 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreClosedException; import org.apache.sis.storage.Resource; import org.apache.sis.storage.StorageConnector; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.storage.modifier.CoverageModifier; import org.apache.sis.storage.event.StoreListeners; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Box.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Box.java index 088d11c261..2c69492d73 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Box.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Box.java @@ -18,7 +18,7 @@ package org.apache.sis.storage.isobmff; import java.time.Instant; import java.util.UUID; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ContainerBox.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ContainerBox.java index bd83bd5c03..cc46ff2d9b 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ContainerBox.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ContainerBox.java @@ -19,7 +19,7 @@ package org.apache.sis.storage.isobmff; import java.io.IOException; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Copyright.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Copyright.java index 46d56a05c4..a32e50e1ef 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Copyright.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Copyright.java @@ -20,7 +20,7 @@ import java.util.Locale; import java.io.IOException; import java.nio.charset.StandardCharsets; import org.apache.sis.io.stream.ChannelDataInput; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.isobmff.FullBox; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.UnsupportedVersionException; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/FDItemInfoExtension.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/FDItemInfoExtension.java index fc1c9c03fd..9c4fb186c7 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/FDItemInfoExtension.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/FDItemInfoExtension.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.Reader; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemInfoEntry.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemInfoEntry.java index c60f50d501..6bf77c9ec5 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemInfoEntry.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemInfoEntry.java @@ -20,7 +20,7 @@ import java.net.URI; import java.io.IOException; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.BoxRegistry; import org.apache.sis.storage.isobmff.FullBox; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemReference.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemReference.java index 8c15872943..52319fb4e7 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemReference.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemReference.java @@ -18,7 +18,7 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.isobmff.BoxRegistry; import org.apache.sis.storage.isobmff.FullBox; import org.apache.sis.storage.isobmff.Reader; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java index f454142ba9..4a3da43a61 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java @@ -22,7 +22,7 @@ import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.FullBox; import org.apache.sis.storage.isobmff.BoxRegistry; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/UserDescription.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/UserDescription.java index 94df33aa41..f6273d9f66 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/UserDescription.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/UserDescription.java @@ -18,7 +18,7 @@ package org.apache.sis.storage.isobmff.image; import java.util.Locale; import java.io.IOException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.isobmff.FullBox; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.UnsupportedVersionException; diff --git a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Content.java b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Content.java index 2856608183..8383b3edac 100644 --- a/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Content.java +++ b/incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Content.java @@ -46,7 +46,7 @@ import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.sql.DataAccess; import org.apache.sis.storage.sql.ResourceDefinition; -import org.apache.sis.storage.base.MetadataFetcher; +import org.apache.sis.storage.metadata.MetadataFetcher; import org.apache.sis.metadata.sql.internal.shared.SQLUtilities; 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 8e75d2d67c..dd06969cb3 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 @@ -25,7 +25,7 @@ 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.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDALStore.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDALStore.java index db6bb21603..1a4144c569 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDALStore.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/GDALStore.java @@ -47,7 +47,7 @@ import org.apache.sis.storage.DataStore; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreClosedException; import org.apache.sis.storage.StorageConnector; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.base.URIDataStore; import org.apache.sis.util.collection.Containers; import org.apache.sis.util.internal.shared.Constants; 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 4d4b16c684..848ef79411 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 @@ -47,7 +47,7 @@ import org.apache.sis.image.internal.shared.ColorModelBuilder; import org.apache.sis.image.internal.shared.ColorModelFactory; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreReferencingException; -import org.apache.sis.storage.base.MetadataBuilder; +import org.apache.sis.storage.metadata.MetadataBuilder; import org.apache.sis.storage.tiling.TiledGridCoverage; import org.apache.sis.storage.tiling.TiledGridCoverageResource; import org.apache.sis.system.Configuration;
