Move oshdb-api's backend implementation into separate submodule(s)

CHANGELOG.md

@@ -9,6 +9,7 @@ Changelog
 * integrate [ohsome-filter](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/libs/ohsome-filter) module fully into this repository, renaming it to `oshdb-filter` ([#306])
 * rename and move submodules of `oshdb-tool` ([#384])
 * rename some classes, methods and enum constants; move some classes/interfaces ([#369], [#374])
+* move the oshdb-api's ignite backend implementation into its own submodule `oshdb-api-ignite` ([#387])
 
 > See the _upgrading from 0.6_ section below for instructions how to update your code according to these breaking changes.
 
@@ -27,6 +28,7 @@ Changelog
 * reorganize and update ohsome parent module, requires maven version 3.6 or higher ([#360], [#375])
 * add new interfaces `OSHDBTemporal` and `OSHDBBoundable` ([#369])
 * major improvements to code style guide adherence; fix some potential bugs found in static code analyis ([#374])
+* upgrade apache ignite to version 2.10.0 ([#386])
 
 ### bugfixes
 
@@ -53,6 +55,14 @@ Changelog
   | moved class | `CellIterator.OSMEntityFilter` | `oshdb-util/oshdb.osm.OSMEntityFilter` |
   | moved class | `oshdb-api.generic.function` | `oshdb-util/oshdb.util.function` |
   | renamed enum constants | `ComputeMode.LocalPeek`, `….ScanQuery`, `….AffinityCall` | `ComputeMode.LOCAL_PEEK`, `….SCAN_QUERY`, `….AFFINITY_CALL` |
+* if you are using the ignite backend, you need to add the following dependency to your project:
+  ```xml
+    <dependency>
+      <groupId>org.heigit.ohsome</groupId>
+      <artifactId>oshdb-api-ignite</artifactId>
+      <version>0.7.0</version>
+    </dependency>
+  ```
 
 
 [#306]: https://github.com/GIScience/oshdb/pull/306
@@ -66,6 +76,8 @@ Changelog
 [#375]: https://github.com/GIScience/oshdb/pull/375
 [#380]: https://github.com/GIScience/oshdb/pull/380
 [#384]: https://github.com/GIScience/oshdb/pull/384
+[#386]: https://github.com/GIScience/oshdb/issues/386
+[#387]: https://github.com/GIScience/oshdb/pull/387
 
 
 ## 0.6.4

oshdb-api-ignite/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.heigit.ohsome</groupId>
+    <artifactId>oshdb-parent</artifactId>
+    <version>0.7.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>oshdb-api-ignite</artifactId>
+  <name>OSHDB API – Ignite backend</name>
+  <description>Backend implementation of the OSHDB API which runs queries on an Apache Ignite cluster.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>oshdb-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>oshdb-api</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.ignite</groupId>
+      <artifactId>ignite-core</artifactId>
+      <version>${ignite.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.ignite</groupId>
+      <artifactId>ignite-spring</artifactId>
+      <version>${ignite.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.ignite</groupId>
+      <artifactId>ignite-slf4j</artifactId>
+      <version>${ignite.version}</version>
+    </dependency>
+  </dependencies>
+</project>

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBIgnite.java → oshdb-api-ignite/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduceOSHDBIgnite.java

@@ -52,7 +52,7 @@ public TestMapReduceOSHDBIgnite(OSHDBIgnite oshdb) throws Exception {
     final String prefix = "tests";
     oshdb.prefix(prefix);
 
-    OSHDBH2 oshdbH2 = new OSHDBH2("./src/test/resources/test-data");
+    OSHDBH2 oshdbH2 = new OSHDBH2("../oshdb-api/src/test/resources/test-data");
     this.keytables = oshdbH2;
 
     Ignite ignite = ((OSHDBIgnite) this.oshdb).getIgnite();

oshdb-api/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb-api</artifactId>
@@ -53,24 +51,6 @@
       <artifactId>postgresql</artifactId>
       <version>${postgresql.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.ignite</groupId>
-      <artifactId>ignite-core</artifactId>
-      <version>${ignite.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.ignite</groupId>
-      <artifactId>ignite-spring</artifactId>
-      <version>${ignite.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.ignite</groupId>
-      <artifactId>ignite-slf4j</artifactId>
-      <version>${ignite.version}</version>
-    </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -109,4 +89,33 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar--compile</id>
+            <phase>
+              compile
+            </phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-jar--test</id>
+            <phase>
+              test
+            </phase>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

oshdb-api/src/main/java/org/heigit/ohsome/oshdb/api/db/OSHDBDatabase.java

@@ -46,7 +46,7 @@ public String prefix() {
   }
 
   /**
-   * Set a timeout for queries on this ignite oshdb backend.
+   * Set a timeout for queries on this oshdb backend.
    *
    * <p>If a query takes longer than the given time limit, a {@link OSHDBTimeoutException} will be
    * thrown.</p>
@@ -59,7 +59,7 @@ public OSHDBDatabase timeout(double seconds) {
   }
 
   /**
-   * Clears a previously set timeout for queries on this ignite oshdb backend.
+   * Clears a previously set timeout for queries on this oshdb backend.
    *
    * @return the current oshdb object
    */
@@ -69,7 +69,7 @@ public OSHDBDatabase clearTimeout() {
   }
 
   /**
-   * Set a timeout for queries on this ignite oshdb backend.
+   * Set a timeout for queries on this oshdb backend.
    *
    * <p>If a query takes longer than the given time limit, a {@link OSHDBTimeoutException} will be
    * thrown.</p>
@@ -83,7 +83,7 @@ public OSHDBDatabase timeoutInMilliseconds(long milliSeconds) {
   }
 
   /**
-   * Gets the timeout for queries on this ignite oshdb backend, if present.
+   * Gets the timeout for queries on this oshdb backend, if present.
    *
    * @return the currently set query timeout in milliseconds
    */

oshdb-api/src/test/java/org/heigit/ohsome/oshdb/api/tests/TestMapReduce.java

@@ -20,7 +20,7 @@
 import org.junit.Test;
 
 /**
- * Test basic map-reduce method of the OSHDB API.
+ * Base class for testing the map-reducer backend implementations of the OSHDB API.
  */
 abstract class TestMapReduce {
   final OSHDBDatabase oshdb;

oshdb-etl/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb-etl</artifactId>

oshdb-filter/pom.xml

@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb-filter</artifactId>

oshdb-oshpbf-parser/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb-oshpbf-parser</artifactId>

oshdb-util/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb-util</artifactId>

oshdb/pom.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.heigit.ohsome</groupId>
     <artifactId>oshdb-parent</artifactId>
     <version>0.7.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>oshdb</artifactId>

pom.xml

@@ -21,11 +21,12 @@
 
   <modules>
     <module>oshdb</module>
-    <module>oshdb-api</module>
-    <module>oshdb-filter</module>
-    <module>oshdb-etl</module>
-    <module>oshdb-oshpbf-parser</module>
     <module>oshdb-util</module>
+    <module>oshdb-oshpbf-parser</module>
+    <module>oshdb-etl</module>
+    <module>oshdb-filter</module>
+    <module>oshdb-api</module>
+    <module>oshdb-api-ignite</module>
   </modules>
 
   <properties>
@@ -37,7 +38,7 @@
     <googlejson.version>1.1.1</googlejson.version>
     <guava.version>29.0-jre</guava.version>
     <h2.version>1.4.197</h2.version>
-    <ignite.version>2.9.0</ignite.version>
+    <ignite.version>2.10.0</ignite.version>
     <jcommander.version>1.72</jcommander.version>
     <jetbrainsannotations.version>13.0</jetbrainsannotations.version>
     <jts.version>1.16.1</jts.version>