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 15:42:58 UTC

[incubator-baremaps] 01/01: Merge the database and openstreetmap packages

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch openstreetmap-refactoring
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git

commit b12268f2c6f10881bb37734107dfe7c818c80859
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Sun May 7 17:42:43 2023 +0200

    Merge the database and openstreetmap packages
---
 .../main/java/org/apache/baremaps/cli/map/Dev.java |  2 +-
 .../java/org/apache/baremaps/cli/map/Serve.java    |  2 +-
 .../org/apache/baremaps/cli/ogcapi/OgcApi.java     |  2 +-
 .../{database => openstreetmap}/DiffService.java   |  6 +-
 .../postgres}/PostgresCoordinateMap.java           |  2 +-
 .../postgres}/PostgresHeaderRepository.java        |  6 +-
 .../postgres}/PostgresIterator.java                |  2 +-
 .../postgres}/PostgresJsonbMapper.java             |  2 +-
 .../postgres}/PostgresNodeRepository.java          | 10 +--
 .../postgres}/PostgresReferenceMap.java            |  2 +-
 .../postgres}/PostgresRelationRepository.java      | 19 +++--
 .../postgres}/PostgresWayRepository.java           | 10 +--
 .../repository}/BlockImporter.java                 |  9 +--
 .../repository}/ChangeImporter.java                |  8 +--
 .../repository/HeaderRepository.java               |  2 +-
 .../openstreetmap/repository/NodeRepository.java}  | 10 ++-
 .../repository/RelationRepository.java}            | 10 ++-
 .../repository/Repository.java                     |  2 +-
 .../repository/RepositoryException.java            |  2 +-
 .../openstreetmap/repository/WayRepository.java}   | 10 ++-
 .../{database => postgres}/PostgresUtils.java      |  2 +-
 .../{database => postgres}/copy/CopyWriter.java    |  2 +-
 .../copy/PostgisGeometryValueHandler.java          |  2 +-
 .../metadata/ColumnResult.java                     |  2 +-
 .../metadata/DatabaseMetadata.java                 |  2 +-
 .../metadata/PrimaryKeyResult.java                 |  2 +-
 .../metadata/TableMetadata.java                    |  2 +-
 .../metadata/TableResult.java                      |  2 +-
 .../baremaps/storage/postgres/PostgresStore.java   |  8 +--
 .../tilestore/postgres/PostgresQueryGenerator.java |  4 +-
 .../apache/baremaps/workflow/WorkflowContext.java  |  2 +-
 .../workflow/tasks/ImportOpenStreetMap.java        |  8 ++-
 .../workflow/tasks/UpdateOpenStreetMap.java        | 12 ++--
 .../database/database/WayRepositoryTest.java       | 82 ----------------------
 .../postgres}/PostgresHeaderRepositoryTest.java    | 13 ++--
 .../postgres}/PostgresNodeRepositoryTest.java      |  8 +--
 .../postgres}/PostgresRelationRepositoryTest.java  |  8 +--
 .../postgres/PostgresRepositoryTest.java}          |  6 +-
 .../postgres}/PostgresWayRepositoryTest.java       |  8 +--
 .../repository}/BlockImporterTest.java             | 14 ++--
 .../repository}/Constants.java                     |  2 +-
 .../{database => }/postgres/TestContainers.java    |  2 +-
 .../metadata/PostgresMetadataTest.java}            |  6 +-
 .../org/apache/baremaps/storage/MockTable.java     |  2 +-
 .../storage/postgres/PostgresTableTest.java        |  2 +-
 .../baremaps/testing/PostgresContainerTest.java    |  5 +-
 .../postgres/PostgresQueryGeneratorTest.java       |  4 +-
 .../baremaps/workflow/tasks/ImportMonacoTest.java  | 18 ++---
 .../workflow/tasks/ImportUpdateDataTest.java       | 16 ++---
 .../tasks/ImportUpdateLiechtensteinTest.java       | 18 ++---
 .../org/apache/baremaps/ogcapi/OgcApiTest.java     |  2 +-
 51 files changed, 163 insertions(+), 221 deletions(-)

diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
index 573337ce..f29dd3a4 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
@@ -22,7 +22,7 @@ import java.nio.file.Path;
 import java.util.concurrent.Callable;
 import javax.sql.DataSource;
 import org.apache.baremaps.cli.Options;
-import org.apache.baremaps.database.PostgresUtils;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.server.CorsFilter;
 import org.apache.baremaps.server.DevResources;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
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 4e40f9a8..fdbb3a4c 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
@@ -23,7 +23,7 @@ import java.nio.file.Path;
 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.postgres.PostgresUtils;
 import org.apache.baremaps.server.CorsFilter;
 import org.apache.baremaps.server.ServerResources;
 import org.apache.baremaps.tilestore.TileCache;
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 1994e3b3..75c70f9a 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
@@ -26,8 +26,8 @@ import java.util.concurrent.Callable;
 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.ogcapi.*;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.server.CorsFilter;
 import org.apache.baremaps.tilestore.TileCache;
 import org.apache.baremaps.tilestore.TileStore;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/DiffService.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/DiffService.java
