This is an automated email from the ASF dual-hosted git repository. bchapuis pushed a commit to branch calcite in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit e94bb2d40e5c33f2a895af4848d8fa9a59db9729 Author: Bertil Chapuis <[email protected]> AuthorDate: Tue Jun 20 12:06:26 2023 +0200 Move the store abstraction to the collection package --- .../baremaps/{storage => collection/store}/AbstractTable.java | 2 +- .../org/apache/baremaps/{storage => collection/store}/Column.java | 2 +- .../apache/baremaps/{storage => collection/store}/ColumnImpl.java | 2 +- .../java/org/apache/baremaps/{storage => collection/store}/Row.java | 2 +- .../apache/baremaps/{storage => collection/store}/RowDataType.java | 2 +- .../org/apache/baremaps/{storage => collection/store}/RowImpl.java | 2 +- .../org/apache/baremaps/{storage => collection/store}/Schema.java | 2 +- .../apache/baremaps/{storage => collection/store}/SchemaImpl.java | 2 +- .../org/apache/baremaps/{storage => collection/store}/Store.java | 2 +- .../org/apache/baremaps/{storage => collection/store}/Table.java | 2 +- .../baremaps/{storage => collection/store}/TableDecorator.java | 2 +- .../baremaps/{storage => collection/store}/TableException.java | 2 +- .../apache/baremaps/{storage => collection/store}/TableImpl.java | 2 +- .../org/apache/baremaps/storage/flatgeobuf/FlatGeoBufStore.java | 6 +++--- .../org/apache/baremaps/storage/flatgeobuf/FlatGeoBufTable.java | 6 +++--- .../baremaps/storage/flatgeobuf/internal/TableConversions.java | 3 ++- .../org/apache/baremaps/storage/geopackage/GeoPackageStore.java | 6 +++--- .../org/apache/baremaps/storage/geopackage/GeoPackageTable.java | 2 +- .../java/org/apache/baremaps/storage/postgres/PostgresStore.java | 3 ++- .../java/org/apache/baremaps/storage/postgres/PostgresTable.java | 6 +++++- .../java/org/apache/baremaps/storage/shapefile/ShapefileStore.java | 6 +++--- .../java/org/apache/baremaps/storage/shapefile/ShapefileTable.java | 6 +++++- .../apache/baremaps/storage/shapefile/internal/DbaseByteReader.java | 2 +- .../baremaps/storage/shapefile/internal/ShapefileByteReader.java | 3 ++- .../baremaps/storage/shapefile/internal/ShapefileInputStream.java | 4 ++-- .../apache/baremaps/storage/shapefile/internal/ShapefileReader.java | 2 +- .../java/org/apache/baremaps/vectortile/expression/Expressions.java | 2 +- .../java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java | 2 +- .../java/org/apache/baremaps/workflow/tasks/ImportShapefile.java | 2 +- .../java/org/apache/baremaps/collection/type/DataTypeProvider.java | 5 ++++- .../src/test/java/org/apache/baremaps/storage/MockTable.java | 2 ++ .../org/apache/baremaps/storage/postgres/PostgresStoreTest.java | 2 +- .../org/apache/baremaps/storage/postgres/PostgresTableTest.java | 2 +- .../test/java/org/apache/baremaps/vectortile/ExpressionsTest.java | 4 ++-- .../main/java/org/apache/baremaps/ogcapi/CollectionsResource.java | 2 +- 35 files changed, 60 insertions(+), 44 deletions(-) diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/AbstractTable.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/AbstractTable.java similarity index 94% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/AbstractTable.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/AbstractTable.java index ed22d28a..abf1a8f3 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/AbstractTable.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/AbstractTable.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import org.apache.baremaps.collection.AbstractDataCollection; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/Column.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Column.java similarity index 94% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/Column.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/Column.java index 2d73181a..6163dcb8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/Column.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Column.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; /** * A column in a table. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/ColumnImpl.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/ColumnImpl.java similarity index 93% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/ColumnImpl.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/ColumnImpl.java index 110701ed..7f187c4d 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/ColumnImpl.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/ColumnImpl.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; /** * A column in a table. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/Row.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Row.java similarity index 97% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/Row.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/Row.java index 63bb5582..8f10ce81 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/Row.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Row.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.List; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/RowDataType.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowDataType.java similarity index 98% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/RowDataType.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowDataType.java index 9e13c5b3..164a264e 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/RowDataType.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowDataType.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/RowImpl.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowImpl.java similarity index 97% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/RowImpl.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowImpl.java index f3afcf14..71d682aa 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/RowImpl.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/RowImpl.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.List; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/Schema.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Schema.java similarity index 95% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/Schema.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/Schema.java index 6ebe1855..488a4289 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/Schema.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Schema.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.List; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/SchemaImpl.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/SchemaImpl.java similarity index 96% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/SchemaImpl.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/SchemaImpl.java index b3b1bcde..014d0cc2 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/SchemaImpl.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/SchemaImpl.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.ArrayList; import java.util.HashMap; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/Store.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Store.java similarity index 96% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/Store.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/Store.java index 91ef51a1..06d3f9f8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/Store.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Store.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.Collection; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/Table.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Table.java similarity index 94% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/Table.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/Table.java index 46ff7540..b346c851 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/Table.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/Table.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import org.apache.baremaps.collection.DataCollection; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableDecorator.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableDecorator.java similarity index 98% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/TableDecorator.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableDecorator.java index 04613113..cc1b2a31 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableDecorator.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableDecorator.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.Iterator; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableException.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableException.java similarity index 96% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/TableException.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableException.java index 1d3a3183..0edf2c2b 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableException.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableException.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; /** Signals that an exception occurred in a table. */ public class TableException extends RuntimeException { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableImpl.java b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableImpl.java similarity index 96% rename from baremaps-core/src/main/java/org/apache/baremaps/storage/TableImpl.java rename to baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableImpl.java index 3e635d07..6be35e4f 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/TableImpl.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/collection/store/TableImpl.java @@ -10,7 +10,7 @@ * the License. */ -package org.apache.baremaps.storage; +package org.apache.baremaps.collection.store; import java.util.ArrayList; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufStore.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufStore.java index 950597bd..9cd19e08 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufStore.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufStore.java @@ -16,9 +16,9 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collection; -import org.apache.baremaps.storage.Store; -import org.apache.baremaps.storage.Table; -import org.apache.baremaps.storage.TableException; +import org.apache.baremaps.collection.store.Store; +import org.apache.baremaps.collection.store.Table; +import org.apache.baremaps.collection.store.TableException; /** * A store corresponding to the flatgeobuf files of a directory. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufTable.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufTable.java index dedae110..b2644e7c 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufTable.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/FlatGeoBufTable.java @@ -23,9 +23,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.baremaps.collection.AbstractDataCollection; -import org.apache.baremaps.storage.AbstractTable; -import org.apache.baremaps.storage.Row; -import org.apache.baremaps.storage.Schema; +import org.apache.baremaps.collection.store.AbstractTable; +import org.apache.baremaps.collection.store.Row; +import org.apache.baremaps.collection.store.Schema; import org.apache.baremaps.storage.flatgeobuf.internal.TableConversions; import org.locationtech.jts.geom.*; import org.wololo.flatgeobuf.Constants; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java index 5bc3fff9..ae16578a 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/flatgeobuf/internal/TableConversions.java @@ -23,7 +23,8 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import org.apache.baremaps.storage.*; + +import org.apache.baremaps.collection.store.*; import org.wololo.flatgeobuf.ColumnMeta; import org.wololo.flatgeobuf.GeometryConversions; import org.wololo.flatgeobuf.HeaderMeta; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageStore.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageStore.java index e5e6bfcf..5b66a73a 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageStore.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageStore.java @@ -17,9 +17,9 @@ import java.nio.file.Path; import java.util.Collection; import mil.nga.geopackage.GeoPackage; import mil.nga.geopackage.GeoPackageManager; -import org.apache.baremaps.storage.Store; -import org.apache.baremaps.storage.Table; -import org.apache.baremaps.storage.TableException; +import org.apache.baremaps.collection.store.Store; +import org.apache.baremaps.collection.store.Table; +import org.apache.baremaps.collection.store.TableException; /** * A store corresponding to a GeoPackage database. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageTable.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageTable.java index 8eaa71b3..aa282823 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageTable.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/geopackage/GeoPackageTable.java @@ -19,7 +19,7 @@ import mil.nga.geopackage.features.user.FeatureDao; import mil.nga.geopackage.features.user.FeatureResultSet; import mil.nga.geopackage.geom.GeoPackageGeometryData; import org.apache.baremaps.collection.AbstractDataCollection; -import org.apache.baremaps.storage.*; +import org.apache.baremaps.collection.store.*; import org.locationtech.jts.geom.*; /** diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresStore.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresStore.java index 1cd4c8ad..2f9a48a7 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresStore.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresStore.java @@ -26,11 +26,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import javax.sql.DataSource; + +import org.apache.baremaps.collection.store.*; import org.apache.baremaps.postgres.copy.CopyWriter; import org.apache.baremaps.postgres.copy.GeometryValueHandler; import org.apache.baremaps.postgres.metadata.DatabaseMetadata; import org.apache.baremaps.postgres.metadata.TableMetadata; -import org.apache.baremaps.storage.*; import org.locationtech.jts.geom.*; import org.postgresql.PGConnection; import org.postgresql.copy.PGCopyOutputStream; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresTable.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresTable.java index af8e99fc..3f314770 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresTable.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/postgres/PostgresTable.java @@ -21,7 +21,11 @@ import java.util.*; import java.util.stream.Stream; import java.util.stream.StreamSupport; import javax.sql.DataSource; -import org.apache.baremaps.storage.*; + +import org.apache.baremaps.collection.store.AbstractTable; +import org.apache.baremaps.collection.store.Row; +import org.apache.baremaps.collection.store.RowImpl; +import org.apache.baremaps.collection.store.Schema; import org.apache.baremaps.utils.GeometryUtils; import org.locationtech.jts.geom.*; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileStore.java index 10d5ce0b..c6a56f50 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileStore.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileStore.java @@ -18,9 +18,9 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Collection; -import org.apache.baremaps.storage.Store; -import org.apache.baremaps.storage.Table; -import org.apache.baremaps.storage.TableException; +import org.apache.baremaps.collection.store.Store; +import org.apache.baremaps.collection.store.Table; +import org.apache.baremaps.collection.store.TableException; /** * A store corresponding to the shapefiles of a directory. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileTable.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileTable.java index b7d5143d..8c055d08 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileTable.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/ShapefileTable.java @@ -17,7 +17,11 @@ import java.io.IOException; import java.nio.file.Path; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.baremaps.storage.*; + +import org.apache.baremaps.collection.store.AbstractTable; +import org.apache.baremaps.collection.store.Row; +import org.apache.baremaps.collection.store.Schema; +import org.apache.baremaps.collection.store.TableException; import org.apache.baremaps.storage.shapefile.internal.ShapefileInputStream; import org.apache.baremaps.storage.shapefile.internal.ShapefileReader; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java index 4dc8e5fd..00d6e9bf 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/DbaseByteReader.java @@ -22,7 +22,7 @@ import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; import java.text.MessageFormat; import java.util.*; -import org.apache.baremaps.storage.Row; +import org.apache.baremaps.collection.store.Row; /** * Reader of a Database Binary content. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java index a55d8da9..0bf82a32 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileByteReader.java @@ -19,7 +19,8 @@ import java.nio.ByteOrder; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; import java.util.*; -import org.apache.baremaps.storage.*; + +import org.apache.baremaps.collection.store.*; import org.locationtech.jts.algorithm.Orientation; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.CoordinateList; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java index 3130c5a9..eee12284 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileInputStream.java @@ -18,8 +18,8 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.apache.baremaps.storage.Row; -import org.apache.baremaps.storage.Schema; +import org.apache.baremaps.collection.store.Row; +import org.apache.baremaps.collection.store.Schema; /** * Input Stream of features. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java index 0eadde69..c17140e0 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/storage/shapefile/internal/ShapefileReader.java @@ -18,7 +18,7 @@ import java.io.File; import java.io.IOException; import java.util.List; import java.util.Objects; -import org.apache.baremaps.storage.Schema; +import org.apache.baremaps.collection.store.Schema; /** * Provides a ShapeFile Reader. diff --git a/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java index 0a34662c..75b012cb 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/expression/Expressions.java @@ -32,7 +32,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; -import org.apache.baremaps.storage.Row; +import org.apache.baremaps.collection.store.Row; import org.locationtech.jts.geom.*; public interface Expressions { diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java index 7cddfe3e..5527b310 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportGeoPackage.java @@ -13,7 +13,7 @@ package org.apache.baremaps.workflow.tasks; import java.nio.file.Path; -import org.apache.baremaps.storage.TableDecorator; +import org.apache.baremaps.collection.store.TableDecorator; import org.apache.baremaps.storage.geopackage.GeoPackageStore; import org.apache.baremaps.storage.postgres.PostgresStore; import org.apache.baremaps.utils.ProjectionTransformer; diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportShapefile.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportShapefile.java index 43acc4c9..3d6a6ad8 100644 --- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportShapefile.java +++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportShapefile.java @@ -13,7 +13,7 @@ package org.apache.baremaps.workflow.tasks; import java.nio.file.Path; -import org.apache.baremaps.storage.TableDecorator; +import org.apache.baremaps.collection.store.TableDecorator; import org.apache.baremaps.storage.postgres.PostgresStore; import org.apache.baremaps.storage.shapefile.ShapefileTable; import org.apache.baremaps.utils.ProjectionTransformer; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/collection/type/DataTypeProvider.java b/baremaps-core/src/test/java/org/apache/baremaps/collection/type/DataTypeProvider.java index e6aa1b06..25f53fbc 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/collection/type/DataTypeProvider.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/collection/type/DataTypeProvider.java @@ -16,8 +16,11 @@ package org.apache.baremaps.collection.type; import java.util.List; import java.util.Map; import java.util.stream.Stream; + +import org.apache.baremaps.collection.store.ColumnImpl; +import org.apache.baremaps.collection.store.Schema; +import org.apache.baremaps.collection.store.SchemaImpl; import org.apache.baremaps.collection.type.geometry.*; -import org.apache.baremaps.storage.*; import org.junit.jupiter.params.provider.Arguments; import org.locationtech.jts.geom.*; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/storage/MockTable.java b/baremaps-core/src/test/java/org/apache/baremaps/storage/MockTable.java index ee8284fb..e53d578a 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/storage/MockTable.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/storage/MockTable.java @@ -16,6 +16,8 @@ import static org.apache.baremaps.openstreetmap.repository.Constants.GEOMETRY_FA import java.util.Iterator; import java.util.List; + +import org.apache.baremaps.collection.store.*; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresStoreTest.java index cf20a613..0cb36568 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresStoreTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresStoreTest.java @@ -15,7 +15,7 @@ package org.apache.baremaps.storage.postgres; import static org.junit.jupiter.api.Assertions.*; import org.apache.baremaps.storage.MockTable; -import org.apache.baremaps.storage.TableException; +import org.apache.baremaps.collection.store.TableException; import org.apache.baremaps.testing.PostgresContainerTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresTableTest.java b/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresTableTest.java index 94ff98a4..52db653d 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresTableTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/storage/postgres/PostgresTableTest.java @@ -17,7 +17,7 @@ import static org.junit.jupiter.api.Assertions.*; import java.util.List; import org.apache.baremaps.storage.MockTable; -import org.apache.baremaps.storage.RowImpl; +import org.apache.baremaps.collection.store.RowImpl; import org.apache.baremaps.testing.PostgresContainerTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; diff --git a/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java b/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java index 61db0112..d8932169 100644 --- a/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java +++ b/baremaps-core/src/test/java/org/apache/baremaps/vectortile/ExpressionsTest.java @@ -16,8 +16,8 @@ import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; -import org.apache.baremaps.storage.Row; -import org.apache.baremaps.storage.Schema; +import org.apache.baremaps.collection.store.Row; +import org.apache.baremaps.collection.store.Schema; import org.apache.baremaps.vectortile.expression.Expressions; import org.apache.baremaps.vectortile.expression.Expressions.*; import org.junit.jupiter.api.Test; diff --git a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/CollectionsResource.java b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/CollectionsResource.java index ec6668a0..53990c29 100644 --- a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/CollectionsResource.java +++ b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/CollectionsResource.java @@ -24,7 +24,7 @@ import org.apache.baremaps.ogcapi.api.CollectionsApi; import org.apache.baremaps.ogcapi.model.Collection; import org.apache.baremaps.ogcapi.model.Collections; import org.apache.baremaps.ogcapi.model.Link; -import org.apache.baremaps.storage.Table; +import org.apache.baremaps.collection.store.Table; import org.apache.baremaps.storage.postgres.PostgresStore; /**
