Skip to content

Commit b904b39

Browse files
lonvialonvia
authored
Merge pull request #896 from lonvia/code-cleanup
Code cleanup
2 parents bdca0a8 + 164c8df commit b904b39

46 files changed

Lines changed: 507 additions & 703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/es_embedded/src/main/java/de/komoot/photon/Server.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import de.komoot.photon.query.SimpleSearchRequest;
66
import de.komoot.photon.query.StructuredSearchRequest;
77
import de.komoot.photon.searcher.SearchHandler;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
810
import org.elasticsearch.action.get.GetResponse;
911
import org.elasticsearch.client.Client;
1012
import org.elasticsearch.client.transport.TransportClient;
@@ -19,7 +21,6 @@
1921
import org.elasticsearch.plugins.Plugin;
2022
import org.elasticsearch.transport.Netty4Plugin;
2123
import org.elasticsearch.transport.client.PreBuiltTransportClient;
22-
import org.slf4j.Logger;
2324

2425
import java.io.File;
2526
import java.io.IOException;
@@ -49,7 +50,7 @@ public class Server {
4950
*/
5051
public static final String DATABASE_VERSION = "0.3.6-1";
5152

52-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Server.class);
53+
private static final Logger LOGGER = LogManager.getLogger();
5354

5455
public static final String PROPERTY_DOCUMENT_ID = "DATABASE_PROPERTIES";
5556

‎app/es_embedded/src/main/java/de/komoot/photon/elasticsearch/ElasticResult.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import de.komoot.photon.Constants;
66
import de.komoot.photon.searcher.PhotonResult;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
79
import org.elasticsearch.search.SearchHit;
8-
import org.slf4j.Logger;
9-
import org.json.JSONObject;
1010