index 2e0e4a95..1b04bb3c 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/DiffService.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/DiffService.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database;
+package org.apache.baremaps.openstreetmap;
 
 import static org.apache.baremaps.stream.ConsumerUtils.consumeThenReturn;
 
@@ -27,11 +27,11 @@ import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 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.openstreetmap.function.EntityGeometryBuilder;
 import org.apache.baremaps.openstreetmap.function.EntityToGeometryMapper;
 import org.apache.baremaps.openstreetmap.model.*;
+import org.apache.baremaps.openstreetmap.repository.HeaderRepository;
+import org.apache.baremaps.openstreetmap.repository.Repository;
 import org.apache.baremaps.openstreetmap.utils.ProjectionTransformer;
 import org.apache.baremaps.openstreetmap.xml.XmlChangeReader;
 import org.apache.baremaps.stream.StreamException;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresCoordinateMap.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresCoordinateMap.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java
index 064bfb79..058a6706 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresCoordinateMap.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresCoordinateMap.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.collection;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
index f0aa390b..b7e5a651 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresHeaderRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepository.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
@@ -25,8 +25,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.copy.CopyWriter;
 import org.apache.baremaps.openstreetmap.model.Header;
+import org.apache.baremaps.openstreetmap.repository.HeaderRepository;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
+import org.apache.baremaps.postgres.copy.CopyWriter;
 import org.postgresql.PGConnection;
 import org.postgresql.copy.PGCopyOutputStream;
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresIterator.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresIterator.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresIterator.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresIterator.java
index 27bc4475..a4e75095 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresIterator.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresIterator.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.collection;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresJsonbMapper.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresJsonbMapper.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresJsonbMapper.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresJsonbMapper.java
index 513790e0..49b1fe4e 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresJsonbMapper.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresJsonbMapper.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java
index eb24cf6d..b76a2d31 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresNodeRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepository.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
@@ -25,16 +25,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.copy.CopyWriter;
 import org.apache.baremaps.openstreetmap.model.Info;
 import org.apache.baremaps.openstreetmap.model.Node;
+import org.apache.baremaps.openstreetmap.repository.NodeRepository;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.utils.GeometryUtils;
+import org.apache.baremaps.postgres.copy.CopyWriter;
 import org.locationtech.jts.geom.Geometry;
 import org.postgresql.PGConnection;
 import org.postgresql.copy.PGCopyOutputStream;
 
