2 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/org/traccar/geocoder/Geocoder.java b/src/main/java/org/traccar/geocoder/Geocoder.java
index 587a27520..f4abe871a 100644
--- a/src/main/java/org/traccar/geocoder/Geocoder.java
+++ b/src/main/java/org/traccar/geocoder/Geocoder.java
@@ -15,6 +15,8 @@
  */
 package org.traccar.geocoder;
 
+import org.traccar.database.StatisticsManager;
+
 public interface Geocoder {
 
     interface ReverseGeocoderCallback {
@@ -27,4 +29,6 @@ public interface Geocoder {
 
     String getAddress(double latitude, double longitude, ReverseGeocoderCallback callback);
 
+    void setStatisticsManager(StatisticsManager statisticsManager);
+
 }
diff --git a/src/main/java/org/traccar/geocoder/JsonGeocoder.java b/src/main/java/org/traccar/geocoder/JsonGeocoder.java
index 0262de18c..6105e8cfd 100644
--- a/src/main/java/org/traccar/geocoder/JsonGeocoder.java
+++ b/src/main/java/org/traccar/geocoder/JsonGeocoder.java
@@ -17,7 +17,6 @@ package org.traccar.geocoder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.Main;
 import org.traccar.database.StatisticsManager;
 
 import javax.json.JsonObject;
@@ -36,6 +35,7 @@ public abstract class JsonGeocoder implements Geocoder {
     private final Client client;
     private final String url;
     private final AddressFormat addressFormat;
+    private StatisticsManager statisticsManager;
 
     private Map<Map.Entry<Double, Double>, String> cache;
 
@@ -44,7 +44,7 @@ public abstract class JsonGeocoder implements Geocoder {
         this.url = url;
         this.addressFormat = addressFormat;
         if (cacheSize > 0) {
-            this.cache = Collections.synchronizedMap(new LinkedHashMap<Map.Entry<Double, Double>, String>() {
+            this.cache = Collections.synchronizedMap(new LinkedHashMap<>() {
                 @Override
                 protected boolean removeEldestEntry(Map.Entry eldest) {
                     return size() > cacheSize;
@@ -53,6 +53,11 @@ public abstract class JsonGeocoder implements Geocoder {
         }
     }
 
+    @Override
+    public void setStatisticsManager(StatisticsManager statisticsManager) {
+        this.statisticsManager = statisticsManager;
+    }
+
     protected String readValue(JsonObject object, String key) {
         if (object.containsKey(key) && !object.isNull(key)) {
             return object.getString(key);
@@ -98,8 +103,8 @@ public abstract class JsonGeocoder implements Geocoder {
             }
         }
 
-        if (Main.getInjector() != null) {
-            Main.getInjector().getInstance(StatisticsManager.class).registerGeocoderRequest();
+        if (statisticsManager != null) {
+            statisticsManager.registerGeocoderRequest();
         }
 
         var request = client.target(String.format(url, latitude, longitude)).request();