From 67cb074b81b4840017dd91b3bcbd344ded738081 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Thu, 27 Jul 2017 15:15:24 -0400 Subject: [PATCH 01/11] GeocodingApiTest: fix missing quote in javadoc --- src/test/java/com/google/maps/GeocodingApiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/maps/GeocodingApiTest.java b/src/test/java/com/google/maps/GeocodingApiTest.java index 569c037a3..8fd84e63b 100644 --- a/src/test/java/com/google/maps/GeocodingApiTest.java +++ b/src/test/java/com/google/maps/GeocodingApiTest.java @@ -319,7 +319,7 @@ public void testGeocodeWithBounds() throws Exception { /** * Geocode with region biasing: Geocode for * Toledo in Spain. */ @Test From 032216ba7fa5bd282c4700a1ba21ad2a45077e89 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Thu, 27 Jul 2017 21:04:28 -0400 Subject: [PATCH 02/11] Update documentation publishing instructions --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 05859a54d..c5b4e90cf 100644 --- a/README.md +++ b/README.md @@ -265,14 +265,16 @@ req.setCallback(new PendingResult.Callback() { $ ./gradlew javadoc # Publish documentation + $ git checkout $VERSION $ ./gradlew javadoc $ git checkout gh-pages - $ rm -rf javadoc $ mkdir $VERSION $ mv build/docs/javadoc $VERSION $ git add $VERSION/javadoc + $ rm latest + $ ln -s $VERSION latest $ git add latest - $ git commit + $ git commit -m "Javadoc for $VERSION" $ git push origin gh-pages [apikey]: https://developers.google.com/maps/faq#keysystem From 5069f8a8cba3f268731fd6e40bfd74c1f2abda03 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Thu, 27 Jul 2017 21:33:32 -0400 Subject: [PATCH 03/11] spell 'adapter' consistently --- .gitignore | 3 ++- README.md | 2 +- .../internal/{DayOfWeekAdaptor.java => DayOfWeekAdapter.java} | 2 +- src/main/java/com/google/maps/internal/GaePendingResult.java | 4 ++-- .../java/com/google/maps/internal/OkHttpPendingResult.java | 4 ++-- .../{PriceLevelAdaptor.java => PriceLevelAdapter.java} | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) rename src/main/java/com/google/maps/internal/{DayOfWeekAdaptor.java => DayOfWeekAdapter.java} (97%) rename src/main/java/com/google/maps/internal/{PriceLevelAdaptor.java => PriceLevelAdapter.java} (96%) diff --git a/.gitignore b/.gitignore index ba46aa4ff..b83a65c7b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ .settings/ .project .classpath -.vscode/ \ No newline at end of file +.vscode/ +/.nb-gradle/ \ No newline at end of file diff --git a/README.md b/README.md index 05859a54d..0097d0edc 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ For even more information, see the guide to [API keys][apikey]. You can add the library to your project via Maven or Gradle. **Note:** Since 0.1.18 there is now a dependency on [SLF4J](https://www.slf4j.org/). You need to add -one of the adaptor dependencies that makes sense for your logging setup. In the configuration +one of the adapter dependencies that makes sense for your logging setup. In the configuration samples below we are integrating [slf4j-nop](https://search.maven.org/#artifactdetails%7Corg.slf4j%7Cslf4j-nop%7C1.7.25%7Cjar), but there are others like diff --git a/src/main/java/com/google/maps/internal/DayOfWeekAdaptor.java b/src/main/java/com/google/maps/internal/DayOfWeekAdapter.java similarity index 97% rename from src/main/java/com/google/maps/internal/DayOfWeekAdaptor.java rename to src/main/java/com/google/maps/internal/DayOfWeekAdapter.java index 77441c553..02857dd7c 100644 --- a/src/main/java/com/google/maps/internal/DayOfWeekAdaptor.java +++ b/src/main/java/com/google/maps/internal/DayOfWeekAdapter.java @@ -29,7 +29,7 @@ * href="https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/TypeAdapter.html">GSON * Type Adapter for more detail. */ -public class DayOfWeekAdaptor extends TypeAdapter { +public class DayOfWeekAdapter extends TypeAdapter { @Override public DayOfWeek read(JsonReader reader) throws IOException { diff --git a/src/main/java/com/google/maps/internal/GaePendingResult.java b/src/main/java/com/google/maps/internal/GaePendingResult.java index 1c0b0b1d8..6902fa9b9 100644 --- a/src/main/java/com/google/maps/internal/GaePendingResult.java +++ b/src/main/java/com/google/maps/internal/GaePendingResult.java @@ -187,8 +187,8 @@ private T parseResponse(GaePendingResult request, HTTPResponse response) LocationType.class, new SafeEnumAdapter(LocationType.UNKNOWN)) .registerTypeAdapter( RatingType.class, new SafeEnumAdapter(RatingType.UNKNOWN)) - .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdaptor()) - .registerTypeAdapter(PriceLevel.class, new PriceLevelAdaptor()) + .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdapter()) + .registerTypeAdapter(PriceLevel.class, new PriceLevelAdapter()) .registerTypeAdapter(Instant.class, new InstantAdapter()) .registerTypeAdapter(LocalTime.class, new LocalTimeAdapter()) .registerTypeAdapter(GeolocationApi.Response.class, new GeolocationResponseAdapter()) diff --git a/src/main/java/com/google/maps/internal/OkHttpPendingResult.java b/src/main/java/com/google/maps/internal/OkHttpPendingResult.java index 4215228b0..1d467ee14 100644 --- a/src/main/java/com/google/maps/internal/OkHttpPendingResult.java +++ b/src/main/java/com/google/maps/internal/OkHttpPendingResult.java @@ -254,8 +254,8 @@ private T parseResponse(OkHttpPendingResult request, Response response) LocationType.class, new SafeEnumAdapter(LocationType.UNKNOWN)) .registerTypeAdapter( RatingType.class, new SafeEnumAdapter(RatingType.UNKNOWN)) - .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdaptor()) - .registerTypeAdapter(PriceLevel.class, new PriceLevelAdaptor()) + .registerTypeAdapter(DayOfWeek.class, new DayOfWeekAdapter()) + .registerTypeAdapter(PriceLevel.class, new PriceLevelAdapter()) .registerTypeAdapter(Instant.class, new InstantAdapter()) .registerTypeAdapter(LocalTime.class, new LocalTimeAdapter()) .registerTypeAdapter(GeolocationApi.Response.class, new GeolocationResponseAdapter()) diff --git a/src/main/java/com/google/maps/internal/PriceLevelAdaptor.java b/src/main/java/com/google/maps/internal/PriceLevelAdapter.java similarity index 96% rename from src/main/java/com/google/maps/internal/PriceLevelAdaptor.java rename to src/main/java/com/google/maps/internal/PriceLevelAdapter.java index 58476e148..377d2e4eb 100644 --- a/src/main/java/com/google/maps/internal/PriceLevelAdaptor.java +++ b/src/main/java/com/google/maps/internal/PriceLevelAdapter.java @@ -29,7 +29,7 @@ * href="https://google-gson.googlecode.com/svn/trunk/gson/docs/javadocs/com/google/gson/TypeAdapter.html">GSON * Type Adapter for more detail. */ -public class PriceLevelAdaptor extends TypeAdapter { +public class PriceLevelAdapter extends TypeAdapter { @Override public PriceLevel read(JsonReader reader) throws IOException { From b5c78c902e44f8e55ccf1b66df5412c91e6d4c57 Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Thu, 27 Jul 2017 22:01:19 -0400 Subject: [PATCH 04/11] Add .nb-gradle files to .gitignore This is for users of NetBeans/Gradle, which drops .nb-gradle and .nb-gradle-properties as part of the build process. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b83a65c7b..35db19ca4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,11 @@ /bin/ /com/ .gradle/ +.nb-gradle/ +.nb-gradle-properties *.iml .idea/ .settings/ .project .classpath .vscode/ -/.nb-gradle/ \ No newline at end of file From d2e3245992bde7b41b35a42977bb1270aa9fa76e Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Fri, 28 Jul 2017 01:05:59 -0400 Subject: [PATCH 05/11] README: Make central repo links do searches for this lib instead of going to main home page. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6f2d66cb0..e67000b70 100644 --- a/README.md +++ b/README.md @@ -53,8 +53,8 @@ contribute, please read [How to Contribute][contrib]. Each Google Maps Web Service request requires an API key or client ID. API keys are freely available with a Google Account at -https://developers.google.com/console. The type of API key you need is a -**Server key**. +https://developers.google.com/console. The type of API key you need is a +**Server key**. To get an API key: @@ -72,8 +72,8 @@ To get an API key: * Time Zone API 1. Create a new **Server key**. 1. If you'd like to restrict requests to a specific IP address, do so now. - -For guided help, follow the instructions for the [Directions API][directions-key]. + +For guided help, follow the instructions for the [Directions API][directions-key]. You only need one API key, but remember to enable all the APIs you need. For even more information, see the guide to [API keys][apikey]. @@ -87,7 +87,7 @@ You can add the library to your project via Maven or Gradle. one of the adapter dependencies that makes sense for your logging setup. In the configuration samples below we are integrating [slf4j-nop](https://search.maven.org/#artifactdetails%7Corg.slf4j%7Cslf4j-nop%7C1.7.25%7Cjar), -but there are others like +but there are others like [slf4j-log4j12](https://search.maven.org/#artifactdetails%7Corg.slf4j%7Cslf4j-log4j12%7C1.7.25%7Cjar) and [slf4j-jdk14](https://search.maven.org/#artifactdetails%7Corg.slf4j%7Cslf4j-jdk14%7C1.7.25%7Cjar) that will make more sense in other configurations. This will stop a warning message being emitted @@ -119,8 +119,8 @@ dependencies { } ``` -You can find the latest version at the top of this README or by searching -[Maven Central](https://search.maven.org/) or [Gradle, Please](http://gradleplease.appspot.com/). +You can find the latest version at the top of this README or by [searching +Maven Central](https://search.maven.org/#search%7Cga%7C1%7Ca%3A%22google-maps-services%22) or [Gradle, Please](http://gradleplease.appspot.com/#google-maps-services). ## Developer Documentation From 7e22cf4362328ac1485135a5dce47156e496ae9b Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Fri, 28 Jul 2017 19:42:07 -0400 Subject: [PATCH 06/11] Suppress deprecation warnings for radarSearchQuery --- build.gradle | 8 ++++++++ src/test/java/com/google/maps/PlacesApiTest.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/build.gradle b/build.gradle index c982f64fe..85974b902 100644 --- a/build.gradle +++ b/build.gradle @@ -70,6 +70,14 @@ task updateVersion(type: Copy) { compileJava.source = "build/filtered/src/main/java" compileJava.dependsOn updateVersion +compileJava { + options.compilerArgs << "-Xlint:deprecation" +} + +compileTestJava { + options.compilerArgs << "-Xlint:deprecation" +} + // Propagate API Key system properties to test tasks tasks.withType(Test) { systemProperty 'api.key', System.getProperty('api.key') diff --git a/src/test/java/com/google/maps/PlacesApiTest.java b/src/test/java/com/google/maps/PlacesApiTest.java index c965ffff0..3c9bb4862 100644 --- a/src/test/java/com/google/maps/PlacesApiTest.java +++ b/src/test/java/com/google/maps/PlacesApiTest.java @@ -581,6 +581,7 @@ public void testNearbySearchRankbyDistanceWithoutKeywordNameOrType() throws Exce } @Test + @SuppressWarnings("deprecation") // radarSearchQuery still supported until 6/30/2018 public void testRadarSearchRequest() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext("{\"status\" : \"OK\"}")) { LatLng location = new LatLng(10, 20); @@ -607,6 +608,7 @@ public void testRadarSearchRequest() throws Exception { } @Test(expected = IllegalArgumentException.class) + @SuppressWarnings("deprecation") // radarSearchQuery still supported until 6/30/2018 public void testRadarSearchLocationWithoutKeywordNameOrType() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext("")) { LatLng location = new LatLng(10, 20); @@ -746,6 +748,7 @@ public void testNearbySearchRequestByType() throws Exception { } @Test + @SuppressWarnings("deprecation") // radarSearchQuery still supported until 6/30/2018 public void testRadarSearchRequestByKeyword() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext(placesApiRadarSearchRequestByKeyword)) { @@ -761,6 +764,7 @@ public void testRadarSearchRequestByKeyword() throws Exception { } @Test + @SuppressWarnings("deprecation") // radarSearchQuery still supported until 6/30/2018 public void testRadarSearchRequestByName() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext(placesApiRadarSearchRequestByName)) { @@ -779,6 +783,7 @@ public void testRadarSearchRequestByName() throws Exception { } @Test + @SuppressWarnings("deprecation") // radarSearchQuery still supported until 6/30/2018 public void testRadarSearchRequestByType() throws Exception { try (LocalTestServerContext sc = new LocalTestServerContext(placesApiRadarSearchRequestByType)) { From 7d2282be775badcabf6bd4af045ac9a6e090cfea Mon Sep 17 00:00:00 2001 From: Andrew Janke Date: Fri, 28 Jul 2017 19:07:45 -0400 Subject: [PATCH 07/11] Upgrade mockwebserver to 3.8.1 This upgrades from the old standalone mockwebserver to the new one that's folded in to OkHttp. --- build.gradle | 2 +- .../com/google/maps/GeoApiContextTest.java | 30 ++++++++++--------- .../google/maps/LocalTestServerContext.java | 12 ++++---- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 85974b902..be6896e9f 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:1.10.19' - testCompile 'com.google.mockwebserver:mockwebserver:20130706' + testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1' testCompile 'org.apache.httpcomponents:httpclient:4.5.3' testCompile 'org.slf4j:slf4j-simple:1.7.25' testCompile 'commons-lang:commons-lang:2.6' diff --git a/src/test/java/com/google/maps/GeoApiContextTest.java b/src/test/java/com/google/maps/GeoApiContextTest.java index 5da5b131c..e1f6fabb3 100644 --- a/src/test/java/com/google/maps/GeoApiContextTest.java +++ b/src/test/java/com/google/maps/GeoApiContextTest.java @@ -24,14 +24,15 @@ import com.google.maps.internal.ApiConfig; import com.google.maps.internal.ApiResponse; import com.google.maps.model.GeocodingResult; -import com.google.mockwebserver.MockResponse; -import com.google.mockwebserver.MockWebServer; -import com.google.mockwebserver.RecordedRequest; import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import okhttp3.Headers; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -72,7 +73,7 @@ public void testGetIncludesDefaultUserAgent() throws Exception { // Set up the fake web server server.enqueue(new MockResponse()); - server.play(); + server.start(); setMockBaseUrl(); // Build & execute the request using our context @@ -81,14 +82,15 @@ public void testGetIncludesDefaultUserAgent() throws Exception { // Read the headers server.shutdown(); RecordedRequest request = server.takeRequest(); - List headers = request.getHeaders(); + Headers headers = request.getHeaders(); boolean headerFound = false; - for (String header : headers) { - if (header.startsWith("User-Agent: ")) { + for (String headerName : headers.names()) { + if (headerName.equals("User-Agent")) { headerFound = true; + String headerValue = headers.get(headerName); assertTrue( "User agent not in correct format", - header.matches("User-Agent: GoogleGeoApiClientJava/[^\\s]+")); + headerValue.matches("GoogleGeoApiClientJava/[^\\s]+")); } } @@ -103,7 +105,7 @@ public void testErrorResponseRetries() throws Exception { server.enqueue(errorResponse); server.enqueue(goodResponse); - server.play(); + server.start(); // Build the context under test setMockBaseUrl(); @@ -128,7 +130,7 @@ public void testSettingMaxRetries() throws Exception { server.enqueue(errorResponse); server.enqueue(errorResponse); server.enqueue(goodResponse); - server.play(); + server.start(); setMockBaseUrl(); // This should limit the number of retries, ensuring that the success response is NOT returned. @@ -200,7 +202,7 @@ public void testRetryCanBeDisabled() throws Exception { goodResponse.setBody("{\n \"results\" : [],\n \"status\" : \"ZERO_RESULTS\"\n}"); server.enqueue(goodResponse); - server.play(); + server.start(); setMockBaseUrl(); // This should disable the retry, ensuring that the success response is NOT returned @@ -220,7 +222,7 @@ public void testRetryEventuallyReturnsTheRightException() throws Exception { for (int i = 0; i < 10; i++) { server.enqueue(errorResponse); } - server.play(); + server.start(); // Wire the mock web server to the context setMockBaseUrl(); @@ -246,7 +248,7 @@ public void testQueryParamsHaveOrderPreserved() throws Exception { response.setBody("{}"); server.enqueue(response); - server.play(); + server.start(); setMockBaseUrl(); builder @@ -270,7 +272,7 @@ public void testToggleIfExceptionIsAllowedToRetry() throws Exception { server.enqueue(overQueryLimitResponse); server.enqueue(overQueryLimitResponse); server.enqueue(overQueryLimitResponse); - server.play(); + server.start(); builder.retryTimeout(1, TimeUnit.MILLISECONDS); builder.maxRetries(10); diff --git a/src/test/java/com/google/maps/LocalTestServerContext.java b/src/test/java/com/google/maps/LocalTestServerContext.java index 7700b54fa..bdf22f78d 100644 --- a/src/test/java/com/google/maps/LocalTestServerContext.java +++ b/src/test/java/com/google/maps/LocalTestServerContext.java @@ -18,14 +18,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.google.mockwebserver.MockResponse; -import com.google.mockwebserver.MockWebServer; -import com.google.mockwebserver.RecordedRequest; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.Charset; import java.util.List; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import okio.Buffer; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.json.JSONObject; @@ -43,7 +44,7 @@ public class LocalTestServerContext implements AutoCloseable { MockResponse response = new MockResponse(); response.setBody(responseBody); server.enqueue(response); - server.play(); + server.start(); this.context = new GeoApiContext.Builder() @@ -67,7 +68,8 @@ private void takeRequest() throws InterruptedException { public JSONObject requestBody() throws InterruptedException { this.takeRequest(); - return new JSONObject(new String(request.getBody(), Charset.forName("UTF8"))); + + return new JSONObject(request.getBody().readUtf8()); } private List actualParams() throws InterruptedException, URISyntaxException { From b27ec21db09cee25476f875de70f9cfe534a3566 Mon Sep 17 00:00:00 2001 From: gabrielsalmeida Date: Mon, 31 Jul 2017 21:04:53 -0300 Subject: [PATCH 08/11] Update GeoApiContext.java - Exception using GAE Fixed GeoApiContext class, because of exception NoClassDefFoundError when using GAE(due of Builder initializing OkHttpRequestHandler). Created another constructor that receives RequestHandler.Builder as workaround. --- src/main/java/com/google/maps/GeoApiContext.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/google/maps/GeoApiContext.java b/src/main/java/com/google/maps/GeoApiContext.java index 71d4e79c9..d344c5dff 100644 --- a/src/main/java/com/google/maps/GeoApiContext.java +++ b/src/main/java/com/google/maps/GeoApiContext.java @@ -291,6 +291,10 @@ public static class Builder { public Builder() { requestHandlerBuilder(new OkHttpRequestHandler.Builder()); } + + public Builder(RequestHandler.Builder builder) { + requestHandlerBuilder(builder); + } /** * Change the RequestHandler.Builder strategy to change between the {@code OkHttpRequestHandler} From 50d60d081d6123c58d37ef77f15281a665f25a40 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Wed, 2 Aug 2017 12:13:30 +1000 Subject: [PATCH 09/11] ./gradlew googleJavaFormat --- src/main/java/com/google/maps/GeoApiContext.java | 2 +- src/test/java/com/google/maps/GeoApiContextTest.java | 3 +-- src/test/java/com/google/maps/LocalTestServerContext.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/google/maps/GeoApiContext.java b/src/main/java/com/google/maps/GeoApiContext.java index d344c5dff..e96769709 100644 --- a/src/main/java/com/google/maps/GeoApiContext.java +++ b/src/main/java/com/google/maps/GeoApiContext.java @@ -291,7 +291,7 @@ public static class Builder { public Builder() { requestHandlerBuilder(new OkHttpRequestHandler.Builder()); } - + public Builder(RequestHandler.Builder builder) { requestHandlerBuilder(builder); } diff --git a/src/test/java/com/google/maps/GeoApiContextTest.java b/src/test/java/com/google/maps/GeoApiContextTest.java index e1f6fabb3..128559d03 100644 --- a/src/test/java/com/google/maps/GeoApiContextTest.java +++ b/src/test/java/com/google/maps/GeoApiContextTest.java @@ -26,13 +26,12 @@ import com.google.maps.model.GeocodingResult; import java.io.IOException; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import okhttp3.Headers; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import okhttp3.Headers; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/com/google/maps/LocalTestServerContext.java b/src/test/java/com/google/maps/LocalTestServerContext.java index bdf22f78d..fb69ccd4a 100644 --- a/src/test/java/com/google/maps/LocalTestServerContext.java +++ b/src/test/java/com/google/maps/LocalTestServerContext.java @@ -26,7 +26,6 @@ import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; -import okio.Buffer; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.json.JSONObject; @@ -68,7 +67,7 @@ private void takeRequest() throws InterruptedException { public JSONObject requestBody() throws InterruptedException { this.takeRequest(); - + return new JSONObject(request.getBody().readUtf8()); } From 5c413bb672400ca79a9d7f6122b91ebc7cdb3a58 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Wed, 2 Aug 2017 12:21:41 +1000 Subject: [PATCH 10/11] Opening up development --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ddddcba17..2d65594e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.2.0 +version=0.2.1-SNAPSHOT # variables required to allow build.gradle to parse, # override in ~/.gradle/gradle.properties From 7ce687557a56729b139051cf7cea9a499907f190 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Wed, 2 Aug 2017 12:31:13 +1000 Subject: [PATCH 11/11] Releasing v0.2.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2d65594e4..00a1a13b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=0.2.1-SNAPSHOT +version=0.2.1 # variables required to allow build.gradle to parse, # override in ~/.gradle/gradle.properties