You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2023/05/07 13:13:56 UTC
[incubator-baremaps] branch main updated: Move tile store in a dedicated package (#646)
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
The following commit(s) were added to refs/heads/main by this push:
new 75d8093e Move tile store in a dedicated package (#646)
75d8093e is described below
commit 75d8093e097992444e6b6a3eb703df0e8d907b65
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Sun May 7 15:13:52 2023 +0200
Move tile store in a dedicated package (#646)
---
baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java | 6 +++---
.../src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java | 6 +++---
.../src/main/java/org/apache/baremaps/database/DiffService.java | 2 +-
.../baremaps/{database/tile => tilestore}/TileBatchPredicate.java | 2 +-
.../org/apache/baremaps/{database/tile => tilestore}/TileCache.java | 2 +-
.../apache/baremaps/{database/tile => tilestore}/TileChannel.java | 2 +-
.../org/apache/baremaps/{database/tile => tilestore}/TileCoord.java | 2 +-
.../baremaps/{database/tile => tilestore}/TileCoordIterator.java | 6 +++---
.../org/apache/baremaps/{database/tile => tilestore}/TileStore.java | 2 +-
.../baremaps/{database/tile => tilestore}/TileStoreException.java | 2 +-
.../apache/baremaps/{database/tile => tilestore}/VariableUtils.java | 2 +-
.../baremaps/{database/tile => tilestore/file}/FileTileStore.java | 5 ++++-
.../baremaps/{database/tile => tilestore/mbtiles}/MBTiles.java | 5 ++++-
.../{database/tile => tilestore/postgres}/PostgresGroup.java | 2 +-
.../{database/tile => tilestore/postgres}/PostgresQuery.java | 2 +-
.../tile => tilestore/postgres}/PostgresQueryGenerator.java | 2 +-
.../{database/tile => tilestore/postgres}/PostgresTileStore.java | 6 +++++-
.../java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java | 6 ++++--
.../baremaps/{database/tile => tilestore}/TileBatcherTest.java | 2 +-
.../{database/tile => tilestore}/TileCoordIteratorTest.java | 2 +-
.../apache/baremaps/{database/tile => tilestore}/TileCoordTest.java | 2 +-
.../apache/baremaps/{database/tile => tilestore}/TileStoreTest.java | 4 ++--
.../{database/tile => tilestore/file}/FileTileStoreTest.java | 6 ++++--
.../baremaps/{database/tile => tilestore/mbtiles}/MBTilesTest.java | 3 ++-
.../{database/tile => tilestore/postgres}/JSQLParserTest.java | 2 +-
.../tile => tilestore/postgres}/PostgresQueryGeneratorTest.java | 2 +-
.../tile => tilestore/postgres}/PostgresQueryParserTest.java | 2 +-
.../tile => tilestore/postgres}/PostgresTileStoreTest.java | 3 ++-
.../src/main/java/org/apache/baremaps/ogcapi/TilesResource.java | 6 +++---
.../src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java | 4 ++--
.../src/main/java/org/apache/baremaps/server/DevResources.java | 6 +++---
.../src/main/java/org/apache/baremaps/server/ServerResources.java | 6 +++---
32 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
index 64986e65..4e40f9a8 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
@@ -24,11 +24,11 @@ import java.util.concurrent.Callable;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.database.PostgresUtils;
-import org.apache.baremaps.database.tile.PostgresTileStore;
-import org.apache.baremaps.database.tile.TileCache;
-import org.apache.baremaps.database.tile.TileStore;
import org.apache.baremaps.server.CorsFilter;
import org.apache.baremaps.server.ServerResources;
+import org.apache.baremaps.tilestore.TileCache;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
index 86969bbe..1994e3b3 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/ogcapi/OgcApi.java
@@ -27,11 +27,11 @@ import javax.sql.DataSource;
import org.apache.baremaps.cli.Options;
import org.apache.baremaps.config.ConfigReader;
import org.apache.baremaps.database.PostgresUtils;
-import org.apache.baremaps.database.tile.PostgresTileStore;
-import org.apache.baremaps.database.tile.TileCache;
-import org.apache.baremaps.database.tile.TileStore;
import org.apache.baremaps.ogcapi.*;
import org.apache.baremaps.server.CorsFilter;
+import org.apache.baremaps.tilestore.TileCache;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java b/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java
index 0a3f50be..2e0e4a95 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java
@@ -29,13 +29,13 @@ import java.util.zip.GZIPInputStream;
import org.apache.baremaps.collection.DataMap;
import org.apache.baremaps.database.repository.HeaderRepository;
import org.apache.baremaps.database.repository.Repository;
-import org.apache.baremaps.database.tile.TileCoord;
import org.apache.baremaps.openstreetmap.function.EntityGeometryBuilder;
import org.apache.baremaps.openstreetmap.function.EntityToGeometryMapper;
import org.apache.baremaps.openstreetmap.model.*;
import org.apache.baremaps.openstreetmap.utils.ProjectionTransformer;
import org.apache.baremaps.openstreetmap.xml.XmlChangeReader;
import org.apache.baremaps.stream.StreamException;
+import org.apache.baremaps.tilestore.TileCoord;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.slf4j.Logger;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileBatchPredicate.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileBatchPredicate.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileBatchPredicate.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileBatchPredicate.java
index 5bced987..af981076 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileBatchPredicate.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileBatchPredicate.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCache.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCache.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
index c13df47e..59d36027 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCache.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileChannel.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileChannel.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileChannel.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileChannel.java
index 9be9e60c..0620f2b4 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileChannel.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileChannel.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoord.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoord.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoord.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoord.java
index 357a5ce7..707a4480 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoord.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoord.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoordIterator.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoordIterator.java
similarity index 92%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoordIterator.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoordIterator.java
index f3394cbf..14b4d924 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileCoordIterator.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCoordIterator.java
@@ -10,10 +10,10 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
-import static org.apache.baremaps.database.tile.TileCoord.max;
-import static org.apache.baremaps.database.tile.TileCoord.min;
+import static org.apache.baremaps.tilestore.TileCoord.max;
+import static org.apache.baremaps.tilestore.TileCoord.min;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStore.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStore.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStore.java
index 3ff6ec71..c7288383 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStore.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStore.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStoreException.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStoreException.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStoreException.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStoreException.java
index 0dc994c4..77fee366 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/TileStoreException.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStoreException.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
/** Signals that an exception occurred in a {@code TileStore}. */
public class TileStoreException extends Exception {
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/VariableUtils.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/VariableUtils.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/VariableUtils.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/VariableUtils.java
index 2c367e31..bcd5e4ca 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/VariableUtils.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/VariableUtils.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/FileTileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/file/FileTileStore.java
similarity index 90%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/FileTileStore.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/file/FileTileStore.java
index 8209e646..77424004 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/FileTileStore.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/file/FileTileStore.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.file;
@@ -18,6 +18,9 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Files;
import java.nio.file.Path;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreException;
/** Represents a {@code TileStore} baked by a directory. */
public class FileTileStore implements TileStore {
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/MBTiles.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/mbtiles/MBTiles.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/MBTiles.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/mbtiles/MBTiles.java
index 366b960a..9cfbdad7 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/MBTiles.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/mbtiles/MBTiles.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.mbtiles;
@@ -23,6 +23,9 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashMap;
import java.util.Map;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreException;
/**
* A {@code TileStore} implementation that uses the
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresGroup.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresGroup.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
index 769d9012..5ce6a46a 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresGroup.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresGroup.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQuery.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQuery.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
index 2e250158..5047ace8 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQuery.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQuery.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQueryGenerator.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQueryGenerator.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
index 309af989..303e9ebd 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresQueryGenerator.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java
rename to baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
index 49294fe0..3a351a85 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/tile/PostgresTileStore.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresTileStore.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
@@ -33,6 +33,10 @@ import net.sf.jsqlparser.expression.Parenthesis;
import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.statement.select.Join;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreException;
+import org.apache.baremaps.tilestore.VariableUtils;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
index 8e280b20..d2965047 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ExportVectorTiles.java
@@ -23,10 +23,12 @@ import java.util.Map;
import java.util.stream.Collectors;
import javax.sql.DataSource;
import org.apache.baremaps.config.ConfigReader;
-import org.apache.baremaps.database.tile.*;
-import org.apache.baremaps.database.tile.TileCoord;
import org.apache.baremaps.openstreetmap.utils.StreamProgress;
import org.apache.baremaps.stream.StreamUtils;
+import org.apache.baremaps.tilestore.*;
+import org.apache.baremaps.tilestore.file.FileTileStore;
+import org.apache.baremaps.tilestore.mbtiles.MBTiles;
+import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.apache.baremaps.vectortile.tileset.TilesetQuery;
import org.apache.baremaps.workflow.Task;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileBatcherTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileBatcherTest.java
similarity index 97%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileBatcherTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileBatcherTest.java
index 3f31ac41..5a5b81c3 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileBatcherTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileBatcherTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordIteratorTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordIteratorTest.java
similarity index 97%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordIteratorTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordIteratorTest.java
index 3d99dba3..94560e73 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordIteratorTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordIteratorTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordTest.java
similarity index 97%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordTest.java
index eb759071..3eebf558 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileCoordTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileCoordTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileStoreTest.java
similarity index 93%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileStoreTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileStoreTest.java
index 8679b648..b1be4229 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/TileStoreTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/TileStoreTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -42,5 +42,5 @@ public abstract class TileStoreTest {
assertThrows(TileStoreException.class, () -> tileStore.read(tileCoord));
}
- abstract TileStore createTileStore() throws Exception;
+ public abstract TileStore createTileStore() throws Exception;
}
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/FileTileStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java
similarity index 86%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/FileTileStoreTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java
index 08adf628..7db9057c 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/FileTileStoreTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/file/FileTileStoreTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.file;
@@ -19,6 +19,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.apache.baremaps.collection.utils.FileUtils;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +39,7 @@ class FileTileStoreTest extends TileStoreTest {
}
@Override
- TileStore createTileStore() {
+ public TileStore createTileStore() {
return new FileTileStore(directory);
}
}
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/MBTilesTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesTest.java
similarity index 95%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/MBTilesTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesTest.java
index 0260b918..fdad9246 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/MBTilesTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/mbtiles/MBTilesTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.mbtiles;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -22,6 +22,7 @@ import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import org.apache.baremaps.collection.utils.FileUtils;
+import org.apache.baremaps.tilestore.TileStoreTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/JSQLParserTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/JSQLParserTest.java
similarity index 97%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/JSQLParserTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/JSQLParserTest.java
index 1a6dbb07..418acfcb 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/JSQLParserTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/JSQLParserTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryGeneratorTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
similarity index 96%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryGeneratorTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
index fec612ec..be69a464 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryGeneratorTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryParserTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryParserTest.java
similarity index 98%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryParserTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryParserTest.java
index 1b5a7701..de825d32 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresQueryParserTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryParserTest.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresTileStoreTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresTileStoreTest.java
similarity index 97%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresTileStoreTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresTileStoreTest.java
index 0af61dff..ecfe479e 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/tile/PostgresTileStoreTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresTileStoreTest.java
@@ -10,12 +10,13 @@
* the License.
*/
-package org.apache.baremaps.database.tile;
+package org.apache.baremaps.tilestore.postgres;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Arrays;
import java.util.List;
+import org.apache.baremaps.tilestore.TileCoord;
import org.junit.jupiter.api.Test;
class PostgresTileStoreTest {
diff --git a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
index 00ad3992..209474ed 100644
--- a/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
+++ b/baremaps-ogcapi/src/main/java/org/apache/baremaps/ogcapi/TilesResource.java
@@ -26,12 +26,12 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.baremaps.config.ConfigReader;
-import org.apache.baremaps.database.tile.TileCoord;
-import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.database.tile.TileStoreException;
import org.apache.baremaps.ogcapi.api.TilesApi;
import org.apache.baremaps.ogcapi.model.TileSetItem;
import org.apache.baremaps.ogcapi.model.TileSets;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreException;
import org.apache.baremaps.vectortile.tileset.Tileset;
@Singleton
diff --git a/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java b/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
index dab77e8b..0baebd6f 100644
--- a/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
+++ b/baremaps-ogcapi/src/test/java/org/apache/baremaps/ogcapi/OgcApiTest.java
@@ -21,8 +21,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import javax.sql.DataSource;
import org.apache.baremaps.database.PostgresUtils;
-import org.apache.baremaps.database.tile.PostgresTileStore;
-import org.apache.baremaps.database.tile.TileStore;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.glassfish.jersey.client.ClientConfig;
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
index 54ec4207..204660bf 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/DevResources.java
@@ -39,9 +39,9 @@ import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
import org.apache.baremaps.config.ConfigReader;
-import org.apache.baremaps.database.tile.PostgresTileStore;
-import org.apache.baremaps.database.tile.TileCoord;
-import org.apache.baremaps.database.tile.TileStore;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
import org.apache.baremaps.vectortile.style.Style;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.slf4j.Logger;
diff --git a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
index 8dcdee40..54df7bdb 100644
--- a/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
+++ b/baremaps-server/src/main/java/org/apache/baremaps/server/ServerResources.java
@@ -30,9 +30,9 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.baremaps.config.ConfigReader;
-import org.apache.baremaps.database.tile.TileCoord;
-import org.apache.baremaps.database.tile.TileStore;
-import org.apache.baremaps.database.tile.TileStoreException;
+import org.apache.baremaps.tilestore.TileCoord;
+import org.apache.baremaps.tilestore.TileStore;
+import org.apache.baremaps.tilestore.TileStoreException;
import org.apache.baremaps.vectortile.style.Style;
import org.apache.baremaps.vectortile.tileset.Tileset;
import org.apache.baremaps.vectortile.tileset.TilesetLayer;