Cleanup OGC API (#793)

* Cleanup OGC API implementation * Remove the jaxb dependency * Remove the activation dependency * Remove the validation dependency * Remove the servlet api dependency
apache · Oct 24, 2023 · 9296870 · 9296870
1 parent 2e8501a
commit 9296870
Show file tree

Hide file tree

Showing 44 changed files with 1 addition and 4,303 deletions.
diff --git a/.run/basemap-dev.run.xml b/.run/basemap-dev.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/basemap-mbtiles.run.xml b/.run/basemap-mbtiles.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/basemap-serve.run.xml b/.run/basemap-serve.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/basemap-workflow.run.xml b/.run/basemap-workflow.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/basemap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/openstreetmap-dev.run.xml b/.run/openstreetmap-dev.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/openstreetmap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/openstreetmap-export.run.xml b/.run/openstreetmap-export.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/openstreetmap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/openstreetmap-serve.run.xml b/.run/openstreetmap-serve.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/openstreetmap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/openstreetmap-workflow.run.xml b/.run/openstreetmap-workflow.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/openstreetmap" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/simplification-workflow.run.xml b/.run/simplification-workflow.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/simplification" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/transformation-workflow.run.xml b/.run/transformation-workflow.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/transformation" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/workflow-execute.run.xml b/.run/workflow-execute.run.xml
@@ -6,7 +6,6 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/simplification" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/.run/workflow-init.run.xml b/.run/workflow-init.run.xml
@@ -5,7 +5,6 @@
     <option name="PROGRAM_PARAMETERS" value="workflow init --file sample-workflow.json" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="org.apache.baremaps.server.ogcapi.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -66,7 +66,6 @@ The source code of Baremaps is organized in modules:
 - `baremaps-cli` contains the command line interface.
 - `baremaps-core` contains the core features.
 - `baremaps-server` contains web resources.
-- `baremaps-ogcapi` contains ogcapi resources (experimental).
 
 The naming convention used for the modules is 'baremaps-{component}'.
 Here, component corresponds to the api and the main implementation of a component.

diff --git a/baremaps-benchmark/pom.xml b/baremaps-benchmark/pom.xml
@@ -34,11 +34,6 @@ limitations under the License.
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <version>${version.lib.annotation-api}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-core</artifactId>

diff --git a/baremaps-cli/pom.xml b/baremaps-cli/pom.xml
@@ -63,10 +63,6 @@ limitations under the License.
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.baremaps</groupId>
-      <artifactId>baremaps-ogcapi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.baremaps</groupId>
       <artifactId>baremaps-server</artifactId>

diff --git a/baremaps-cli/src/license/override.properties b/baremaps-cli/src/license/override.properties
@@ -3,7 +3,6 @@ com.fasterxml.jackson.core--jackson-core--2.13.0=Apache License 2.0
 com.fasterxml.jackson.core--jackson-databind--2.13.0=Apache License 2.0
 com.fasterxml.jackson.dataformat--jackson-dataformat-csv--2.13.0=Apache License 2.0
 com.fasterxml.jackson.dataformat--jackson-dataformat-yaml--2.13.0=Apache License 2.0
-com.fasterxml.jackson.datatype--jackson-datatype-jdk8--2.13.0=Apache License 2.0
 com.fasterxml.jackson.datatype--jackson-datatype-jsr310--2.14.2=Apache License 2.0
 com.github.ben-manes.caffeine--caffeine--3.1.1=Apache License 2.0
 com.github.java-json-tools--btf--1.3=Apache License 2.0
@@ -29,10 +28,7 @@ com.googlecode.libphonenumber--libphonenumber--8.11.1=Apache License 2.0
 com.ibm.icu--icu4j--71.1=Unicode/ICU License
 com.j256.ormlite--ormlite-jdbc--6.1=ISC License
 com.jayway.jsonpath--json-path--2.7.0=Apache License 2.0
-com.sun.activation--jakarta.activation--1.2.2=Eclipse Distribution License 1.0
 com.sun.istack--istack-commons-runtime--3.0.12=Eclipse Distribution License 1.0
-com.sun.xml.bind--jaxb-core--2.3.0.1=Common Development and Distribution License 1.1
-com.sun.xml.bind--jaxb-impl--2.3.3=Eclipse Distribution License 1.0
 com.yahoo.datasketches--memory--0.9.0=Apache License 2.0
 com.yahoo.datasketches--sketches-core--0.9.0=Apache License 2.0
 com.zaxxer--HikariCP--5.0.1=Apache License 2.0
@@ -99,22 +95,8 @@ io.servicetalk--servicetalk-transport-netty--0.42.28=Apache License 2.0
 io.servicetalk--servicetalk-transport-netty-internal--0.42.28=Apache License 2.0
 io.servicetalk--servicetalk-utils-internal--0.42.28=Apache License 2.0
 io.sgr--s2-geometry-library-java--1.0.0=Apache License 2.0
-io.swagger--swagger-annotations--1.6.10=Apache License 2.0
-io.swagger--swagger-compat-spec-parser--1.0.65=Apache License 2.0
-io.swagger--swagger-core--1.6.10=Apache License 2.0
-io.swagger--swagger-models--1.6.10=Apache License 2.0
-io.swagger--swagger-parser--1.0.65=Apache License 2.0
-io.swagger.core.v3--swagger-annotations--2.2.9=Apache License 2.0
-io.swagger.core.v3--swagger-core--2.2.9=Apache License 2.0
-io.swagger.core.v3--swagger-models--2.2.9=Apache License 2.0
-io.swagger.parser.v3--swagger-parser--2.1.13=Apache License 2.0
-io.swagger.parser.v3--swagger-parser-core--2.1.13=Apache License 2.0
-io.swagger.parser.v3--swagger-parser-v2-converter--2.1.13=Apache License 2.0
-io.swagger.parser.v3--swagger-parser-v3--2.1.13=Apache License 2.0
 it.unimi.dsi--fastutil--8.5.9=Apache License 2.0
-jakarta.activation--jakarta.activation-api--1.2.2=Eclipse Distribution License 1.0
 jakarta.annotation--jakarta.annotation-api--1.3.5=Eclipse Public License 2.0
-jakarta.validation--jakarta.validation-api--2.0.2=Apache License 2.0
 jakarta.ws.rs--jakarta.ws.rs-api--2.1.6=Eclipse Public License 2.0
 jakarta.xml.bind--jakarta.xml.bind-api--2.3.3=Eclipse Distribution License 1.0
 joda-time--joda-time--2.10.5=Apache License 2.0
@@ -137,7 +119,6 @@ net.ripe.ipresource--ipresource--1.49=BSD License
 net.sf.jopt-simple--jopt-simple--5.0.4=MIT License
 org.antlr--antlr4-runtime--4.5.1-1=BSD License
 org.apache.baremaps--baremaps-core--0.7.2-SNAPSHOT=Apache License 2.0
-org.apache.baremaps--baremaps-ogcapi--0.7.2-SNAPSHOT=Apache License 2.0
 org.apache.baremaps--baremaps-server--0.7.2-SNAPSHOT=Apache License 2.0
 org.apache.calcite--calcite-core--1.34.0=Apache License 2.0
 org.apache.calcite--calcite-linq4j--1.34.0=Apache License 2.0
@@ -174,8 +155,6 @@ org.glassfish.hk2--hk2-utils--2.6.1=Eclipse Public License 2.0
 org.glassfish.hk2--osgi-resource-locator--1.0.3=Eclipse Public License 2.0
 org.glassfish.hk2.external--aopalliance-repackaged--2.6.1=Eclipse Public License 2.0
 org.glassfish.hk2.external--jakarta.inject--2.6.1=Eclipse Public License 2.0
-org.glassfish.jaxb--jaxb-runtime--2.3.5=Eclipse Distribution License 1.0
-org.glassfish.jaxb--txw2--2.3.5=Eclipse Distribution License 1.0
 org.glassfish.jersey.core--jersey-client--2.35=Apache License 2.0
 org.glassfish.jersey.core--jersey-common--2.35=Apache License 2.0
 org.glassfish.jersey.core--jersey-server--2.35=Apache License 2.0

diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
@@ -28,7 +28,6 @@
 import org.apache.baremaps.cli.geocoder.Geocoder;
 import org.apache.baremaps.cli.iploc.IpLoc;
 import org.apache.baremaps.cli.map.Map;
-import org.apache.baremaps.cli.ogcapi.OgcApi;
 import org.apache.baremaps.cli.workflow.Workflow;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -39,7 +38,7 @@
 
 @Command(name = "baremaps", description = "A toolkit for producing vector tiles.",
     versionProvider = VersionProvider.class, subcommands = {Workflow.class, Database.class,
-        Map.class, Geocoder.class, IpLoc.class, OgcApi.class},
+        Map.class, Geocoder.class, IpLoc.class},
     sortOptions = false)
 public class Baremaps implements Callable<Integer> {
 

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
diff --git a/baremaps-core/pom.xml b/baremaps-core/pom.xml
@@ -46,10 +46,6 @@ limitations under the License.
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>

diff --git a/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tilejson/TileJSON.java b/baremaps-core/src/main/java/org/apache/baremaps/vectortile/tilejson/TileJSON.java
@@ -27,10 +27,6 @@
  * <br>
  * Mainly used to project the `--tileset` configuration file to a version for clients.
  *
- * <br>
- * Implementation notes: Could not be implemented with Java Record because a class was using a
- * setter post instance creation (in baremaps-ogcapi).
- *
  * @see <a href="https://docs.mapbox.com/help/glossary/tilejson/">
  *      https://docs.mapbox.com/help/glossary/tilejson/</a>
  * @see <a href="https://github.com/mapbox/tilejson-spec">