This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
from 70d35b06da Add support for `DataSource` created from JDBC URL in
`StorageConnector`. Add documentation and minor cleanup.
new 81bd4b34e7 Add a `SQLStore.initialize(Connection)` method that
subclasses can override. Ensure that the initialization is done and the spatial
schema is analyzed before the `readResourceDescriptors(DataAccess)` method is
invoked. Opportunistic cleanup (documentation, checks).
new 62047abd7a Refactor the Geopackage store as a subclass of SQLStore.
Use the extension mechanism introduced in SIS-603 for delegating most work to
SQLStore. SQLStore will get the content table by invoking
`readResourceDescriptions(DataAccess)`, which is overridden in the Geopackage
store for reading the "gpkg_contents" table. This refactoring brings the
following benefits:
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/org/apache/sis/storage/landsat/Band.java | 2 +-
.../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +-
.../sis/storage/geotiff/spi/SchemaModifier.java | 2 +-
.../org/apache/sis/storage/sql/DataAccess.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 32 +-
.../apache/sis/storage/sql/feature/Analyzer.java | 177 ++-
.../apache/sis/storage/sql/feature/Database.java | 177 +--
.../sis/storage/sql/feature/FeatureAnalyzer.java | 3 +-
.../sis/storage/sql/feature/QueryAnalyzer.java | 2 +-
.../sis/storage/sql/feature/SchemaModifier.java | 2 +-
.../org/apache/sis/storage/sql/feature/Table.java | 2 +-
.../sis/storage/sql/feature/TableAnalyzer.java | 1 -
.../org/apache/sis/storage/sql/SQLStoreTest.java | 2 +-
.../sql/feature/SelectionClauseWriterTest.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 17 +-
.../org.apache.sis.storage.DataStoreProvider | 2 +-
...pache.sis.storage.geopackage.GpkgContentHandler | 1 -
.../main/module-info.java | 35 +-
.../org/apache/sis/storage/geopackage/Content.java | 466 +++++++
.../sis/storage/geopackage/ContentHandler.java | 91 ++
.../sis/storage/geopackage/ContentWriter.java | 232 ++++
.../org/apache/sis/storage/geopackage/Core.sql | 170 ++-
.../sis/storage/geopackage/Extension Metadata.sql | 47 +-
.../sis/storage/geopackage/Extension Schema.sql | 51 +-
.../Extension Tiled Gridded Coverage Data.sql | 61 +-
.../storage/geopackage/Extension Vector Tiles.sql | 33 -
...ension WKT for Coordinate Reference Systems.sql | 20 -
.../org/apache/sis/storage/geopackage/Gpkg.java | 65 -
.../sis/storage/geopackage/GpkgContentHandler.java | 90 --
.../storage/geopackage/GpkgContentResource.java | 57 -
.../sis/storage/geopackage/GpkgExtension.java | 47 -
.../sis/storage/geopackage/GpkgProvider.java | 164 ---
.../apache/sis/storage/geopackage/GpkgStore.java | 1325 +++++---------------
.../sis/storage/geopackage/GpkgStoreProvider.java | 284 +++++
.../storage/geopackage/GpkgUndefinedResource.java | 50 -
.../apache/sis/storage/geopackage/Informatives.sql | 121 --
.../apache/sis/storage/geopackage/Initializer.java | 178 +++
.../geopackage/featureset/GpkgDataTypes.java | 38 -
.../geopackage/featureset/GpkgFeatureSet.java | 106 --
.../featureset/GpkgFeatureSetHandler.java | 66 -
.../sis/storage/geopackage/package-info.java | 12 +-
.../apache/sis/storage/geopackage/privy/Query.java | 266 ----
.../sis/storage/geopackage/privy/Record.java | 456 -------
.../geopackage/{featureset.sql => FeatureSet.sql} | 0
.../sis/storage/geopackage/GpkgReadOnlyTest.java | 99 --
.../storage/geopackage/GpkgStoreProviderTest.java | 33 +-
.../{StoreTest.java => GpkgStoreTest.java} | 82 +-
.../conformance/BaseCoreConformanceTests.java | 415 ------
.../conformance/CoreConformanceTest.java | 219 ++++
.../OptExtensionMechanismConformanceTests.java | 172 ---
.../conformance/OptFeaturesConformanceTests.java | 346 -----
netbeans-project/nbproject/project.xml | 1 +
52 files changed, 2368 insertions(+), 3958 deletions(-)
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/META-INF/services/org.apache.sis.storage.geopackage.GpkgContentHandler
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Content.java
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/ContentHandler.java
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/ContentWriter.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Extension
Vector Tiles.sql
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Extension
WKT for Coordinate Reference Systems.sql
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Gpkg.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgContentHandler.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgContentResource.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgExtension.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgProvider.java
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgStoreProvider.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/GpkgUndefinedResource.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Informatives.sql
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/Initializer.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/featureset/GpkgDataTypes.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/featureset/GpkgFeatureSet.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/featureset/GpkgFeatureSetHandler.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/privy/Query.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/main/org/apache/sis/storage/geopackage/privy/Record.java
rename
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/{featureset.sql
=> FeatureSet.sql} (100%)
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgReadOnlyTest.java
copy
endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/KeyPathMatcherTest.java
=>
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java
(53%)
rename
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/{StoreTest.java
=> GpkgStoreTest.java} (77%)
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/BaseCoreConformanceTests.java
create mode 100644
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/OptExtensionMechanismConformanceTests.java
delete mode 100644
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/OptFeaturesConformanceTests.java
