From c78ebe96145942870c96d947926ed4399bb71c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20P=C3=B3=C5=82grabia?= Date: Mon, 3 Oct 2016 22:45:48 +0200 Subject: [PATCH] Removed old converters, android query invocation and migrated to retrofit. --- .../worker/GooglePlacesWorker.java | 7 +- .../googleutils/GooglePlacesService.java | 8 +- .../converter/GooglePlaceConverter.java | 141 ------------------ .../googleutils/dto/GooglePlaceLocation.java | 4 + .../googleutils/dto/GooglePlacePhoto.java | 4 + .../googleutils/dto/GooglePlaceResponse.java | 49 ++++++ .../googleutils/dto/GooglePlaceResult.java | 3 + .../googleutils/dto/GooglePlaceViewport.java | 4 + .../googleutils/utils/PlacesUtils.java | 21 ++- 9 files changed, 81 insertions(+), 160 deletions(-) delete mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/converter/GooglePlaceConverter.java create mode 100644 googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResponse.java diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java index bd2a26c..477ba56 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/worker/GooglePlacesWorker.java @@ -10,6 +10,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.googleutils.callback.PlacesCallback; import pl.tpolgrabia.googleutils.dto.GooglePlacePhoto; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResponse; import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; import pl.tpolgrabia.googleutils.utils.PlacesUtils; import pl.tpolgrabia.urbanexplorer.AppConstants; @@ -54,7 +55,7 @@ public class GooglePlacesWorker extends AsyncTask> placesResponse = null; + Response placesResponse = null; try { placesResponse = placesUtils.fetchNearbyPlaces( location.getLatitude(), @@ -63,9 +64,9 @@ public class GooglePlacesWorker extends AsyncTask> fetchNearbyPlacesFirst( + Call fetchNearbyPlacesFirst( @Query("key") String apiKey, @Query("location") String location, @Query("radius") Double radius, @Query("type") String type); @GET("nearbysearch/json") - Call> fetchNearbyPlacesNext( + Call fetchNearbyPlacesNext( @Query("key") String apiKey, @Query("location") String location, @Query("radius") Double radius, diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/converter/GooglePlaceConverter.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/converter/GooglePlaceConverter.java deleted file mode 100644 index 3b58fa3..0000000 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/converter/GooglePlaceConverter.java +++ /dev/null @@ -1,141 +0,0 @@ -package pl.tpolgrabia.googleutils.converter; - -import org.json.JSONArray; -import org.json.JSONObject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import pl.tpolgrabia.googleutils.dto.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by tpolgrabia on 28.09.16. - */ -public class GooglePlaceConverter { - - private static final Logger lg = LoggerFactory.getLogger(GooglePlaceConverter.class); - public static GooglePlaceResult convertToPlaceResult(JSONObject object) { - - lg.trace("Place result object: {}", object); - - if (object == null) { - return null; - } - - GooglePlaceResult dto = new GooglePlaceResult(); - dto.setGeometry(convertToPlaceGeometry(object.optJSONObject("geometry"))); - dto.setIcon(object.optString("icon")); - dto.setId(object.optString("id")); - dto.setName(object.optString("name")); - dto.setPhotos(convertToPlacePhotos(object.optJSONArray("photos"))); - dto.setPlaceId(object.optString("place_id")); - dto.setRating(object.optDouble("rating")); - dto.setReference(object.optString("reference")); - dto.setScope(object.optString("scope")); - dto.setTypes(convertToStringList(object.optJSONArray("types"))); - dto.setVicinity(object.optString("vicinity")); - return dto; - } - - private static List convertToStringList(JSONArray stringArray) { - lg.trace("String array: {}", stringArray); - - if (stringArray == null) { - return null; - } - - int n = stringArray.length(); - List ret = new ArrayList<>(n); - for (int i = 0; i < n; i++) { - ret.add(stringArray.optString(i)); - } - - return ret; - } - - private static List convertToPlacePhotos(JSONArray jphotos) { - lg.trace("Place photos: {}", jphotos); - - if (jphotos == null) { - return null; - } - - int n = jphotos.length(); - List photos = new ArrayList<>(n); - - for (int i = 0; i < n; i++) { - photos.add(convertToPlacePhoto(jphotos.optJSONObject(i))); - } - - return photos; - } - - private static GooglePlacePhoto convertToPlacePhoto(JSONObject jphoto) { - lg.trace("Place photo: {}", jphoto); - - if (jphoto == null) { - return null; - } - - GooglePlacePhoto photo = new GooglePlacePhoto(); - photo.setHeight(jphoto.optLong("height")); - photo.setWidth(jphoto.optLong("width")); - photo.setPhotoReference(jphoto.optString("photo_reference")); - photo.setHtmlAttributions(convertToStringList(jphoto.optJSONArray("html_attributions"))); - return photo; - } - - private static GooglePlaceGeometry convertToPlaceGeometry(JSONObject jgeometry) { - lg.trace("Place geometry: {}", jgeometry); - - if (jgeometry == null) { - return null; - } - - GooglePlaceGeometry geometry = new GooglePlaceGeometry(); - geometry.setLocation(convertToPlaceLocation(jgeometry.optJSONObject("location"))); - geometry.setViewport(convertToPlaceViewport(jgeometry.optJSONObject("viewport"))); - return geometry; - } - - private static GooglePlaceViewport convertToPlaceViewport(JSONObject jviewport) { - lg.trace("Place viewport: {}", jviewport); - - if (jviewport == null) { - return null; - } - - GooglePlaceViewport viewport = new GooglePlaceViewport(); - viewport.setNorthEast(convertToPlaceLocation(jviewport.optJSONObject("northeast"))); - viewport.setSouthWest(convertToPlaceLocation(jviewport.optJSONObject("southwest"))); - return viewport; - } - - private static GooglePlaceLocation convertToPlaceLocation(JSONObject jlocation) { - lg.trace("Place location: {}", jlocation); - if (jlocation == null) { - return null; - } - - GooglePlaceLocation location = new GooglePlaceLocation(); - location.setLatitude(jlocation.optDouble("lat")); - location.setLongitude(jlocation.optDouble("lng")); - return location; - } - - public static List convertToPlaceResults(JSONArray jresults) { - lg.trace("Place results: {}", jresults); - - if (jresults == null) { - return null; - } - - List results = new ArrayList<>(); - int n = jresults.length(); - for (int i = 0; i < n; i++) { - results.add(convertToPlaceResult(jresults.optJSONObject(i))); - } - return results; - } -} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java index 8dd2548..0ad49ec 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceLocation.java @@ -1,10 +1,14 @@ package pl.tpolgrabia.googleutils.dto; +import com.google.gson.annotations.SerializedName; + /** * Created by tpolgrabia on 28.09.16. */ public class GooglePlaceLocation { + @SerializedName("lat") private Double latitude; + @SerializedName("lng") private Double longitude; public Double getLatitude() { diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java index 92dc310..1d2e5cb 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlacePhoto.java @@ -1,5 +1,7 @@ package pl.tpolgrabia.googleutils.dto; +import com.google.gson.annotations.SerializedName; + import java.util.List; /** @@ -7,7 +9,9 @@ import java.util.List; */ public class GooglePlacePhoto { private Long height; + @SerializedName("html_attributions") private List htmlAttributions; + @SerializedName("photo_reference") private String photoReference; private Long width; diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResponse.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResponse.java new file mode 100644 index 0000000..da402d4 --- /dev/null +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResponse.java @@ -0,0 +1,49 @@ +package pl.tpolgrabia.googleutils.dto; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +/** + * Created by tpolgrabia on 03.10.16. + */ +public class GooglePlaceResponse { + @SerializedName("html_attributions") + private List htmlAttributions; + @SerializedName("next_page_token") + private String nextPageToken; + private List results; + + public List getHtmlAttributions() { + return htmlAttributions; + } + + public void setHtmlAttributions(List htmlAttributions) { + this.htmlAttributions = htmlAttributions; + } + + public String getNextPageToken() { + return nextPageToken; + } + + public void setNextPageToken(String nextPageToken) { + this.nextPageToken = nextPageToken; + } + + public List getResults() { + return results; + } + + public void setResults(List results) { + this.results = results; + } + + @Override + public String toString() { + return "GooglePlaceResponse{" + + "htmlAttributions=" + htmlAttributions + + ", nextPageToken='" + nextPageToken + '\'' + + ", results='" + results + '\'' + + '}'; + } +} diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java index d1c959d..1c42314 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceResult.java @@ -1,5 +1,7 @@ package pl.tpolgrabia.googleutils.dto; +import com.google.gson.annotations.SerializedName; + import java.util.List; /** @@ -11,6 +13,7 @@ public class GooglePlaceResult { private String id; private String name; private List photos; + @SerializedName("place_id") private String placeId; private Double rating; private String reference; diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java index 1a8e84a..8a7c13c 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/dto/GooglePlaceViewport.java @@ -1,10 +1,14 @@ package pl.tpolgrabia.googleutils.dto; +import com.google.gson.annotations.SerializedName; + /** * Created by tpolgrabia on 28.09.16. */ public class GooglePlaceViewport { + @SerializedName("northeast") private GooglePlaceLocation northEast; + @SerializedName("southwest") private GooglePlaceLocation southWest; public GooglePlaceLocation getNorthEast() { diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java index c7722c7..d8ae29a 100644 --- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java +++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/utils/PlacesUtils.java @@ -8,13 +8,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import pl.tpolgrabia.googleutils.GooglePlacesService; import pl.tpolgrabia.googleutils.constants.GooglePlacesConstants; -import pl.tpolgrabia.googleutils.dto.GooglePlaceResult; +import pl.tpolgrabia.googleutils.dto.GooglePlaceResponse; import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; import java.io.IOException; -import java.util.List; /** * Created by tpolgrabia on 27.09.16. @@ -33,11 +32,11 @@ public class PlacesUtils { this.aq = new AQuery(ctx); } - public Response> fetchNearbyPlaces(Double latitude, - Double longitude, - Double searchRadius, - String searchItemType, - String pageToken) throws IOException { + public Response fetchNearbyPlaces(Double latitude, + Double longitude, + Double searchRadius, + String searchItemType, + String pageToken) throws IOException { if (latitude == null) { throw new IllegalArgumentException("Latitude cannot be null"); @@ -64,10 +63,10 @@ public class PlacesUtils { return pageToken != null ? retrofit.create(GooglePlacesService.class).fetchNearbyPlacesNext(apiKey, - latitude + "," + longitude, - searchRadius, - searchItemType, - pageToken).execute() + latitude + "," + longitude, + searchRadius, + searchItemType, + pageToken).execute() : retrofit.create(GooglePlacesService.class).fetchNearbyPlacesFirst(apiKey, latitude + "," + longitude, searchRadius,