1111
import java.util.List;
1212
import java.util.Map;
@@ -15,7 +15,7 @@
1515
* Response object from the ElasticSearch database.
1616
*/
1717
public class ElasticResult implements PhotonResult {
18-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(ElasticResult.class);
18+
private static final Logger LOGGER = LogManager.getLogger();
1919

2020
private static final String[] NAME_PRECEDENCE = {"default", "housename", "int", "loc", "reg", "alt", "old"};
2121

‎app/es_embedded/src/main/java/de/komoot/photon/elasticsearch/Importer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
import de.komoot.photon.DatabaseProperties;
44
import de.komoot.photon.PhotonDoc;
5-
import de.komoot.photon.ConfigExtraTags;
5+
import org.apache.logging.log4j.LogManager;
6+
import org.apache.logging.log4j.Logger;
67
import org.elasticsearch.action.bulk.BulkRequestBuilder;
78
import org.elasticsearch.action.bulk.BulkResponse;
89
import org.elasticsearch.client.Client;
9-
import org.slf4j.Logger;
1010

1111
import java.io.IOException;
1212

1313
/**
1414
* Elasticsearch importer
1515
*/
1616
public class Importer implements de.komoot.photon.Importer {
17-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Importer.class);
17+
private static final Logger LOGGER = LogManager.getLogger();
1818

1919
private int documentCount = 0;
2020

‎app/es_embedded/src/main/java/de/komoot/photon/elasticsearch/IndexMapping.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package de.komoot.photon.elasticsearch;
22

3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
35
import org.elasticsearch.client.Client;
46
import org.elasticsearch.common.xcontent.XContentType;
57
import org.json.JSONArray;
68
import org.json.JSONObject;
79
import org.json.JSONTokener;
8-
import org.slf4j.Logger;
910

1011
import java.io.InputStream;
1112

1213
/**
1314
* ElasticSearch index mapping for the photon index.
1415
*/
1516
public class IndexMapping {
16-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(IndexMapping.class);
17+
private static final Logger LOGGER = LogManager.getLogger();
1718

1819
private final JSONObject mappings;
1920

‎app/es_embedded/src/main/java/de/komoot/photon/elasticsearch/Updater.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@
33
import de.komoot.photon.DatabaseProperties;
44
import de.komoot.photon.PhotonDoc;
55
import de.komoot.photon.ConfigExtraTags;
6+
import org.apache.logging.log4j.LogManager;
7+
import org.apache.logging.log4j.Logger;
68
import org.elasticsearch.action.bulk.BulkRequestBuilder;
79
import org.elasticsearch.action.bulk.BulkResponse;
810
import org.elasticsearch.client.Client;
9-
import org.slf4j.Logger;
1011

1112
import java.io.IOException;
1213

1314
/**
1415
* Updater for ElasticSearch.
1516
*/
1617
public class Updater implements de.komoot.photon.Updater {
17-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Updater.class);
18+
private static final Logger LOGGER = LogManager.getLogger();
1819

1920
private final Client esClient;
2021
private BulkRequestBuilder bulkRequest;

‎app/es_embedded/src/test/java/de/komoot/photon/elasticsearch/ElasticGetIdResult.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.komoot.photon.elasticsearch;
22

33
import de.komoot.photon.searcher.PhotonResult;
4-
import org.apache.commons.lang3.NotImplementedException;
54
import org.elasticsearch.action.get.GetResponse;
65

76
import java.util.Map;
@@ -20,7 +19,7 @@ public Object get(String key) {
2019

2120
@Override
2221
public String getLocalised(String key, String language) {
23-
throw new NotImplementedException();
22+
throw new UnsupportedOperationException();
2423
}
2524

2625
@Override
@@ -30,25 +29,25 @@ public Map<String, String> getMap(String key) {
3029

3130
@Override
3231
public double[] getCoordinates() {
33-
throw new NotImplementedException();
32+
throw new UnsupportedOperationException();
3433
}
3534

3635
public String getGeometry() {
37-
throw new NotImplementedException();
36+
throw new UnsupportedOperationException();
3837
}
3938

4039
@Override
4140
public double[] getExtent() {
42-
throw new NotImplementedException();
41+
throw new UnsupportedOperationException();
4342
}
4443

4544
@Override
4645
public double getScore() {
47-
throw new NotImplementedException();
46+
throw new UnsupportedOperationException();
4847
}
4948

5049
@Override
5150
public Map<String, Object> getRawData() {
52-
throw new NotImplementedException();
51+
throw new UnsupportedOperationException();
5352
}
5453
}

‎app/opensearch/src/main/java/de/komoot/photon/Server.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
import de.komoot.photon.query.StructuredSearchRequest;
99
import de.komoot.photon.searcher.SearchHandler;
1010
import org.apache.hc.core5.http.HttpHost;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
1113
import org.codelibs.opensearch.runner.OpenSearchRunner;
1214
import org.opensearch.client.json.jackson.JacksonJsonpMapper;
1315
import org.opensearch.client.opensearch.OpenSearchClient;
1416
import org.opensearch.client.opensearch._types.HealthStatus;
1517
import org.opensearch.client.opensearch._types.OpenSearchException;
1618
import org.opensearch.client.transport.httpclient5.ApacheHttpClient5TransportBuilder;
17-
import org.slf4j.Logger;
1819

1920
import java.io.File;
2021
import java.io.IOException;
@@ -31,13 +32,7 @@ public class Server {
3132
*/
3233
public static final String DATABASE_VERSION = "0.3.6-1";
3334

34-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Server.class);
35-
36-
// public static final String OPENSEARCH_MODULES =
37-
// "org.opensearch.transport.Netty4Plugin,"
38-
// + "org.opensearch.analysis.common.CommonAnalysisPlugin,"
39-
// + "org.opensearch.geo.GeoModulePlugin,"
40-
// + "org.opensearch.geospatial.plugin.GeospatialPlugin";
35+
private static final Logger LOGGER = LogManager.getLogger();
4136

4237
protected OpenSearchClient client;
4338
private OpenSearchRunner runner = null;

‎app/opensearch/src/main/java/de/komoot/photon/opensearch/AddressQueryBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package de.komoot.photon.opensearch;
22

33
import de.komoot.photon.Constants;
4-
import org.apache.commons.lang3.StringUtils;
54
import org.opensearch.client.opensearch._types.FieldValue;
65
import org.opensearch.client.opensearch._types.query_dsl.*;
76
import org.opensearch.common.unit.Fuzziness;
@@ -134,7 +133,7 @@ public AddressQueryBuilder addPostalCode(String postalCode) {
134133
Fuzziness fuzziness = lenient ? Fuzziness.AUTO : Fuzziness.ZERO;
135134

136135
Query query;
137-
if (StringUtils.containsWhitespace(postalCode)) {
136+
if (postalCode.contains(" ")) {
138137
query = QueryBuilders.match()
139138
.field(Constants.POSTCODE)
140139
.query(FieldValue.of(postalCode))

‎app/opensearch/src/main/java/de/komoot/photon/opensearch/Importer.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package de.komoot.photon.opensearch;
22

33
import de.komoot.photon.PhotonDoc;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
46
import org.opensearch.client.opensearch.OpenSearchClient;
57
import org.opensearch.client.opensearch._types.Time;
68
import org.opensearch.client.opensearch.core.BulkRequest;
79
import org.opensearch.client.opensearch.core.bulk.BulkResponseItem;
8-
import org.slf4j.Logger;
910

1011
import java.io.IOException;
1112

1213
public class Importer implements de.komoot.photon.Importer {
13-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Importer.class);
14+
private static final Logger LOGGER = LogManager.getLogger();
1415

1516
private final OpenSearchClient client;
1617
private BulkRequest.Builder bulkRequest = new BulkRequest.Builder();

‎app/opensearch/src/main/java/de/komoot/photon/opensearch/Updater.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package de.komoot.photon.opensearch;
22

33
import de.komoot.photon.PhotonDoc;
4+
import org.apache.logging.log4j.LogManager;
5+
import org.apache.logging.log4j.Logger;
46
import org.opensearch.client.opensearch.OpenSearchClient;
57
import org.opensearch.client.opensearch.core.BulkRequest;
6-
import org.slf4j.Logger;
78

89
import java.io.IOException;
910

1011
public class Updater implements de.komoot.photon.Updater {
11-
private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(Updater.class);
12+
private static final Logger LOGGER = LogManager.getLogger();
1213

1314
private final OpenSearchClient client;
1415
private BulkRequest.Builder bulkRequest = new BulkRequest.Builder();

0 commit comments

Comments
 (0)