diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-08 19:34:42 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-08 19:34:42 +1200 |
commit | a169ff4eb6c1de110ddcedebdec77fb7aae05a33 (patch) | |
tree | f2a3482f0214d04ec31bd898c375d38c7b89a9be /src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java | |
parent | ae1b5bd74b69a7e8222af39e3c62aa217ba94d29 (diff) | |
parent | 5a9811c3771d92832c9bba718b5ec935844978e8 (diff) | |
download | traccar-server-a169ff4eb6c1de110ddcedebdec77fb7aae05a33.tar.gz traccar-server-a169ff4eb6c1de110ddcedebdec77fb7aae05a33.tar.bz2 traccar-server-a169ff4eb6c1de110ddcedebdec77fb7aae05a33.zip |
Merge pull request #3920 from traccar/remove-http-client
Remove async HTTP client dependency
Diffstat (limited to 'src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java')
-rw-r--r-- | src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java index d6e45b550..768aaf6a2 100644 --- a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java +++ b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2018 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,15 +15,12 @@ */ package org.traccar.geolocation; -import com.ning.http.client.AsyncCompletionHandler; -import com.ning.http.client.Response; import org.traccar.Context; import org.traccar.model.CellTower; import org.traccar.model.Network; -import javax.json.Json; import javax.json.JsonObject; -import javax.json.JsonReader; +import javax.ws.rs.client.InvocationCallback; public class OpenCellIdGeolocationProvider implements GeolocationProvider { @@ -45,25 +42,21 @@ public class OpenCellIdGeolocationProvider implements GeolocationProvider { String request = String.format(url, cellTower.getMobileCountryCode(), cellTower.getMobileNetworkCode(), cellTower.getLocationAreaCode(), cellTower.getCellId()); - Context.getAsyncHttpClient().prepareGet(request).execute(new AsyncCompletionHandler() { + Context.getClient().target(request).request().async().get(new InvocationCallback<JsonObject>() { @Override - public Object onCompleted(Response response) throws Exception { - try (JsonReader reader = Json.createReader(response.getResponseBodyAsStream())) { - JsonObject json = reader.readObject(); - if (json.containsKey("lat") && json.containsKey("lon")) { - callback.onSuccess( - json.getJsonNumber("lat").doubleValue(), - json.getJsonNumber("lon").doubleValue(), 0); - } else { - callback.onFailure(new GeolocationException("Coordinates are missing")); - } + public void completed(JsonObject json) { + if (json.containsKey("lat") && json.containsKey("lon")) { + callback.onSuccess( + json.getJsonNumber("lat").doubleValue(), + json.getJsonNumber("lon").doubleValue(), 0); + } else { + callback.onFailure(new GeolocationException("Coordinates are missing")); } - return null; } @Override - public void onThrowable(Throwable t) { - callback.onFailure(t); + public void failed(Throwable throwable) { + callback.onFailure(throwable); } }); |