Refactor modules and add data stores (#903)

* Break dependencies between data store and data collection packages

* Move the data store package in a dedicated module

* Move format specific data store in corresponding modules

* Add a data table for openstreetmap data

* Add a module and data store for csv data

* Add a module and data store for rpsl data

* Add a module for the shapefile format and data store

* Add a module for the postgres data store

* Clean dependencies and improve their scopes

Author: bchapuis

.gitignore

@@ -51,6 +51,7 @@ examples/transformation/*.pbf
 
 # Benchmarking
 baremaps-benchmarking/data/
+baremaps-benchmarking/dependency-reduced-pom.xml
 
 # Docs
 .jekyll-cache/

baremaps-benchmarking/pom.xml

@@ -22,6 +22,7 @@
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-testing</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>

baremaps-cli/pom.xml

@@ -53,20 +53,9 @@ limitations under the License.
       <artifactId>baremaps-server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-jul</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j2-impl</artifactId>
+      <groupId>org.apache.baremaps</groupId>
+      <artifactId>baremaps-testing</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java

@@ -50,7 +50,7 @@ public class ExecuteSql implements Callable<Integer> {
 
   @Override
   public Integer call() throws Exception {
-    new org.apache.baremaps.workflow.tasks.ExecuteSql(database, file.toAbsolutePath(),
+    new org.apache.baremaps.tasks.ExecuteSql(database, file.toAbsolutePath(),
         parallel).execute(new WorkflowContext());
     return 0;
   }

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java

@@ -22,6 +22,7 @@
 import java.nio.file.Path;
 import java.util.concurrent.Callable;
 import org.apache.baremaps.cli.Options;
+import org.apache.baremaps.tasks.ImportOsmPbf;
 import org.apache.baremaps.workflow.WorkflowContext;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
@@ -50,7 +51,7 @@ public class ImportOsm implements Callable<Integer> {
 
   @Override
   public Integer call() throws Exception {
-    new org.apache.baremaps.workflow.tasks.ImportOsmPbf(
+    new ImportOsmPbf(
         file.toAbsolutePath(),
         database,
         srid,

baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java

@@ -21,8 +21,8 @@
 
 import java.util.concurrent.Callable;
 import org.apache.baremaps.cli.Options;
+import org.apache.baremaps.tasks.UpdateOsmDatabase;
 import org.apache.baremaps.workflow.WorkflowContext;
-import org.apache.baremaps.workflow.tasks.UpdateOsmDatabase;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;

baremaps-cli/src/main/java/org/apache/baremaps/cli/dem/VectorTileContours.java

@@ -26,13 +26,13 @@
 import org.apache.baremaps.maplibre.tileset.TilesetLayer;
 import org.apache.baremaps.openstreetmap.stream.ProgressLogger;
 import org.apache.baremaps.openstreetmap.stream.StreamUtils;
+import org.apache.baremaps.tasks.ExportVectorTiles;
 import org.apache.baremaps.tilestore.TileCoord;
 import org.apache.baremaps.tilestore.TileEntry;
 import org.apache.baremaps.tilestore.TileStoreException;
 import org.apache.baremaps.tilestore.pmtiles.PMTilesStore;
 import org.apache.baremaps.tilestore.raster.*;
 import org.apache.baremaps.workflow.WorkflowException;
-import org.apache.baremaps.workflow.tasks.ExportVectorTiles;
 import org.locationtech.jts.geom.Envelope;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;

baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java

@@ -36,13 +36,13 @@
 import org.apache.baremaps.config.ConfigReader;
 import org.apache.baremaps.maplibre.style.Style;
 import org.apache.baremaps.maplibre.tileset.Tileset;
+import org.apache.baremaps.postgres.utils.PostgresUtils;
 import org.apache.baremaps.server.ChangeResource;
 import org.apache.baremaps.server.StyleResource;
 import org.apache.baremaps.server.TilesetResource;
 import org.apache.baremaps.server.VectorTileResource;
 import org.apache.baremaps.tilestore.TileStore;
 import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
-import org.apache.baremaps.utils.PostgresUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;

baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java

@@ -22,8 +22,8 @@
 import java.nio.file.Path;
 import java.util.concurrent.Callable;
 import org.apache.baremaps.cli.Options;
+import org.apache.baremaps.tasks.ExportVectorTiles;
 import org.apache.baremaps.workflow.WorkflowContext;
-import org.apache.baremaps.workflow.tasks.ExportVectorTiles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;

baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java

@@ -37,14 +37,14 @@
 import org.apache.baremaps.maplibre.style.Style;
 import org.apache.baremaps.maplibre.tilejson.TileJSON;
 import org.apache.baremaps.maplibre.tileset.Tileset;
+import org.apache.baremaps.postgres.utils.PostgresUtils;
 import org.apache.baremaps.server.SearchResource;
 import org.apache.baremaps.server.StyleResource;
 import org.apache.baremaps.server.TileJSONResource;
 import org.apache.baremaps.server.VectorTileResource;
 import org.apache.baremaps.tilestore.TileStore;
 import org.apache.baremaps.tilestore.postgres.PostgresTileStore;
 import org.apache.baremaps.tilestore.vector.VectorTileCache;
-import org.apache.baremaps.utils.PostgresUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine.Command;