-/** Provides an implementation of the {@code Repository<Node>} baked by PostgreSQL. */
-public class PostgresNodeRepository implements Repository<Long, Node> {
+/** Provides an implementation of the {@code NodeRepository} baked by Postgres. */
+public class PostgresNodeRepository implements NodeRepository {
 
   private final DataSource dataSource;
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresReferenceMap.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresReferenceMap.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java
index 8e958fe0..656ce1e6 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/collection/PostgresReferenceMap.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresReferenceMap.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.collection;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java
similarity index 95%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java
index a11483ae..e61573f1 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresRelationRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepository.java
@@ -10,10 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
-
-import static org.apache.baremaps.database.repository.PostgresJsonbMapper.toJson;
-import static org.apache.baremaps.database.repository.PostgresJsonbMapper.toMap;
+package org.apache.baremaps.openstreetmap.postgres;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.IOException;
@@ -25,18 +22,20 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.copy.CopyWriter;
 import org.apache.baremaps.openstreetmap.model.Info;
 import org.apache.baremaps.openstreetmap.model.Member;
 import org.apache.baremaps.openstreetmap.model.Member.MemberType;
 import org.apache.baremaps.openstreetmap.model.Relation;
+import org.apache.baremaps.openstreetmap.repository.RelationRepository;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.utils.GeometryUtils;
+import org.apache.baremaps.postgres.copy.CopyWriter;
 import org.locationtech.jts.geom.Geometry;
 import org.postgresql.PGConnection;
 import org.postgresql.copy.PGCopyOutputStream;
 
-/** Provides an implementation of the {@code Repository<Relation>} baked by PostgreSQL. */
-public class PostgresRelationRepository implements Repository<Long, Relation> {
+/** Provides an implementation of the {@code RelationRepository} baked by Postgres. */
+public class PostgresRelationRepository implements RelationRepository {
 
   private final DataSource dataSource;
 
@@ -284,7 +283,7 @@ public class PostgresRelationRepository implements Repository<Long, Relation> {
           writer.writeInteger(value.getInfo().getUid());
           writer.writeLocalDateTime(value.getInfo().getTimestamp());
           writer.writeLong(value.getInfo().getChangeset());
-          writer.writeJsonb(toJson(value.getTags()));
+          writer.writeJsonb(PostgresJsonbMapper.toJson(value.getTags()));
           writer.writeLongList(
               value.getMembers().stream().map(Member::getRef).collect(Collectors.toList()));
           writer.writeIntegerList(value.getMembers().stream().map(Member::getType)
@@ -305,7 +304,7 @@ public class PostgresRelationRepository implements Repository<Long, Relation> {
     int uid = resultSet.getInt(3);
     LocalDateTime timestamp = resultSet.getObject(4, LocalDateTime.class);
     long changeset = resultSet.getLong(5);
-    Map<String, Object> tags = toMap(resultSet.getString(6));
+    Map<String, Object> tags = PostgresJsonbMapper.toMap(resultSet.getString(6));
     Long[] refs = (Long[]) resultSet.getArray(7).getArray();
     Integer[] types = (Integer[]) resultSet.getArray(8).getArray();
     String[] roles = (String[]) resultSet.getArray(9).getArray();
@@ -325,7 +324,7 @@ public class PostgresRelationRepository implements Repository<Long, Relation> {
     statement.setObject(3, value.getInfo().getUid());
     statement.setObject(4, value.getInfo().getTimestamp());
     statement.setObject(5, value.getInfo().getChangeset());
-    statement.setObject(6, toJson(value.getTags()));
+    statement.setObject(6, PostgresJsonbMapper.toJson(value.getTags()));
     Object[] refs = value.getMembers().stream().map(Member::getRef).toArray();
     statement.setObject(7, statement.getConnection().createArrayOf("bigint", refs));
     Object[] types =
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java
index b4c1f624..9a98dfcb 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/PostgresWayRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepository.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
@@ -28,16 +28,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.copy.CopyWriter;
 import org.apache.baremaps.openstreetmap.model.Info;
 import org.apache.baremaps.openstreetmap.model.Way;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
+import org.apache.baremaps.openstreetmap.repository.WayRepository;
 import org.apache.baremaps.openstreetmap.utils.GeometryUtils;
+import org.apache.baremaps.postgres.copy.CopyWriter;
 import org.locationtech.jts.geom.Geometry;
 import org.postgresql.PGConnection;
 import org.postgresql.copy.PGCopyOutputStream;
 
-/** Provides an implementation of the {@code Repository<Way>} baked by PostgreSQL. */
-public class PostgresWayRepository implements Repository<Long, Way> {
+/** Provides an implementation of the {@code WayRepository} baked by Postgres. */
+public class PostgresWayRepository implements WayRepository {
 
   private final DataSource dataSource;
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/BlockImporter.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/BlockImporter.java
similarity index 89%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/BlockImporter.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/BlockImporter.java
index 5468f72c..d542f82f 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/BlockImporter.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/BlockImporter.java
@@ -10,12 +10,11 @@
  * the License.
  */
 
-package org.apache.baremaps.database;
+package org.apache.baremaps.openstreetmap.repository;
 
 
 
 import java.util.function.Consumer;
-import org.apache.baremaps.database.repository.Repository;
 import org.apache.baremaps.openstreetmap.model.*;
 import org.apache.baremaps.stream.StreamException;
 
@@ -35,8 +34,10 @@ public class BlockImporter implements Consumer<Block> {
    * @param wayRepository the way table
    * @param relationRepository the relation table
    */
-  public BlockImporter(Repository<Long, Header> headerRepository,
-      Repository<Long, Node> nodeRepository, Repository<Long, Way> wayRepository,
+  public BlockImporter(
+      Repository<Long, Header> headerRepository,
+      Repository<Long, Node> nodeRepository,
+      Repository<Long, Way> wayRepository,
       Repository<Long, Relation> relationRepository) {
     this.headerRepository = headerRepository;
     this.nodeRepository = nodeRepository;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/ChangeImporter.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
similarity index 90%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/ChangeImporter.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
index 2c09d389..979f16b8 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/ChangeImporter.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/ChangeImporter.java
@@ -10,13 +10,11 @@
  * the License.
  */
 
-package org.apache.baremaps.database;
+package org.apache.baremaps.openstreetmap.repository;
 
 
 
 import java.util.function.Consumer;
-import org.apache.baremaps.database.repository.Repository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.model.Change;
 import org.apache.baremaps.openstreetmap.model.Node;
 import org.apache.baremaps.openstreetmap.model.Relation;
@@ -37,7 +35,9 @@ public class ChangeImporter implements Consumer<Change> {
    * @param wayRepository the way table
    * @param relationRepository the relation table
    */
-  public ChangeImporter(Repository<Long, Node> nodeRepository, Repository<Long, Way> wayRepository,
+  public ChangeImporter(
+      Repository<Long, Node> nodeRepository,
+      Repository<Long, Way> wayRepository,
       Repository<Long, Relation> relationRepository) {
     this.nodeRepository = nodeRepository;
     this.wayRepository = wayRepository;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/HeaderRepository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/HeaderRepository.java
similarity index 95%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/HeaderRepository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/HeaderRepository.java
index a7620074..e0d3a6c4 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/HeaderRepository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/HeaderRepository.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.repository;
 
 
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/NodeRepository.java
similarity index 72%
copy from baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
copy to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/NodeRepository.java
index 35a89c43..ecf789d5 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/NodeRepository.java
@@ -10,9 +10,13 @@
  * the License.
  */
 
-package org.apache.baremaps.database.postgres;
+package org.apache.baremaps.openstreetmap.repository;
 
-public class TestContainers {
+import org.apache.baremaps.openstreetmap.model.Node;
+
+/**
+ * A repository of nodes.
+ */
+public interface NodeRepository extends Repository<Long, Node> {
 
-  private static final String JDBC_URL = "jdbc:tc:postgis:13-3.1:///baremaps";
 }
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RelationRepository.java
similarity index 71%
copy from baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
copy to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RelationRepository.java
index 35a89c43..1096fbf1 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RelationRepository.java
@@ -10,9 +10,13 @@
  * the License.
  */
 
-package org.apache.baremaps.database.postgres;
+package org.apache.baremaps.openstreetmap.repository;
 
-public class TestContainers {
+import org.apache.baremaps.openstreetmap.model.Relation;
+
+/**
+ * A repository of relations.
+ */
+public interface RelationRepository extends Repository<Long, Relation> {
 
-  private static final String JDBC_URL = "jdbc:tc:postgis:13-3.1:///baremaps";
 }
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/Repository.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/Repository.java
similarity index 97%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/Repository.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/Repository.java
index 16adc891..abf21cce 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/Repository.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/Repository.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.repository;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/RepositoryException.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RepositoryException.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/repository/RepositoryException.java
rename to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RepositoryException.java
index 850f0215..690abae0 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/repository/RepositoryException.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/RepositoryException.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.repository;
+package org.apache.baremaps.openstreetmap.repository;
 
 /** Signals that an exception occurred in a {@code Repository}. */
 public class RepositoryException extends Exception {
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/WayRepository.java
similarity index 73%
copy from baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
copy to baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/WayRepository.java
index 35a89c43..e4c494f8 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/openstreetmap/repository/WayRepository.java
@@ -10,9 +10,13 @@
  * the License.
  */
 
-package org.apache.baremaps.database.postgres;
+package org.apache.baremaps.openstreetmap.repository;
 
-public class TestContainers {
+import org.apache.baremaps.openstreetmap.model.Way;
+
+/**
+ * A repository of ways.
+ */
+public interface WayRepository extends Repository<Long, Way> {
 
-  private static final String JDBC_URL = "jdbc:tc:postgis:13-3.1:///baremaps";
 }
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/PostgresUtils.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/PostgresUtils.java
similarity index 98%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/PostgresUtils.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/PostgresUtils.java
index aeaeea39..70f0667a 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/PostgresUtils.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/PostgresUtils.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database;
+package org.apache.baremaps.postgres;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/copy/CopyWriter.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/copy/CopyWriter.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java
index 914f582d..132ebecc 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/copy/CopyWriter.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/CopyWriter.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.copy;
+package org.apache.baremaps.postgres.copy;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/copy/PostgisGeometryValueHandler.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/PostgisGeometryValueHandler.java
similarity index 96%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/copy/PostgisGeometryValueHandler.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/PostgisGeometryValueHandler.java
index 3e23f4ec..8e477f15 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/copy/PostgisGeometryValueHandler.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/copy/PostgisGeometryValueHandler.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.copy;
+package org.apache.baremaps.postgres.copy;
 
 import static org.locationtech.jts.io.WKBConstants.wkbNDR;
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/ColumnResult.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/ColumnResult.java
similarity index 95%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/metadata/ColumnResult.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/ColumnResult.java
index e9647bab..35f02632 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/ColumnResult.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/ColumnResult.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.metadata;
+package org.apache.baremaps.postgres.metadata;
 
 public record ColumnResult(
     String tableCat,
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/DatabaseMetadata.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/DatabaseMetadata.java
similarity index 99%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/metadata/DatabaseMetadata.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/DatabaseMetadata.java
index 726c63f7..170be5a5 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/DatabaseMetadata.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/DatabaseMetadata.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.metadata;
+package org.apache.baremaps.postgres.metadata;
 
 
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/PrimaryKeyResult.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/PrimaryKeyResult.java
similarity index 93%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/metadata/PrimaryKeyResult.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/PrimaryKeyResult.java
index f728dcf8..e531be46 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/PrimaryKeyResult.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/PrimaryKeyResult.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.metadata;
+package org.apache.baremaps.postgres.metadata;
 
 public record PrimaryKeyResult(
     String tableCat,
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableMetadata.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableMetadata.java
similarity index 94%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableMetadata.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableMetadata.java
index ebcb93df..b4b80029 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableMetadata.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableMetadata.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.metadata;
+package org.apache.baremaps.postgres.metadata;
 
 import java.util.List;
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableResult.java b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableResult.java
similarity index 94%
rename from baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableResult.java
rename to baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableResult.java
index 33883b94..99bcd568 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/database/metadata/TableResult.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/postgres/metadata/TableResult.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.metadata;
+package org.apache.baremaps.postgres.metadata;
 
 public record TableResult(
     String tableCat,
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 c4cd76ab..c9814f81 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
@@ -23,10 +23,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.copy.CopyWriter;
-import org.apache.baremaps.database.copy.PostgisGeometryValueHandler;
-import org.apache.baremaps.database.metadata.DatabaseMetadata;
-import org.apache.baremaps.database.metadata.TableMetadata;
+import org.apache.baremaps.postgres.copy.CopyWriter;
+import org.apache.baremaps.postgres.copy.PostgisGeometryValueHandler;
+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;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
index 303e9ebd..5cb37b93 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGenerator.java
@@ -17,8 +17,8 @@ package org.apache.baremaps.tilestore.postgres;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.metadata.DatabaseMetadata;
-import org.apache.baremaps.database.metadata.TableMetadata;
+import org.apache.baremaps.postgres.metadata.DatabaseMetadata;
+import org.apache.baremaps.postgres.metadata.TableMetadata;
 
 /**
  * A generator that uses PostgreSQL metadata to generate input queries for a {@code
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
index 088b4c0b..1cc7fab6 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/WorkflowContext.java
@@ -17,7 +17,7 @@ package org.apache.baremaps.workflow;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.PostgresUtils;
+import org.apache.baremaps.postgres.PostgresUtils;
 
 /**
  * A context that is passed to the tasks of a workflow and used to share data between tasks.
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOpenStreetMap.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOpenStreetMap.java
index b7aed6d8..01f44ba1 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOpenStreetMap.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/ImportOpenStreetMap.java
@@ -24,12 +24,16 @@ import org.apache.baremaps.collection.type.LongDataType;
 import org.apache.baremaps.collection.type.LongListDataType;
 import org.apache.baremaps.collection.type.PairDataType;
 import org.apache.baremaps.collection.utils.FileUtils;
-import org.apache.baremaps.database.BlockImporter;
-import org.apache.baremaps.database.repository.*;
 import org.apache.baremaps.openstreetmap.model.Node;
 import org.apache.baremaps.openstreetmap.model.Relation;
 import org.apache.baremaps.openstreetmap.model.Way;
 import org.apache.baremaps.openstreetmap.pbf.PbfBlockReader;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
+import org.apache.baremaps.openstreetmap.repository.*;
+import org.apache.baremaps.openstreetmap.repository.BlockImporter;
 import org.apache.baremaps.stream.StreamUtils;
 import org.apache.baremaps.workflow.Task;
 import org.apache.baremaps.workflow.WorkflowContext;
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java
index 0fec59d9..2498e215 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/tasks/UpdateOpenStreetMap.java
@@ -21,10 +21,6 @@ import java.net.URL;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
 import org.apache.baremaps.collection.DataMap;
-import org.apache.baremaps.database.ChangeImporter;
-import org.apache.baremaps.database.collection.PostgresCoordinateMap;
-import org.apache.baremaps.database.collection.PostgresReferenceMap;
-import org.apache.baremaps.database.repository.*;
 import org.apache.baremaps.openstreetmap.function.ChangeEntitiesHandler;
 import org.apache.baremaps.openstreetmap.function.EntityGeometryBuilder;
 import org.apache.baremaps.openstreetmap.function.EntityProjectionTransformer;
@@ -32,6 +28,14 @@ import org.apache.baremaps.openstreetmap.model.Header;
 import org.apache.baremaps.openstreetmap.model.Node;
 import org.apache.baremaps.openstreetmap.model.Relation;
 import org.apache.baremaps.openstreetmap.model.Way;
+import org.apache.baremaps.openstreetmap.postgres.PostgresCoordinateMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresReferenceMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
+import org.apache.baremaps.openstreetmap.repository.*;
+import org.apache.baremaps.openstreetmap.repository.ChangeImporter;
 import org.apache.baremaps.openstreetmap.state.StateReader;
 import org.apache.baremaps.openstreetmap.xml.XmlChangeReader;
 import org.apache.baremaps.workflow.Task;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java
deleted file mode 100644
index ffa32987..00000000
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/WayRepositoryTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.apache.baremaps.database.database;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertIterableEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
-import org.apache.baremaps.openstreetmap.model.Way;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
-import org.junit.jupiter.api.Test;
-
-class WayRepositoryTest extends DatabaseContainerTest {
-
-  PostgresWayRepository wayRepository;
-
-  @BeforeEach
-  void init() throws SQLException, IOException {
-    wayRepository = new PostgresWayRepository(dataSource());
-  }
-
-  @Test
-  @Tag("integration")
-  void insert() throws RepositoryException {
-    wayRepository.put(Constants.WAY_1);
-    assertEquals(Constants.WAY_1, wayRepository.get(Constants.WAY_1.id()));
-  }
-
-  @Test
-  @Tag("integration")
-  void insertAll() throws RepositoryException {
-    List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3);
-    wayRepository.put(ways);
-    assertIterableEquals(ways,
-        wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList())));
-  }
-
-  @Test
-  @Tag("integration")
-  void delete() throws RepositoryException {
-    wayRepository.put(Constants.WAY_1);
-    wayRepository.delete(Constants.WAY_1.id());
-    assertNull(wayRepository.get(Constants.WAY_1.id()));
-  }
-
-  @Test
-  @Tag("integration")
-  void deleteAll() throws RepositoryException {
-    List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3);
-    wayRepository.put(ways);
-    wayRepository.delete(ways.stream().map(e -> e.id()).collect(Collectors.toList()));
-    assertIterableEquals(Arrays.asList(null, null, null),
-        wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList())));
-  }
-
-  @Test
-  @Tag("integration")
-  void copy() throws RepositoryException {
-    List<Way> ways = Arrays.asList(Constants.WAY_1, Constants.WAY_2, Constants.WAY_3);
-    wayRepository.copy(ways);
-    assertIterableEquals(ways,
-        wayRepository.get(ways.stream().map(e -> e.id()).collect(Collectors.toList())));
-  }
-}
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepositoryTest.java
similarity index 87%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepositoryTest.java
index 12392757..9de18b21 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresHeaderRepositoryTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresHeaderRepositoryTest.java
@@ -10,11 +10,11 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.postgres;
 
-import static org.apache.baremaps.database.database.Constants.HEADER_0;
-import static org.apache.baremaps.database.database.Constants.HEADER_1;
-import static org.apache.baremaps.database.database.Constants.HEADER_2;
+import static org.apache.baremaps.openstreetmap.repository.Constants.HEADER_0;
+import static org.apache.baremaps.openstreetmap.repository.Constants.HEADER_1;
+import static org.apache.baremaps.openstreetmap.repository.Constants.HEADER_2;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -24,14 +24,13 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.baremaps.database.repository.PostgresHeaderRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.model.Header;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresHeaderRepositoryTest extends DatabaseContainerTest {
+class PostgresHeaderRepositoryTest extends PostgresRepositoryTest {
 
   PostgresHeaderRepository headerRepository;
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepositoryTest.java
similarity index 91%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepositoryTest.java
index 92397235..84d8ff85 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresNodeRepositoryTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresNodeRepositoryTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.postgres;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
@@ -21,14 +21,14 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.baremaps.database.repository.PostgresNodeRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.model.Node;
+import org.apache.baremaps.openstreetmap.repository.Constants;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresNodeRepositoryTest extends DatabaseContainerTest {
+class PostgresNodeRepositoryTest extends PostgresRepositoryTest {
 
   PostgresNodeRepository nodeRepository;
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepositoryTest.java
similarity index 91%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepositoryTest.java
index 9b911c29..1c63beeb 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresRelationRepositoryTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRelationRepositoryTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.postgres;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
@@ -21,14 +21,14 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.baremaps.database.repository.PostgresRelationRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.model.Relation;
+import org.apache.baremaps.openstreetmap.repository.Constants;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresRelationRepositoryTest extends DatabaseContainerTest {
+class PostgresRelationRepositoryTest extends PostgresRepositoryTest {
 
   PostgresRelationRepository relationRepository;
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/DatabaseContainerTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRepositoryTest.java
similarity index 87%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/DatabaseContainerTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRepositoryTest.java
index 91e8dc3b..00a1f888 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/DatabaseContainerTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresRepositoryTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.postgres;
 
 
 
@@ -18,11 +18,11 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.PostgresUtils;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.testing.PostgresContainerTest;
 import org.junit.jupiter.api.BeforeEach;
 
-public abstract class DatabaseContainerTest extends PostgresContainerTest {
+public abstract class PostgresRepositoryTest extends PostgresContainerTest {
 
   @BeforeEach
   public void initializeDatabase() throws SQLException, IOException {
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepositoryTest.java
similarity index 91%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepositoryTest.java
index cdbc012f..83d5a375 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresWayRepositoryTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/postgres/PostgresWayRepositoryTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.postgres;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
@@ -21,14 +21,14 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.model.Way;
+import org.apache.baremaps.openstreetmap.repository.Constants;
+import org.apache.baremaps.openstreetmap.repository.RepositoryException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresWayRepositoryTest extends DatabaseContainerTest {
+class PostgresWayRepositoryTest extends PostgresRepositoryTest {
 
   PostgresWayRepository wayRepository;
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/BlockImporterTest.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/BlockImporterTest.java
similarity index 86%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/BlockImporterTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/BlockImporterTest.java
index cfd69618..3d3d1440 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/BlockImporterTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/BlockImporterTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.repository;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -22,14 +22,12 @@ import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.SQLException;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.BlockImporter;
-import org.apache.baremaps.database.PostgresUtils;
-import org.apache.baremaps.database.repository.PostgresHeaderRepository;
-import org.apache.baremaps.database.repository.PostgresNodeRepository;
-import org.apache.baremaps.database.repository.PostgresRelationRepository;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
-import org.apache.baremaps.database.repository.RepositoryException;
 import org.apache.baremaps.openstreetmap.pbf.PbfBlockReader;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.testing.PostgresContainerTest;
 import org.apache.baremaps.testing.TestFiles;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
similarity index 98%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java
rename to baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
index 779eca4a..ca701783 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/Constants.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/openstreetmap/repository/Constants.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.openstreetmap.repository;
 
 
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java b/baremaps-core/src/test/java/org/apache/baremaps/postgres/TestContainers.java
similarity index 93%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
rename to baremaps-core/src/test/java/org/apache/baremaps/postgres/TestContainers.java
index 35a89c43..0869206a 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/postgres/TestContainers.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/postgres/TestContainers.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.postgres;
+package org.apache.baremaps.postgres;
 
 public class TestContainers {
 
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresSchemaTest.java b/baremaps-core/src/test/java/org/apache/baremaps/postgres/metadata/PostgresMetadataTest.java
similarity index 92%
rename from baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresSchemaTest.java
rename to baremaps-core/src/test/java/org/apache/baremaps/postgres/metadata/PostgresMetadataTest.java
index 0467e5f8..cf3e9367 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/database/database/PostgresSchemaTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/postgres/metadata/PostgresMetadataTest.java
@@ -10,7 +10,7 @@
  * the License.
  */
 
-package org.apache.baremaps.database.database;
+package org.apache.baremaps.postgres.metadata;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -20,12 +20,12 @@ import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import org.apache.baremaps.database.PostgresUtils;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.testing.PostgresContainerTest;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresSchemaTest extends PostgresContainerTest {
+class PostgresMetadataTest extends PostgresContainerTest {
 
   @Test
   @Tag("integration")
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 39e36fc8..ee8284fb 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
@@ -12,7 +12,7 @@
 
 package org.apache.baremaps.storage;
 
-import static org.apache.baremaps.database.database.Constants.GEOMETRY_FACTORY;
+import static org.apache.baremaps.openstreetmap.repository.Constants.GEOMETRY_FACTORY;
 
 import java.util.Iterator;
 import java.util.List;
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 40fd05c8..94ff98a4 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
@@ -12,7 +12,7 @@
 
 package org.apache.baremaps.storage.postgres;
 
-import static org.apache.baremaps.database.database.Constants.GEOMETRY_FACTORY;
+import static org.apache.baremaps.openstreetmap.repository.Constants.GEOMETRY_FACTORY;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.List;
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/testing/PostgresContainerTest.java b/baremaps-core/src/test/java/org/apache/baremaps/testing/PostgresContainerTest.java
index e9837e50..146e8127 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/testing/PostgresContainerTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/testing/PostgresContainerTest.java
@@ -16,6 +16,8 @@ package org.apache.baremaps.testing;
 
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import java.io.IOException;
+import java.sql.SQLException;
 import javax.sql.DataSource;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -29,7 +31,7 @@ public abstract class PostgresContainerTest {
   private DataSource dataSource;
 
   @BeforeEach
-  public void startContainer() {
+  public void startContainer() throws SQLException, IOException {
     // start the container
     var postgis =
         DockerImageName.parse("ghcr.io/baosystems/postgis:14-3.3")
@@ -39,7 +41,6 @@ public abstract class PostgresContainerTest {
 
     // set the datasource
     HikariConfig config = new HikariConfig();
-    config.setPoolName("BaremapsDataSource");
     config.setJdbcUrl(jdbcUrl());
     dataSource = new HikariDataSource(config);
   }
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
index be69a464..177d01a1 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/tilestore/postgres/PostgresQueryGeneratorTest.java
@@ -16,11 +16,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.database.DatabaseContainerTest;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRepositoryTest;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-class PostgresQueryGeneratorTest extends DatabaseContainerTest {
+class PostgresQueryGeneratorTest extends PostgresRepositoryTest {
 
   @Test
   @Tag("integration")
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
index e7f19519..00770518 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportMonacoTest.java
@@ -22,21 +22,21 @@ import org.apache.baremaps.collection.IndexedDataMap;
 import org.apache.baremaps.collection.memory.OnHeapMemory;
 import org.apache.baremaps.collection.type.CoordinateDataType;
 import org.apache.baremaps.collection.type.LongListDataType;
-import org.apache.baremaps.database.DiffService;
-import org.apache.baremaps.database.collection.PostgresCoordinateMap;
-import org.apache.baremaps.database.collection.PostgresReferenceMap;
-import org.apache.baremaps.database.database.DatabaseContainerTest;
-import org.apache.baremaps.database.repository.PostgresHeaderRepository;
-import org.apache.baremaps.database.repository.PostgresNodeRepository;
-import org.apache.baremaps.database.repository.PostgresRelationRepository;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
+import org.apache.baremaps.openstreetmap.DiffService;
 import org.apache.baremaps.openstreetmap.model.Header;
+import org.apache.baremaps.openstreetmap.postgres.PostgresCoordinateMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresReferenceMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRepositoryTest;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
 import org.apache.baremaps.testing.TestFiles;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 
-class ImportMonacoTest extends DatabaseContainerTest {
+class ImportMonacoTest extends PostgresRepositoryTest {
 
   @Test
   @Tag("integration")
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
index 3cf75f6f..0b947cb6 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateDataTest.java
@@ -25,22 +25,22 @@ import org.apache.baremaps.collection.IndexedDataMap;
 import org.apache.baremaps.collection.memory.OnHeapMemory;
 import org.apache.baremaps.collection.type.CoordinateDataType;
 import org.apache.baremaps.collection.type.LongListDataType;
-import org.apache.baremaps.database.collection.PostgresCoordinateMap;
-import org.apache.baremaps.database.collection.PostgresReferenceMap;
-import org.apache.baremaps.database.database.DatabaseContainerTest;
-import org.apache.baremaps.database.repository.PostgresHeaderRepository;
-import org.apache.baremaps.database.repository.PostgresNodeRepository;
-import org.apache.baremaps.database.repository.PostgresRelationRepository;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
 import org.apache.baremaps.openstreetmap.model.Header;
 import org.apache.baremaps.openstreetmap.model.Node;
 import org.apache.baremaps.openstreetmap.model.Way;
+import org.apache.baremaps.openstreetmap.postgres.PostgresCoordinateMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresReferenceMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRepositoryTest;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 
-class ImportUpdateDataTest extends DatabaseContainerTest {
+class ImportUpdateDataTest extends PostgresRepositoryTest {
 
   @Test
   @Tag("integration")
diff --git a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
index 46fd642b..309f2504 100644
--- a/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
+++ b/baremaps-core/src/test/java/org/apache/baremaps/workflow/tasks/ImportUpdateLiechtensteinTest.java
@@ -24,20 +24,20 @@ import org.apache.baremaps.collection.IndexedDataMap;
 import org.apache.baremaps.collection.memory.OnHeapMemory;
 import org.apache.baremaps.collection.type.CoordinateDataType;
 import org.apache.baremaps.collection.type.LongListDataType;
-import org.apache.baremaps.database.DiffService;
-import org.apache.baremaps.database.collection.PostgresCoordinateMap;
-import org.apache.baremaps.database.collection.PostgresReferenceMap;
-import org.apache.baremaps.database.database.DatabaseContainerTest;
-import org.apache.baremaps.database.repository.PostgresHeaderRepository;
-import org.apache.baremaps.database.repository.PostgresNodeRepository;
-import org.apache.baremaps.database.repository.PostgresRelationRepository;
-import org.apache.baremaps.database.repository.PostgresWayRepository;
+import org.apache.baremaps.openstreetmap.DiffService;
 import org.apache.baremaps.openstreetmap.model.Header;
+import org.apache.baremaps.openstreetmap.postgres.PostgresCoordinateMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresHeaderRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresNodeRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresReferenceMap;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRelationRepository;
+import org.apache.baremaps.openstreetmap.postgres.PostgresRepositoryTest;
+import org.apache.baremaps.openstreetmap.postgres.PostgresWayRepository;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 
-class ImportUpdateLiechtensteinTest extends DatabaseContainerTest {
+class ImportUpdateLiechtensteinTest extends PostgresRepositoryTest {
 
   @Test
   @Tag("integration")
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 0baebd6f..856e08cd 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
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import javax.sql.DataSource;
-import org.apache.baremaps.database.PostgresUtils;
+import org.apache.baremaps.postgres.PostgresUtils;
 import org.apache.baremaps.tilestore.TileStore;
 import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
 import org.apache.baremaps.vectortile.tileset.Tileset;