diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-11 15:04:51 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-11 15:04:51 -0700 |
commit | 7c08991f12b4958135fdffc26f272677c03630ad (patch) | |
tree | c1111ec78bad1dd8b0e4eb8f0c9194095d154d57 /src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java | |
parent | 4025a42c42e34bb620f4263de05781a10ddc7a9d (diff) | |
download | trackermap-server-7c08991f12b4958135fdffc26f272677c03630ad.tar.gz trackermap-server-7c08991f12b4958135fdffc26f272677c03630ad.tar.bz2 trackermap-server-7c08991f12b4958135fdffc26f272677c03630ad.zip |
Inject network client
Diffstat (limited to 'src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java')
-rw-r--r-- | src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java index 2535970d3..82fcf42ab 100644 --- a/src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java +++ b/src/main/java/org/traccar/geolocation/OpenCellIdGeolocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,18 +15,20 @@ */ package org.traccar.geolocation; -import org.traccar.Context; import org.traccar.model.CellTower; import org.traccar.model.Network; import javax.json.JsonObject; +import javax.ws.rs.client.Client; import javax.ws.rs.client.InvocationCallback; public class OpenCellIdGeolocationProvider implements GeolocationProvider { - private String url; + private final Client client; + private final String url; - public OpenCellIdGeolocationProvider(String url, String key) { + public OpenCellIdGeolocationProvider(Client client, String url, String key) { + this.client = client; if (url == null) { url = "http://opencellid.org/cell/get"; } @@ -41,7 +43,7 @@ public class OpenCellIdGeolocationProvider implements GeolocationProvider { String request = String.format(url, cellTower.getMobileCountryCode(), cellTower.getMobileNetworkCode(), cellTower.getLocationAreaCode(), cellTower.getCellId()); - Context.getClient().target(request).request().async().get(new InvocationCallback<JsonObject>() { + client.target(request).request().async().get(new InvocationCallback<JsonObject>() { @Override public void completed(JsonObject json) { if (json.containsKey("lat") && json.containsKey("lon")) { |