update OSHDB to version 1.0.0 (#283)

* update OSHDB to version 1.0.0 * add Changelog for update to 1.0.0
GIScience · Nov 23, 2022 · 56d6c6c · 56d6c6c
1 parent 515b729
commit 56d6c6c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,13 @@ Changelog
 
 ### Breaking Changes
 * remove caching command line parameter ([#281])
-* update to OSHDB 1.0.0-SNAPSHOT ([#281])
+* update to OSHDB 1.0.0 ([#281], [#283])
 
 ### New Features
 * tag translator parameter are now configurable via CLI parameter: `tt.maxbytesvalue`, `tt.maxnumroles` ([#281])
 
 [#281]: https://github.com/GIScience/ohsome-api/pull/281
+[#283]: https://github.com/GIScience/ohsome-api/pull/283
 
 
 ## 1.7.0

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <jts2geojson.version>0.17.0</jts2geojson.version>
     <mavenjar.version>3.2.0</mavenjar.version>
     <opencsv.version>5.6</opencsv.version>
-    <oshdb.version>1.0.0-RC1</oshdb.version>
+    <oshdb.version>1.0.0</oshdb.version>
     <projectlombok.version>1.18.16</projectlombok.version>
     <sonar.sources>src/main/lombok</sonar.sources>
     <springboot.version>2.5.14</springboot.version>

diff --git a/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java b/src/main/lombok/org/heigit/ohsome/ohsomeapi/oshdb/DbConnData.java
@@ -9,7 +9,6 @@
 public class DbConnData {
 
   public static OSHDBDatabase db = null;
-  public static OSHDBJdbc keytables = null;
   public static TagTranslator tagTranslator = null;
   public static DataSource dbSource = null;
   public static DataSource keytablesDbSource = null;

diff --git a/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java b/src/main/lombok/org/heigit/ohsome/ohsomeapi/utils/RequestUtils.java
@@ -92,15 +92,7 @@ public static boolean usesCsvFormat(HttpServletRequest request) {
    *         #readTree(String) readTree}
    */
   public static void extractOSHDBMetadata() throws IOException {
-    OSHDBDatabase db;
-    if (DbConnData.keytables != null) {
-      db = DbConnData.keytables;
-    } else {
-      if (!(DbConnData.db instanceof OSHDBJdbc)) {
-        throw new DatabaseAccessException(ExceptionMessages.DATABASE_ACCESS);
-      }
-      db = DbConnData.db;
-    }
+    OSHDBDatabase db = DbConnData.db;
     if (db.metadata("extract.region") != null) {
       String dataPolyString = db.metadata("extract.region");
       ObjectMapper mapper = new ObjectMapper();