From 19231ead08dc60441d6ccf55e88fe93d15b036cf Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Wed, 20 Mar 2019 23:49:34 +1100 Subject: [PATCH 01/17] Opening up v0.9.4 for development --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9032223f2..3e2f71a43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.9.3 +version=0.9.4-SNAPSHOT # variables required to allow build.gradle to parse, # override in ~/.gradle/gradle.properties From b640e3fdab3b66860adc66f43fbfe9803ba55a2a Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Wed, 20 Mar 2019 23:55:24 +1100 Subject: [PATCH 02/17] Linking to v0.9.3 Javadoc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5d87d3ce5..78d20e211 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ Maven Central](https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22google-maps-se ## Developer Documentation -View the [javadoc](https://googlemaps.github.io/google-maps-services-java/v0.9.2/javadoc/index.html?overview-summary.html). +View the [javadoc](https://googlemaps.github.io/google-maps-services-java/v0.9.3/javadoc/index.html?overview-summary.html). Additional documentation for the included web services is available at https://developers.google.com/maps/. From c9084de44869262e487c4502d0ab9c9fd0b68334 Mon Sep 17 00:00:00 2001 From: eliska Date: Mon, 22 Apr 2019 20:48:59 +0200 Subject: [PATCH 03/17] Add Light Rail Station into PlaceType --- src/main/java/com/google/maps/model/PlaceType.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/google/maps/model/PlaceType.java b/src/main/java/com/google/maps/model/PlaceType.java index 5506c868d..a9d51f264 100644 --- a/src/main/java/com/google/maps/model/PlaceType.java +++ b/src/main/java/com/google/maps/model/PlaceType.java @@ -74,6 +74,7 @@ public enum PlaceType implements StringJoin.UrlValue { LAUNDRY("laundry"), LAWYER("lawyer"), LIBRARY("library"), + LIGHT_RAIL_STATION("light_rail_station"), LIQUOR_STORE("liquor_store"), LOCAL_GOVERNMENT_OFFICE("local_government_office"), LOCKSMITH("locksmith"), From 7537cab74c816127e7639b520d56e677fb178375 Mon Sep 17 00:00:00 2001 From: Peter Marsh Date: Tue, 23 Apr 2019 19:16:34 +0200 Subject: [PATCH 04/17] Add meal_delivery AddressComponentType --- src/main/java/com/google/maps/model/AddressComponentType.java | 3 +++ src/test/java/com/google/maps/model/EnumsTest.java | 1 + 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/google/maps/model/AddressComponentType.java b/src/main/java/com/google/maps/model/AddressComponentType.java index ca23e85ec..3b1dea0a7 100644 --- a/src/main/java/com/google/maps/model/AddressComponentType.java +++ b/src/main/java/com/google/maps/model/AddressComponentType.java @@ -259,6 +259,9 @@ public enum AddressComponentType { /** An RV park. */ RV_PARK("rv_park"), + /** A meal delivery establishment. */ + MEAL_DELIVERY("meal_delivery"), + /** * Indicates an unknown address component type returned by the server. The Java Client for Google * Maps Services should be updated to support the new value. diff --git a/src/test/java/com/google/maps/model/EnumsTest.java b/src/test/java/com/google/maps/model/EnumsTest.java index 87758a3cb..e06dc9085 100644 --- a/src/test/java/com/google/maps/model/EnumsTest.java +++ b/src/test/java/com/google/maps/model/EnumsTest.java @@ -273,6 +273,7 @@ public void testCanonicalLiteralsForAddressComponentType() { m.put(AddressComponentType.MUSEUM, "museum"); m.put(AddressComponentType.RV_PARK, "rv_park"); m.put(AddressComponentType.CAMPGROUND, "campground"); + m.put(AddressComponentType.MEAL_DELIVERY, "meal_delivery"); for (Map.Entry AddressComponentTypeLiteralPair : addressComponentTypeToLiteralMap.entrySet()) { From ef32f3180944071a3d43327adfd5f313bf11c808 Mon Sep 17 00:00:00 2001 From: danieldsf Date: Tue, 30 Apr 2019 23:39:31 -0300 Subject: [PATCH 05/17] Add implementation of Serializable to AutocompletePrediction --- .../java/com/google/maps/model/AutocompletePrediction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/maps/model/AutocompletePrediction.java b/src/main/java/com/google/maps/model/AutocompletePrediction.java index 0cd37c58c..2b3276f6f 100644 --- a/src/main/java/com/google/maps/model/AutocompletePrediction.java +++ b/src/main/java/com/google/maps/model/AutocompletePrediction.java @@ -56,7 +56,9 @@ public class AutocompletePrediction implements Serializable { * Describes the location of the entered term in the prediction result text, so that the term can * be highlighted if desired. */ - public static class MatchedSubstring { + public static class MatchedSubstring implements Serializable { + + private static final long serialVersionUID = 1L; /** The length of the matched substring, measured in Unicode characters. */ public int length; From 8b8e4f5ee0c6b50e8248ad16bea4ffe2471b2d9c Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Tue, 30 Apr 2019 21:29:52 -0700 Subject: [PATCH 06/17] Validate TextSearchRequest without query if type is set --- CONTRIBUTORS | 1 + src/main/java/com/google/maps/TextSearchRequest.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index ab7b0c88a..36aa20f69 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -10,6 +10,7 @@ Amy Boyd @amyboyd Brantley Wells @gitbrantley Brett Morgan @domesticmouse Chris Broadfoot @broady +Dan O'Meara @danoscarmike Dave Holmes @dh-- Ismael Blesa @ismamai Malcolm Windsor @mwindsor-beoped diff --git a/src/main/java/com/google/maps/TextSearchRequest.java b/src/main/java/com/google/maps/TextSearchRequest.java index c119d4d06..e0a6ccc86 100644 --- a/src/main/java/com/google/maps/TextSearchRequest.java +++ b/src/main/java/com/google/maps/TextSearchRequest.java @@ -168,8 +168,9 @@ protected void validateRequest() { return; } - if (!params().containsKey("query")) { - throw new IllegalArgumentException("Request must contain 'query' or a 'pageToken'."); + if (!params().containsKey("query") && !params().containsKey("type")) { + throw new IllegalArgumentException( + "Request must contain 'query' or a 'pageToken'. If a 'type' is specified 'query' becomes optional."); } if (params().containsKey("location") && !params().containsKey("radius")) { From 96a6a561cbae878404fac4c4b6e3413134632c34 Mon Sep 17 00:00:00 2001 From: Dan O'Meara Date: Wed, 1 May 2019 18:40:08 -0700 Subject: [PATCH 07/17] add new textSearchQuery method with test --- src/main/java/com/google/maps/PlacesApi.java | 14 ++++++++++++++ src/test/java/com/google/maps/PlacesApiTest.java | 15 +++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/com/google/maps/PlacesApi.java b/src/main/java/com/google/maps/PlacesApi.java index 9deb9ac3e..e51c34bb3 100644 --- a/src/main/java/com/google/maps/PlacesApi.java +++ b/src/main/java/com/google/maps/PlacesApi.java @@ -16,6 +16,7 @@ package com.google.maps; import com.google.maps.model.LatLng; +import com.google.maps.model.PlaceType; /** * Performs a text search for places. The Google Places API enables you to get data from the same @@ -73,6 +74,19 @@ public static TextSearchRequest textSearchQuery(GeoApiContext context, String qu return request; } + /** + * Performs a search for Places using a PlaceType parameter. + * + * @param context The context on which to make Geo API requests. + * @param type Restricts the results to places matching the specified PlaceType. + * @return Returns a TextSearchRequest that can be configured and executed. + */ + public static TextSearchRequest textSearchQuery(GeoApiContext context, PlaceType type) { + TextSearchRequest request = new TextSearchRequest(context); + request.type(type); + return request; + } + /** * Retrieves the next page of Text Search results. The nextPageToken, returned in a * PlacesSearchResponse when there are more pages of results, encodes all of the original Text diff --git a/src/test/java/com/google/maps/PlacesApiTest.java b/src/test/java/com/google/maps/PlacesApiTest.java index 319fd27f2..db38e6fe6 100644 --- a/src/test/java/com/google/maps/PlacesApiTest.java +++ b/src/test/java/com/google/maps/PlacesApiTest.java @@ -471,6 +471,21 @@ public void testTextSearchRequest() throws Exception { } } + @Test + public void testTextSearchRequestWithType() throws Exception { + try (LocalTestServerContext sc = new LocalTestServerContext("{\"status\" : \"OK\"}")) { + LatLng location = new LatLng(-33.866611, 151.195832); + PlacesSearchResponse results = PlacesApi.textSearchQuery(sc.context, PlaceType.ESTABLISHMENT) + .location(location) + .radius(500) + .await(); + + sc.assertParamValue(location.toUrlValue(), "location"); + sc.assertParamValue(String.valueOf(500), "radius"); + sc.assertParamValue(PlaceType.ESTABLISHMENT.toString(), "type"); + } + } + @Test(expected = IllegalArgumentException.class) public void testTextSearchLocationWithoutRadius() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext("{\"status\" : \"OK\"}")) { From 2960db79706fd0f64f8f94933bbce7aa8491488e Mon Sep 17 00:00:00 2001 From: danieldsf Date: Fri, 3 May 2019 10:38:45 -0300 Subject: [PATCH 08/17] Add Serializable definition to AutoCompletePrediction --- .../java/com/google/maps/model/AutocompletePrediction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/maps/model/AutocompletePrediction.java b/src/main/java/com/google/maps/model/AutocompletePrediction.java index 2b3276f6f..219c3ed9b 100644 --- a/src/main/java/com/google/maps/model/AutocompletePrediction.java +++ b/src/main/java/com/google/maps/model/AutocompletePrediction.java @@ -85,7 +85,9 @@ public String toString() { * Identifies each section of the returned description. (A section of the description is generally * terminated with a comma.) */ - public static class Term { + public static class Term implements Serializable { + + private static final long serialVersionUID = 1L; /** The start position of this term in the description, measured in Unicode characters. */ public int offset; From a8762d8474fd516a08f84444a4a6ff5e19c2c1d3 Mon Sep 17 00:00:00 2001 From: AChepurnoi Date: Wed, 15 May 2019 11:57:03 +0300 Subject: [PATCH 09/17] Add user_ratings_total response field to PlaceSearchResult class --- .../com/google/maps/model/PlacesSearchResult.java | 5 +++++ src/test/java/com/google/maps/PlacesApiTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/google/maps/model/PlacesSearchResult.java b/src/main/java/com/google/maps/model/PlacesSearchResult.java index 0e1aca23e..9ecc4ab3f 100644 --- a/src/main/java/com/google/maps/model/PlacesSearchResult.java +++ b/src/main/java/com/google/maps/model/PlacesSearchResult.java @@ -74,6 +74,8 @@ public class PlacesSearchResult implements Serializable { /** Indicates that the place has permanently shut down. */ public boolean permanentlyClosed; + public int userRatingsTotal; + @Override public String toString() { StringBuilder sb = new StringBuilder("[PlacesSearchResult: "); @@ -100,6 +102,9 @@ public String toString() { if (permanentlyClosed) { sb.append(", permanentlyClosed"); } + if (userRatingsTotal > 0) { + sb.append(", userRatingsTotal=").append(userRatingsTotal); + } sb.append("]"); return sb.toString(); diff --git a/src/test/java/com/google/maps/PlacesApiTest.java b/src/test/java/com/google/maps/PlacesApiTest.java index db38e6fe6..3f483d15e 100644 --- a/src/test/java/com/google/maps/PlacesApiTest.java +++ b/src/test/java/com/google/maps/PlacesApiTest.java @@ -782,6 +782,18 @@ public void testNearbySearchRequestByType() throws Exception { } } + @Test + public void testNearbySearchRequestByTypeReturnsUserRatingsTotal() throws Exception { + try (LocalTestServerContext sc = + new LocalTestServerContext(placesApiNearbySearchRequestByType)) { + PlacesSearchResponse response = + PlacesApi.nearbySearchQuery(sc.context, SYDNEY).radius(10000).type(PlaceType.BAR).await(); + + assertEquals(20, response.results.length); + assertEquals(563, response.results[0].userRatingsTotal); + } + } + @Test public void testPlaceAutocomplete() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext(placesApiPlaceAutocomplete)) { From e3b6847c15be20bc7cd3c35ddd6419bea8e5196b Mon Sep 17 00:00:00 2001 From: AChepurnoi Date: Wed, 15 May 2019 12:02:05 +0300 Subject: [PATCH 10/17] Add userRatingsTotal field documentation --- src/main/java/com/google/maps/model/PlacesSearchResult.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/google/maps/model/PlacesSearchResult.java b/src/main/java/com/google/maps/model/PlacesSearchResult.java index 9ecc4ab3f..3e6d1cb63 100644 --- a/src/main/java/com/google/maps/model/PlacesSearchResult.java +++ b/src/main/java/com/google/maps/model/PlacesSearchResult.java @@ -74,6 +74,7 @@ public class PlacesSearchResult implements Serializable { /** Indicates that the place has permanently shut down. */ public boolean permanentlyClosed; + /** The number of user reviews for this place*/ public int userRatingsTotal; @Override From e051663b2cbef6d7258b5d54df30f38faa2dc75c Mon Sep 17 00:00:00 2001 From: Grant Timmerman Date: Wed, 22 May 2019 12:55:29 -0700 Subject: [PATCH 11/17] Fix: Format java files that break tests using gradlew check --- src/main/java/com/google/maps/TextSearchRequest.java | 2 +- .../java/com/google/maps/model/PlacesSearchResult.java | 2 +- src/test/java/com/google/maps/PlacesApiTest.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/maps/TextSearchRequest.java b/src/main/java/com/google/maps/TextSearchRequest.java index e0a6ccc86..0f73f6d5b 100644 --- a/src/main/java/com/google/maps/TextSearchRequest.java +++ b/src/main/java/com/google/maps/TextSearchRequest.java @@ -170,7 +170,7 @@ protected void validateRequest() { if (!params().containsKey("query") && !params().containsKey("type")) { throw new IllegalArgumentException( - "Request must contain 'query' or a 'pageToken'. If a 'type' is specified 'query' becomes optional."); + "Request must contain 'query' or a 'pageToken'. If a 'type' is specified 'query' becomes optional."); } if (params().containsKey("location") && !params().containsKey("radius")) { diff --git a/src/main/java/com/google/maps/model/PlacesSearchResult.java b/src/main/java/com/google/maps/model/PlacesSearchResult.java index 3e6d1cb63..d5fb09369 100644 --- a/src/main/java/com/google/maps/model/PlacesSearchResult.java +++ b/src/main/java/com/google/maps/model/PlacesSearchResult.java @@ -74,7 +74,7 @@ public class PlacesSearchResult implements Serializable { /** Indicates that the place has permanently shut down. */ public boolean permanentlyClosed; - /** The number of user reviews for this place*/ + /** The number of user reviews for this place */ public int userRatingsTotal; @Override diff --git a/src/test/java/com/google/maps/PlacesApiTest.java b/src/test/java/com/google/maps/PlacesApiTest.java index 3f483d15e..bd21e535c 100644 --- a/src/test/java/com/google/maps/PlacesApiTest.java +++ b/src/test/java/com/google/maps/PlacesApiTest.java @@ -475,7 +475,8 @@ public void testTextSearchRequest() throws Exception { public void testTextSearchRequestWithType() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext("{\"status\" : \"OK\"}")) { LatLng location = new LatLng(-33.866611, 151.195832); - PlacesSearchResponse results = PlacesApi.textSearchQuery(sc.context, PlaceType.ESTABLISHMENT) + PlacesSearchResponse results = + PlacesApi.textSearchQuery(sc.context, PlaceType.ESTABLISHMENT) .location(location) .radius(500) .await(); @@ -785,9 +786,9 @@ public void testNearbySearchRequestByType() throws Exception { @Test public void testNearbySearchRequestByTypeReturnsUserRatingsTotal() throws Exception { try (LocalTestServerContext sc = - new LocalTestServerContext(placesApiNearbySearchRequestByType)) { + new LocalTestServerContext(placesApiNearbySearchRequestByType)) { PlacesSearchResponse response = - PlacesApi.nearbySearchQuery(sc.context, SYDNEY).radius(10000).type(PlaceType.BAR).await(); + PlacesApi.nearbySearchQuery(sc.context, SYDNEY).radius(10000).type(PlaceType.BAR).await(); assertEquals(20, response.results.length); assertEquals(563, response.results[0].userRatingsTotal); From 1b2d2ebb17e2cc2b2f84c930c2d546c8272c02a5 Mon Sep 17 00:00:00 2001 From: Rahul Chopda Date: Thu, 1 Aug 2019 15:44:00 +0530 Subject: [PATCH 12/17] #572: updated the access modifier for response inner classes in Api Classes (#581) --- src/main/java/com/google/maps/DirectionsApi.java | 2 +- src/main/java/com/google/maps/DistanceMatrixApi.java | 2 +- src/main/java/com/google/maps/GeocodingApi.java | 2 +- src/main/java/com/google/maps/RoadsApi.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/google/maps/DirectionsApi.java b/src/main/java/com/google/maps/DirectionsApi.java index fe1eb48e9..e299b1163 100644 --- a/src/main/java/com/google/maps/DirectionsApi.java +++ b/src/main/java/com/google/maps/DirectionsApi.java @@ -63,7 +63,7 @@ public static DirectionsApiRequest getDirections( return new DirectionsApiRequest(context).origin(origin).destination(destination); } - static class Response implements ApiResponse { + public static class Response implements ApiResponse { public String status; public String errorMessage; public GeocodedWaypoint[] geocodedWaypoints; diff --git a/src/main/java/com/google/maps/DistanceMatrixApi.java b/src/main/java/com/google/maps/DistanceMatrixApi.java index e29da73d4..ddf9da9f1 100644 --- a/src/main/java/com/google/maps/DistanceMatrixApi.java +++ b/src/main/java/com/google/maps/DistanceMatrixApi.java @@ -53,7 +53,7 @@ public static DistanceMatrixApiRequest getDistanceMatrix( return newRequest(context).origins(origins).destinations(destinations); } - static class Response implements ApiResponse { + public static class Response implements ApiResponse { public String status; public String errorMessage; public String[] originAddresses; diff --git a/src/main/java/com/google/maps/GeocodingApi.java b/src/main/java/com/google/maps/GeocodingApi.java index 3b35cb555..b760ad15c 100644 --- a/src/main/java/com/google/maps/GeocodingApi.java +++ b/src/main/java/com/google/maps/GeocodingApi.java @@ -68,7 +68,7 @@ public static GeocodingApiRequest reverseGeocode(GeoApiContext context, LatLng l return request; } - static class Response implements ApiResponse { + public static class Response implements ApiResponse { public String status; public String errorMessage; public GeocodingResult[] results; diff --git a/src/main/java/com/google/maps/RoadsApi.java b/src/main/java/com/google/maps/RoadsApi.java index 246e4544b..67f72340c 100644 --- a/src/main/java/com/google/maps/RoadsApi.java +++ b/src/main/java/com/google/maps/RoadsApi.java @@ -163,7 +163,7 @@ public static PendingResult nearestRoads( return context.get(NEAREST_ROADS_API_CONFIG, RoadsResponse.class, "points", join('|', points)); } - private static class RoadsResponse implements ApiResponse { + public static class RoadsResponse implements ApiResponse { private SnappedPoint[] snappedPoints; private ApiError error; @@ -183,7 +183,7 @@ public ApiException getError() { } } - private static class SpeedsResponse implements ApiResponse { + public static class SpeedsResponse implements ApiResponse { private SpeedLimit[] speedLimits; private ApiError error; @@ -203,7 +203,7 @@ public ApiException getError() { } } - private static class CombinedResponse implements ApiResponse { + public static class CombinedResponse implements ApiResponse { private SnappedPoint[] snappedPoints; private SpeedLimit[] speedLimits; private ApiError error; From 4a61fe70cd63b544600c1d7f7c5baa4f616feeb3 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Fri, 2 Aug 2019 15:24:50 +1000 Subject: [PATCH 13/17] Version update (#582) --- build.gradle | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- .../com/google/maps/GeoApiContextTest.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index b4787ff70..312922dee 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2' + classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3' } } @@ -47,16 +47,16 @@ artifacts { } dependencies { - compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.71' - api 'com.squareup.okhttp3:okhttp:3.14.0' + compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.76' + api 'com.squareup.okhttp3:okhttp:4.0.1' api 'com.google.code.gson:gson:2.8.5' - implementation 'org.slf4j:slf4j-api:1.7.25' + implementation 'org.slf4j:slf4j-api:1.7.26' testImplementation 'junit:junit:4.12' - testImplementation 'org.mockito:mockito-core:2.25.1' - testImplementation 'com.squareup.okhttp3:mockwebserver:3.14.0' - testImplementation 'org.apache.httpcomponents:httpclient:4.5.7' - testImplementation 'org.slf4j:slf4j-simple:1.7.25' - testImplementation 'org.apache.commons:commons-lang3:3.8.1' + testImplementation 'org.mockito:mockito-core:3.0.0' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.0.1' + testImplementation 'org.apache.httpcomponents:httpclient:4.5.9' + testImplementation 'org.slf4j:slf4j-simple:1.7.26' + testImplementation 'org.apache.commons:commons-lang3:3.9' testImplementation 'org.json:json:20180813' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8210b5954..6b01c2694 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip diff --git a/src/test/java/com/google/maps/GeoApiContextTest.java b/src/test/java/com/google/maps/GeoApiContextTest.java index 30e70bf8a..ddd60066c 100644 --- a/src/test/java/com/google/maps/GeoApiContextTest.java +++ b/src/test/java/com/google/maps/GeoApiContextTest.java @@ -189,7 +189,7 @@ private MockResponse createMockGoodResponse() { private MockResponse createMockBadResponse() { MockResponse response = new MockResponse(); - response.setStatus("HTTP/1.1 500 Internal server error"); + response.status("HTTP/1.1 500 Internal server error"); response.setBody("Uh-oh. Server Error."); return response; @@ -199,7 +199,7 @@ private MockResponse createMockBadResponse() { public void testRetryCanBeDisabled() throws Exception { // Set up 2 mock responses, an error that shouldn't be retried and a success MockResponse errorResponse = new MockResponse(); - errorResponse.setStatus("HTTP/1.1 500 Internal server error"); + errorResponse.status("HTTP/1.1 500 Internal server error"); errorResponse.setBody("Uh-oh. Server Error."); server.enqueue(errorResponse); @@ -221,7 +221,7 @@ public void testRetryCanBeDisabled() throws Exception { @Test public void testRetryEventuallyReturnsTheRightException() throws Exception { MockResponse errorResponse = new MockResponse(); - errorResponse.setStatus("HTTP/1.1 500 Internal server error"); + errorResponse.status("HTTP/1.1 500 Internal server error"); errorResponse.setBody("Uh-oh. Server Error."); // Enqueue some error responses. @@ -273,7 +273,7 @@ public void testToggleIfExceptionIsAllowedToRetry() throws Exception { // Enqueue some error responses, although only the first should be used because the response's // exception is not allowed to be retried. MockResponse overQueryLimitResponse = new MockResponse(); - overQueryLimitResponse.setStatus("HTTP/1.1 400 Internal server error"); + overQueryLimitResponse.status("HTTP/1.1 400 Internal server error"); overQueryLimitResponse.setBody(TestUtils.retrieveBody("OverQueryLimitResponse.json")); server.enqueue(overQueryLimitResponse); server.enqueue(overQueryLimitResponse); From d8f69b89c91dc498fabfaf259085dfae30d92437 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 6 Aug 2019 16:50:51 -0700 Subject: [PATCH 14/17] OKHttp3 v4.0.1 -> v3.14.2 due to warnings --- build.gradle | 4 ++-- src/test/java/com/google/maps/GeoApiContextTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 312922dee..83f60370e 100644 --- a/build.gradle +++ b/build.gradle @@ -48,12 +48,12 @@ artifacts { dependencies { compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.76' - api 'com.squareup.okhttp3:okhttp:4.0.1' + api 'com.squareup.okhttp3:okhttp:3.14.2' api 'com.google.code.gson:gson:2.8.5' implementation 'org.slf4j:slf4j-api:1.7.26' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:3.0.0' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.0.1' + testImplementation 'com.squareup.okhttp3:mockwebserver:3.14.2' testImplementation 'org.apache.httpcomponents:httpclient:4.5.9' testImplementation 'org.slf4j:slf4j-simple:1.7.26' testImplementation 'org.apache.commons:commons-lang3:3.9' diff --git a/src/test/java/com/google/maps/GeoApiContextTest.java b/src/test/java/com/google/maps/GeoApiContextTest.java index ddd60066c..30e70bf8a 100644 --- a/src/test/java/com/google/maps/GeoApiContextTest.java +++ b/src/test/java/com/google/maps/GeoApiContextTest.java @@ -189,7 +189,7 @@ private MockResponse createMockGoodResponse() { private MockResponse createMockBadResponse() { MockResponse response = new MockResponse(); - response.status("HTTP/1.1 500 Internal server error"); + response.setStatus("HTTP/1.1 500 Internal server error"); response.setBody("Uh-oh. Server Error."); return response; @@ -199,7 +199,7 @@ private MockResponse createMockBadResponse() { public void testRetryCanBeDisabled() throws Exception { // Set up 2 mock responses, an error that shouldn't be retried and a success MockResponse errorResponse = new MockResponse(); - errorResponse.status("HTTP/1.1 500 Internal server error"); + errorResponse.setStatus("HTTP/1.1 500 Internal server error"); errorResponse.setBody("Uh-oh. Server Error."); server.enqueue(errorResponse); @@ -221,7 +221,7 @@ public void testRetryCanBeDisabled() throws Exception { @Test public void testRetryEventuallyReturnsTheRightException() throws Exception { MockResponse errorResponse = new MockResponse(); - errorResponse.status("HTTP/1.1 500 Internal server error"); + errorResponse.setStatus("HTTP/1.1 500 Internal server error"); errorResponse.setBody("Uh-oh. Server Error."); // Enqueue some error responses. @@ -273,7 +273,7 @@ public void testToggleIfExceptionIsAllowedToRetry() throws Exception { // Enqueue some error responses, although only the first should be used because the response's // exception is not allowed to be retried. MockResponse overQueryLimitResponse = new MockResponse(); - overQueryLimitResponse.status("HTTP/1.1 400 Internal server error"); + overQueryLimitResponse.setStatus("HTTP/1.1 400 Internal server error"); overQueryLimitResponse.setBody(TestUtils.retrieveBody("OverQueryLimitResponse.json")); server.enqueue(overQueryLimitResponse); server.enqueue(overQueryLimitResponse); From b1f195f1d1e4958b0c46c4cdf21ef450429be7e0 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 6 Aug 2019 18:01:41 -0700 Subject: [PATCH 15/17] Versions version update (#584) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 83f60370e..687803c8e 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { plugins { - id 'com.github.ben-manes.versions' version '0.21.0' + id 'com.github.ben-manes.versions' version '0.22.0' id 'com.github.sherter.google-java-format' version '0.8' } From aec1149989dba9ed4b37879a71bbd0d614d34574 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 6 Aug 2019 18:21:29 -0700 Subject: [PATCH 16/17] Gradle downgrade 5.5.1 -> 5.0 for broken signing --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6b01c2694..8210b5954 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip From 6352e0c9423042b6e79668b08cba5ea8069e9c60 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 6 Aug 2019 18:32:59 -0700 Subject: [PATCH 17/17] Releasing v0.9.4 (#586) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3e2f71a43..207a978d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.9.4-SNAPSHOT +version=0.9.4 # variables required to allow build.gradle to parse, # override in ~/.gradle/gradle.properties