From 24991ab484aab3eb9a951dc7b9172b6bc4a68b22 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 17 May 2020 18:15:06 +0200 Subject: [PATCH 1/3] update dependencies This updates all dependencies to the newest version where it is possible without any code rewrites. --- pom.xml | 19 ++++++++++--------- .../komoot/photon/elasticsearch/Server.java | 6 ++++-- .../query/TagFilterQueryBuilderTest.java | 5 +++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 3a5af2950..03c69b93d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ com.beust jcommander - 1.32 + 1.78 org.openstreetmap.osmosis @@ -68,17 +68,18 @@ org.apache.commons commons-lang3 - 3.3.2 + 3.10 org.codehaus.jackson jackson-jaxrs - 1.4.0 + 1.9.13 + test com.neovisionaries nv-i18n - 1.4 + 1.27 org.projectlombok @@ -119,14 +120,14 @@ junit junit - 4.12 + 4.13 test org.mockito mockito-core - 2.24.0 + 2.25.0 test @@ -149,12 +150,12 @@ commons-io commons-io - 2.4 + 2.6 org.json json - 20140107 + 20190722 commons-beanutils @@ -315,7 +316,7 @@ UTF-8 5.5.0 - 1.7.25 + 1.7.30 2.8.2 -Xdoclint:none diff --git a/src/main/java/de/komoot/photon/elasticsearch/Server.java b/src/main/java/de/komoot/photon/elasticsearch/Server.java index 3c4aad91f..b3b549ceb 100644 --- a/src/main/java/de/komoot/photon/elasticsearch/Server.java +++ b/src/main/java/de/komoot/photon/elasticsearch/Server.java @@ -25,6 +25,7 @@ import java.net.InetSocketAddress; import java.net.URISyntaxException; import java.net.URL; +import java.nio.charset.Charset; import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.Arrays; @@ -184,14 +185,15 @@ public void recreateIndex() throws IOException { .getResourceAsStream("mappings.json"); final InputStream index_settings = Thread.currentThread().getContextClassLoader() .getResourceAsStream("index_settings.json"); + final Charset utf8_charset = Charset.forName("utf-8"); - String mappingsString = IOUtils.toString(mappings); + String mappingsString = IOUtils.toString(mappings, utf8_charset); JSONObject mappingsJSON = new JSONObject(mappingsString); // add all langs to the mapping mappingsJSON = addLangsToMapping(mappingsJSON); - JSONObject settings = new JSONObject(IOUtils.toString(index_settings)); + JSONObject settings = new JSONObject(IOUtils.toString(index_settings, utf8_charset)); if (shards != null) { settings.put("index", new JSONObject("{ \"number_of_shards\":" + shards + " }")); } diff --git a/src/test/java/de/komoot/photon/query/TagFilterQueryBuilderTest.java b/src/test/java/de/komoot/photon/query/TagFilterQueryBuilderTest.java index 5ed055c91..b62bc2b12 100644 --- a/src/test/java/de/komoot/photon/query/TagFilterQueryBuilderTest.java +++ b/src/test/java/de/komoot/photon/query/TagFilterQueryBuilderTest.java @@ -13,6 +13,7 @@ import java.io.IOException; import java.io.InputStream; +import java.nio.charset.Charset; public class TagFilterQueryBuilderTest { @@ -21,7 +22,7 @@ public void testConstructor() throws IOException { TagFilterQueryBuilder photonQueryBuilder = PhotonQueryBuilder.builder("berlin", "en"); InputStream resourceAsStream = this.getClass().getClassLoader() .getResourceAsStream("json_queries/test_base_query.json"); - String expectedJsonString = IOUtils.toString(resourceAsStream); + String expectedJsonString = IOUtils.toString(resourceAsStream, Charset.forName("utf-8")); String actualJsonString = new QueryToJson().convert(photonQueryBuilder.buildQuery()); JsonNode actualJson = this.readJson(actualJsonString); @@ -34,7 +35,7 @@ public void testFrenchConstructor() throws IOException { TagFilterQueryBuilder photonQueryBuilder = PhotonQueryBuilder.builder("berlin", "fr"); InputStream resourceAsStream = this.getClass().getClassLoader() .getResourceAsStream("json_queries/test_base_query_fr.json"); - String expectedJsonString = IOUtils.toString(resourceAsStream); + String expectedJsonString = IOUtils.toString(resourceAsStream, Charset.forName("utf-8")); String actualJsonString = new QueryToJson().convert(photonQueryBuilder.buildQuery()); JsonNode actualJson = this.readJson(actualJsonString); From daf1d644a5c9daf9c1edc2932b3b09ebff1a222f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 17 May 2020 20:31:13 +0200 Subject: [PATCH 2/3] update guava dependency Requires replacement of some functions that have moved. --- pom.xml | 2 +- .../java/de/komoot/photon/nominatim/model/AddressRow.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 03c69b93d..c6ae7bb64 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,7 @@ com.google.guava guava - 19.0 + 29.0-jre net.lingala.zip4j diff --git a/src/main/java/de/komoot/photon/nominatim/model/AddressRow.java b/src/main/java/de/komoot/photon/nominatim/model/AddressRow.java index 2086a5d92..f9d85aa88 100644 --- a/src/main/java/de/komoot/photon/nominatim/model/AddressRow.java +++ b/src/main/java/de/komoot/photon/nominatim/model/AddressRow.java @@ -1,6 +1,6 @@ package de.komoot.photon.nominatim.model; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import lombok.Data; import java.util.Arrays; @@ -92,7 +92,7 @@ public boolean isState() { @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("placeId", placeId) .add("name", name) .add("osmKey", osmKey) From 69f37442f4bda20747e306cbbb62118e36032c2f Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 17 May 2020 18:15:39 +0200 Subject: [PATCH 3/3] remove unused dependencies Removes beanutils, zip4j and findbugs. --- pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/pom.xml b/pom.xml index c6ae7bb64..0bc2c4fa7 100644 --- a/pom.xml +++ b/pom.xml @@ -107,11 +107,6 @@ spark-core 2.8.0 - - com.google.code.findbugs - jsr305 - 2.0.2 - postgis postgis-jdbc-jts @@ -142,11 +137,6 @@ guava 29.0-jre - - net.lingala.zip4j - zip4j - 1.2.3 - commons-io commons-io @@ -157,13 +147,6 @@ json 20190722 - - commons-beanutils - commons-beanutils - 1.9.2 - test - -