From a6d6797aad992068406bfcfaeb2290662951fa41 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Fri, 26 Jun 2015 09:25:17 +1200
Subject: Revert Apache HTTP client

This reverts commit 9067f6f540441b839584ff90e5ff858f5433f0c7.
---
 pom.xml                                          |  5 ----
 src/org/traccar/geocode/JsonReverseGeocoder.java | 34 +++++++++---------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1a4c55d1..8b8b80e79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,11 +45,6 @@
             <artifactId>netty</artifactId>
             <version>3.10.1.Final</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5</version>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.json</artifactId>
diff --git a/src/org/traccar/geocode/JsonReverseGeocoder.java b/src/org/traccar/geocode/JsonReverseGeocoder.java
index 3f5fe8bed..684bfa0c1 100644
--- a/src/org/traccar/geocode/JsonReverseGeocoder.java
+++ b/src/org/traccar/geocode/JsonReverseGeocoder.java
@@ -15,17 +15,15 @@
  */
 package org.traccar.geocode;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.traccar.helper.Log;
 
 import javax.json.Json;
 import javax.json.JsonObject;
-import javax.json.JsonReader;
 import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 
 public abstract class JsonReverseGeocoder implements ReverseGeocoder {
 
@@ -39,29 +37,21 @@ public abstract class JsonReverseGeocoder implements ReverseGeocoder {
     public String getAddress(AddressFormat format, double latitude, double longitude) {
 
         try {
-            CloseableHttpClient httpClient = HttpClients.createDefault();
+            HttpURLConnection conn = (HttpURLConnection) new URL(String.format(url, latitude, longitude)).openConnection();
             try {
-                CloseableHttpResponse response = httpClient.execute(new HttpGet(String.format(url, latitude, longitude)));
+            Reader reader = new InputStreamReader(conn.getInputStream());
                 try {
-                    HttpEntity entity = response.getEntity();
-                    if (entity != null) {
-                        JsonReader reader = Json.createReader(new InputStreamReader(entity.getContent()));
-                        try {
-                            Address address = parseAddress(reader.readObject());
-                            if (address != null) {
-                                return format.format(address);
-                            }
-                        } finally {
-                            reader.close();
-                        }
+                    Address address = parseAddress(Json.createReader(reader).readObject());
+                    if (address != null) {
+                        return format.format(address);
                     }
                 } finally {
-                    response.close();
+                    reader.close();
                 }
             } finally {
-                httpClient.close();
+                conn.disconnect();
             }
-        } catch (Exception error) {
+        } catch(Exception error) {
             Log.warning(error);
         }
 
-- 
cgit v1.2.3