diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-14 11:44:27 +1200 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-04-14 11:44:27 +1200 |
commit | 15f3258905e964ab3b23d9c11fde4a1946ef10b0 (patch) | |
tree | 971ff048cf48ae5d047f9e68ba663dd106040be7 /src/org | |
parent | d88f364aca4790c1fc7775cd6e4faf488dc9fe94 (diff) | |
download | trackermap-server-15f3258905e964ab3b23d9c11fde4a1946ef10b0.tar.gz trackermap-server-15f3258905e964ab3b23d9c11fde4a1946ef10b0.tar.bz2 trackermap-server-15f3258905e964ab3b23d9c11fde4a1946ef10b0.zip |
Update Java libraries
Diffstat (limited to 'src/org')
6 files changed, 12 insertions, 11 deletions
diff --git a/src/org/traccar/Context.java b/src/org/traccar/Context.java index 1a35a2cb4..e84e14b4c 100644 --- a/src/org/traccar/Context.java +++ b/src/org/traccar/Context.java @@ -17,13 +17,14 @@ package org.traccar; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.ning.http.client.AsyncHttpClient; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Properties; import org.apache.velocity.app.VelocityEngine; +import org.asynchttpclient.AsyncHttpClient; +import org.asynchttpclient.DefaultAsyncHttpClient; import org.eclipse.jetty.util.URIUtil; import org.traccar.database.AliasesManager; import org.traccar.database.CalendarManager; @@ -155,7 +156,7 @@ public final class Context { return velocityEngine; } - private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new AsyncHttpClient(); + private static final AsyncHttpClient ASYNC_HTTP_CLIENT = new DefaultAsyncHttpClient(); public static AsyncHttpClient getAsyncHttpClient() { return ASYNC_HTTP_CLIENT; diff --git a/src/org/traccar/geocoder/JsonGeocoder.java b/src/org/traccar/geocoder/JsonGeocoder.java index 6d1380729..a914f26d8 100644 --- a/src/org/traccar/geocoder/JsonGeocoder.java +++ b/src/org/traccar/geocoder/JsonGeocoder.java @@ -15,8 +15,8 @@ */ package org.traccar.geocoder; -import com.ning.http.client.AsyncCompletionHandler; -import com.ning.http.client.Response; +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.Response; import org.traccar.Context; import javax.json.Json; diff --git a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java index d6e45b550..690a050e1 100644 --- a/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java +++ b/src/org/traccar/geolocation/OpenCellIdGeolocationProvider.java @@ -15,8 +15,8 @@ */ package org.traccar.geolocation; -import com.ning.http.client.AsyncCompletionHandler; -import com.ning.http.client.Response; +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.Response; import org.traccar.Context; import org.traccar.model.CellTower; import org.traccar.model.Network; diff --git a/src/org/traccar/geolocation/UniversalGeolocationProvider.java b/src/org/traccar/geolocation/UniversalGeolocationProvider.java index 6416b2633..ee8ed78f2 100644 --- a/src/org/traccar/geolocation/UniversalGeolocationProvider.java +++ b/src/org/traccar/geolocation/UniversalGeolocationProvider.java @@ -16,8 +16,8 @@ package org.traccar.geolocation; import com.fasterxml.jackson.core.JsonProcessingException; -import com.ning.http.client.AsyncCompletionHandler; -import com.ning.http.client.Response; +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.Response; import org.traccar.Context; import org.traccar.model.Network; diff --git a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java index dcc5a4e7a..f9cef3de6 100644 --- a/src/org/traccar/geolocation/UnwiredGeolocationProvider.java +++ b/src/org/traccar/geolocation/UnwiredGeolocationProvider.java @@ -20,8 +20,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.ning.http.client.AsyncCompletionHandler; -import com.ning.http.client.Response; +import org.asynchttpclient.AsyncCompletionHandler; +import org.asynchttpclient.Response; import org.traccar.Context; import org.traccar.model.CellTower; import org.traccar.model.Network; diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java index bd7cfc0c5..32556808c 100644 --- a/src/org/traccar/notification/EventForwarder.java +++ b/src/org/traccar/notification/EventForwarder.java @@ -16,7 +16,7 @@ package org.traccar.notification; import com.fasterxml.jackson.core.JsonProcessingException; -import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder; +import org.asynchttpclient.BoundRequestBuilder; import org.traccar.Context; import org.traccar.helper.Log; import org.traccar.model.Device; |