From 61261cb3be4e4579877a0e616fab0676d04af2d1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 11:03:37 -0800 Subject: [PATCH 01/23] chore: release 1.34.1-SNAPSHOT (#920) * updated versions.txt [ci skip] * updated google-http-client-findbugs/google-http-client-findbugs-test/pom.xml [ci skip] * updated google-http-client-android-test/pom.xml [ci skip] * updated google-http-client-android/pom.xml [ci skip] * updated google-http-client-apache-v2/pom.xml [ci skip] * updated google-http-client-appengine/pom.xml [ci skip] * updated google-http-client-assembly/pom.xml [ci skip] * updated google-http-client-bom/pom.xml [ci skip] * updated google-http-client-findbugs/pom.xml [ci skip] * updated google-http-client-gson/pom.xml [ci skip] * updated google-http-client-jackson2/pom.xml [ci skip] * updated google-http-client-protobuf/pom.xml [ci skip] * updated google-http-client-test/pom.xml [ci skip] * updated google-http-client-xml/pom.xml [ci skip] * updated google-http-client/pom.xml [ci skip] * updated pom.xml [ci skip] * updated samples/dailymotion-simple-cmdline-sample/pom.xml [ci skip] --- google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 78055ae04..37bdde14e 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.34.0 + 1.34.1-SNAPSHOT apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.34.0 + 1.34.1-SNAPSHOT android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.34.0 + 1.34.1-SNAPSHOT junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 196b5b758..3fddf9b74 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-android - 1.34.0 + 1.34.1-SNAPSHOT Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 9bc7577ce..eab639963 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-apache-v2 - 1.34.0 + 1.34.1-SNAPSHOT Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index aff13f076..516262727 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-appengine - 1.34.0 + 1.34.1-SNAPSHOT Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index c7e8fed28..8dd0401ec 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml com.google.http-client google-http-client-assembly - 1.34.0 + 1.34.1-SNAPSHOT pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 8f2e11e5a..712a4eb64 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.34.0 + 1.34.1-SNAPSHOT pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-android - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-apache-v2 - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-appengine - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-findbugs - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-gson - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-jackson2 - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-protobuf - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-test - 1.34.0 + 1.34.1-SNAPSHOT com.google.http-client google-http-client-xml - 1.34.0 + 1.34.1-SNAPSHOT diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index b0da7f007..e6e433ad6 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-findbugs - 1.34.0 + 1.34.1-SNAPSHOT Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 3854f0010..9bc78ddf3 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-gson - 1.34.0 + 1.34.1-SNAPSHOT GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index c1ca279d2..cfe69649b 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-jackson2 - 1.34.0 + 1.34.1-SNAPSHOT Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 3afa4286c..465d4c27c 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-protobuf - 1.34.0 + 1.34.1-SNAPSHOT Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index a41ca95f3..d11c2ae29 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-test - 1.34.0 + 1.34.1-SNAPSHOT Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index a874b854b..0c46baef9 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client-xml - 1.34.0 + 1.34.1-SNAPSHOT XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 39c779836..3d43747a8 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../pom.xml google-http-client - 1.34.0 + 1.34.1-SNAPSHOT Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index 15dd16912..cc4014a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -549,7 +549,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.34.0 + 1.34.1-SNAPSHOT 1.9.71 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 77c7d8973..a30dfc329 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.34.0 + 1.34.1-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 28bd1f958..250b4fa9f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.34.0:1.34.0 -google-http-client-bom:1.34.0:1.34.0 -google-http-client-parent:1.34.0:1.34.0 -google-http-client-android:1.34.0:1.34.0 -google-http-client-android-test:1.34.0:1.34.0 -google-http-client-apache-v2:1.34.0:1.34.0 -google-http-client-appengine:1.34.0:1.34.0 -google-http-client-assembly:1.34.0:1.34.0 -google-http-client-findbugs:1.34.0:1.34.0 -google-http-client-gson:1.34.0:1.34.0 -google-http-client-jackson2:1.34.0:1.34.0 -google-http-client-protobuf:1.34.0:1.34.0 -google-http-client-test:1.34.0:1.34.0 -google-http-client-xml:1.34.0:1.34.0 +google-http-client:1.34.0:1.34.1-SNAPSHOT +google-http-client-bom:1.34.0:1.34.1-SNAPSHOT +google-http-client-parent:1.34.0:1.34.1-SNAPSHOT +google-http-client-android:1.34.0:1.34.1-SNAPSHOT +google-http-client-android-test:1.34.0:1.34.1-SNAPSHOT +google-http-client-apache-v2:1.34.0:1.34.1-SNAPSHOT +google-http-client-appengine:1.34.0:1.34.1-SNAPSHOT +google-http-client-assembly:1.34.0:1.34.1-SNAPSHOT +google-http-client-findbugs:1.34.0:1.34.1-SNAPSHOT +google-http-client-gson:1.34.0:1.34.1-SNAPSHOT +google-http-client-jackson2:1.34.0:1.34.1-SNAPSHOT +google-http-client-protobuf:1.34.0:1.34.1-SNAPSHOT +google-http-client-test:1.34.0:1.34.1-SNAPSHOT +google-http-client-xml:1.34.0:1.34.1-SNAPSHOT From 7e0b952a0d9c84ac43dff43914567c98f3e81f66 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 23 Dec 2019 10:28:41 -0500 Subject: [PATCH 02/23] docs: libraries-bom 3.3.0 (#921) --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index ca52aeb0c..a9b039293 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 3.1.0 + 3.3.0 pom import From d1fe119b84a7c2e12c2348bf38aa5657fc268989 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 23 Dec 2019 19:35:55 +0200 Subject: [PATCH 03/23] chore(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.2.1 (#924) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc4014a3c..9c799490a 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.0 + 3.2.1 attach-sources From 91c20a3dfb654e85104b1c09a0b2befbae356c19 Mon Sep 17 00:00:00 2001 From: Dmitry <58846611+dmitry-fa@users.noreply.github.com> Date: Tue, 31 Dec 2019 01:26:10 +0300 Subject: [PATCH 04/23] fix: use random UUID for multipart boundary delimiter (#916) * fix: use random uuid string as boundary * fix: use random uuid string as boundary --- .../api/client/http/MultipartContent.java | 15 ++- .../api/client/http/MultipartContentTest.java | 106 +++++++++++------- 2 files changed, 74 insertions(+), 47 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java b/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java index 4fdc0b586..43a58b446 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java +++ b/google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.UUID; /** * Serializes MIME multipart content as specified by RFC 2046: Multipurpose Internet * Mail Extensions: The Multipart/mixed (primary) subtype. * - *

By default the media type is {@code "multipart/related; boundary=__END_OF_PART__"}, but this + *

By default the media type is {@code "multipart/related; boundary=__END_OF_PART____"}, but this * may be customized by calling {@link #setMediaType(HttpMediaType)}, {@link #getMediaType()}, or * {@link #setBoundary(String)}. * @@ -47,10 +48,14 @@ public class MultipartContent extends AbstractHttpContent { private static final String TWO_DASHES = "--"; /** Parts of the HTTP multipart request. */ - private ArrayList parts = new ArrayList(); + private ArrayList parts = new ArrayList<>(); public MultipartContent() { - super(new HttpMediaType("multipart/related").setParameter("boundary", "__END_OF_PART__")); + this("__END_OF_PART__" + UUID.randomUUID().toString() + "__"); + } + + public MultipartContent(String boundary) { + super(new HttpMediaType("multipart/related").setParameter("boundary", boundary)); } public void writeTo(OutputStream out) throws IOException { @@ -152,7 +157,7 @@ public MultipartContent addPart(Part part) { * changing the return type, but nothing else. */ public MultipartContent setParts(Collection parts) { - this.parts = new ArrayList(parts); + this.parts = new ArrayList<>(parts); return this; } @@ -164,7 +169,7 @@ public MultipartContent setParts(Collection parts) { * changing the return type, but nothing else. */ public MultipartContent setContentParts(Collection contentParts) { - this.parts = new ArrayList(contentParts.size()); + this.parts = new ArrayList<>(contentParts.size()); for (HttpContent contentPart : contentParts) { addPart(new Part(contentPart)); } diff --git a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java index 76f725b61..14e0e5990 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java @@ -15,6 +15,7 @@ package com.google.api.client.http; import com.google.api.client.json.Json; +import com.google.api.client.util.Charsets; import com.google.api.client.util.StringUtils; import java.io.ByteArrayOutputStream; import junit.framework.TestCase; @@ -26,55 +27,76 @@ */ public class MultipartContentTest extends TestCase { + private static final String BOUNDARY = "__END_OF_PART__"; private static final String CRLF = "\r\n"; private static final String CONTENT_TYPE = Json.MEDIA_TYPE; - private static final String HEADERS = - "Content-Length: 3" - + CRLF - + "Content-Type: application/json; charset=UTF-8" - + CRLF - + "content-transfer-encoding: binary" - + CRLF; + private static final String HEADERS = headers("application/json; charset=UTF-8", "foo"); + + private static String headers(String contentType, String value) { + return "Content-Length: " + value.length() + CRLF + + "Content-Type: " + contentType + CRLF + + "content-transfer-encoding: binary" + CRLF; + } + + public void testRandomContent() throws Exception { + MultipartContent content = new MultipartContent(); + String boundaryString = content.getBoundary(); + assertNotNull(boundaryString); + assertTrue(boundaryString.startsWith(BOUNDARY)); + assertTrue(boundaryString.endsWith("__")); + assertEquals("multipart/related; boundary=" + boundaryString, content.getType()); + + final String[][] VALUES = new String[][] { + {"Hello world", "text/plain"}, + {"Hi", "application/xml"}, + {"{x:1,y:2}", "application/json"} + }; + StringBuilder expectedStringBuilder = new StringBuilder(); + for (String[] valueTypePair: VALUES) { + String contentValue = valueTypePair[0]; + String contentType = valueTypePair[1]; + content.addPart(new MultipartContent.Part(ByteArrayContent.fromString(contentType, contentValue))); + expectedStringBuilder.append("--").append(boundaryString).append(CRLF) + .append(headers(contentType, contentValue)).append(CRLF) + .append(contentValue).append(CRLF); + } + expectedStringBuilder.append("--").append(boundaryString).append("--").append(CRLF); + // write to string + ByteArrayOutputStream out = new ByteArrayOutputStream(); + content.writeTo(out); + String expectedContent = expectedStringBuilder.toString(); + assertEquals(expectedContent, out.toString(Charsets.UTF_8.name())); + assertEquals(StringUtils.getBytesUtf8(expectedContent).length, content.getLength()); + } public void testContent() throws Exception { - subtestContent("--__END_OF_PART__--" + CRLF, null); + subtestContent("--" + BOUNDARY + "--" + CRLF, null); subtestContent( - "--__END_OF_PART__" + CRLF + HEADERS + CRLF + "foo" + CRLF + "--__END_OF_PART__--" + CRLF, - null, + "--" + BOUNDARY + CRLF + + HEADERS + CRLF + + "foo" + CRLF + + "--" + BOUNDARY + "--" + CRLF, + null, "foo"); subtestContent( - "--__END_OF_PART__" - + CRLF - + HEADERS - + CRLF - + "foo" - + CRLF - + "--__END_OF_PART__" - + CRLF - + HEADERS - + CRLF - + "bar" - + CRLF - + "--__END_OF_PART__--" - + CRLF, - null, + "--" + BOUNDARY + CRLF + + HEADERS + CRLF + + "foo" + CRLF + + "--" + BOUNDARY + CRLF + + HEADERS + CRLF + + "bar" + CRLF + + "--" + BOUNDARY + "--" + CRLF, + null, "foo", "bar"); subtestContent( - "--myboundary" - + CRLF - + HEADERS - + CRLF - + "foo" - + CRLF - + "--myboundary" - + CRLF - + HEADERS - + CRLF - + "bar" - + CRLF - + "--myboundary--" - + CRLF, + "--myboundary" + CRLF + + HEADERS + CRLF + + "foo" + CRLF + + "--myboundary" + CRLF + + HEADERS + CRLF + + "bar" + CRLF + + "--myboundary--" + CRLF, "myboundary", "foo", "bar"); @@ -83,7 +105,7 @@ public void testContent() throws Exception { private void subtestContent(String expectedContent, String boundaryString, String... contents) throws Exception { // multipart content - MultipartContent content = new MultipartContent(); + MultipartContent content = new MultipartContent(boundaryString == null ? BOUNDARY : boundaryString); for (String contentValue : contents) { content.addPart( new MultipartContent.Part(ByteArrayContent.fromString(CONTENT_TYPE, contentValue))); @@ -94,11 +116,11 @@ private void subtestContent(String expectedContent, String boundaryString, Strin // write to string ByteArrayOutputStream out = new ByteArrayOutputStream(); content.writeTo(out); - assertEquals(expectedContent, out.toString()); + assertEquals(expectedContent, out.toString(Charsets.UTF_8.name())); assertEquals(StringUtils.getBytesUtf8(expectedContent).length, content.getLength()); assertEquals( boundaryString == null - ? "multipart/related; boundary=__END_OF_PART__" + ? "multipart/related; boundary=" + BOUNDARY : "multipart/related; boundary=" + boundaryString, content.getType()); } From c6dd9b9ece1115d000566fcc4dc31b344d7c54ed Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 1 Jan 2020 21:29:17 +0200 Subject: [PATCH 05/23] chore(deps): update dependency junit:junit to v4.13 (#928) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c799490a..0f645add1 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ junit junit - 4.12 + 4.13 com.google.truth From 0f8db399c1a1f5d20686f6f4d8b4a88766f5c969 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 5 Jan 2020 13:16:52 +0200 Subject: [PATCH 06/23] chore(deps): update dependency com.fasterxml.jackson.core:jackson-core to v2.10.2 (#930) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0f645add1..7cb05adc7 100644 --- a/pom.xml +++ b/pom.xml @@ -554,7 +554,7 @@ UTF-8 3.0.2 2.8.6 - 2.10.1 + 2.10.2 3.11.1 28.1-android 1.1.4c From 029bbbfb5ddfefe64e64ecca4b1413ae1c93ddd8 Mon Sep 17 00:00:00 2001 From: Kevin Binswanger Date: Mon, 6 Jan 2020 14:44:00 -0600 Subject: [PATCH 07/23] docs: fix various paragraph issues in javadoc (#867) --- .../google/api/client/http/AbstractInputStreamContent.java | 2 -- .../google/api/client/http/ExponentialBackOffPolicy.java | 2 +- .../main/java/com/google/api/client/json/JsonParser.java | 2 -- .../main/java/com/google/api/client/json/JsonString.java | 6 +++--- .../api/client/testing/json/webtoken/TestCertificates.java | 2 +- .../src/main/java/com/google/api/client/util/PemReader.java | 4 +--- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java index 789fab5ec..96ed50193 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java +++ b/google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java @@ -29,8 +29,6 @@ * amount of content read from the input stream, you may use {@link ByteStreams#limit(InputStream, * long)}. * - *

- * *

Implementations don't need to be thread-safe. * * @since 1.4 diff --git a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java index 2384c8a89..20d8859bf 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java +++ b/google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java @@ -31,7 +31,7 @@ * retry_interval * (random value in range [1 - randomization_factor, 1 + randomization_factor]) * * - * In other words {@link #getNextBackOffMillis()} will range between the randomization factor + *

In other words {@link #getNextBackOffMillis()} will range between the randomization factor * percentage below and above the retry interval. For example, using 2 seconds as the base retry * interval and 0.5 as the randomization factor, the actual back off period used in the next retry * attempt will be between 1 and 3 seconds. diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java index 9bb1184f0..7ac07ff56 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java @@ -50,8 +50,6 @@ *

Implementation has no fields and therefore thread-safe, but sub-classes are not necessarily * thread-safe. * - *

- * *

If a JSON map is encountered while using a destination class of type Map, then an {@link * java.util.ArrayMap} is used by default for the parsed values. * diff --git a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java index 6b93bbe21..68b3b2f9c 100644 --- a/google-http-client/src/main/java/com/google/api/client/json/JsonString.java +++ b/google-http-client/src/main/java/com/google/api/client/json/JsonString.java @@ -32,7 +32,7 @@ * * * - * can be used for this JSON content: + *

can be used for this JSON content: * *

  * 
@@ -40,7 +40,7 @@
  * 
  * 
* - * However, if instead the JSON content uses a JSON String to store the value, one needs to use the + *

However, if instead the JSON content uses a JSON String to store the value, one needs to use the * {@link JsonString} annotation. For example: * *

@@ -51,7 +51,7 @@
  * 
  * 
* - * can be used for this JSON content: + *

can be used for this JSON content: * *

  * 
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
index 5c3457af6..2ae6b08cc 100644
--- a/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
+++ b/google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java
@@ -240,7 +240,7 @@ public X509TrustManager getTrustManager() throws IOException, GeneralSecurityExc
    * {"foo":"bar"}
    * 
* - * The message is signed using {@code FOO_BAR_COM_KEY}. + *

The message is signed using {@code FOO_BAR_COM_KEY}. */ public static final String JWS_SIGNATURE = "eyJhbGciOiJSUzI1NiIsIng1YyI6WyJNSUlDNlRDQ0FkRUNBU293RFFZSktvWklo" diff --git a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java index a1f06a3bc..607d80de0 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/PemReader.java +++ b/google-http-client/src/main/java/com/google/api/client/util/PemReader.java @@ -36,9 +36,7 @@ * *

Limitations: * - *

- * - *

    + *

      *
    • Assumes the PEM file section content is not encrypted and cannot handle the case of any * headers inside the BEGIN and END tag. *
    • It also ignores any attributes associated with any PEM file section. From 290e3ef6197b56b73256d38f551e3aa044c1c8ff Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Jan 2020 08:59:00 -0800 Subject: [PATCH 08/23] chore: update common templates (#931) --- .kokoro/build.sh | 15 +- .kokoro/continuous/samples.cfg | 31 + .kokoro/nightly/samples.cfg | 31 + .kokoro/presubmit/samples.cfg | 31 + CONTRIBUTING.md | 104 ++- synth.metadata | 1393 +++++++++++++++++++++++++++++++- 6 files changed, 1602 insertions(+), 3 deletions(-) create mode 100644 .kokoro/continuous/samples.cfg create mode 100644 .kokoro/nightly/samples.cfg create mode 100644 .kokoro/presubmit/samples.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index dc2936ef7..f1ae58408 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,13 +44,26 @@ test) bash .kokoro/coerce_logs.sh ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn \ + -Penable-samples \ + com.coveo:fmt-maven-plugin:check ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + ;; +samples) + mvn -B \ + -Penable-samples \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg new file mode 100644 index 000000000..fa7b493d0 --- /dev/null +++ b/.kokoro/continuous/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg new file mode 100644 index 000000000..9a9102490 --- /dev/null +++ b/.kokoro/nightly/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg new file mode 100644 index 000000000..fa7b493d0 --- /dev/null +++ b/.kokoro/presubmit/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ebbb59e53..085021dde 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,4 +25,106 @@ information on using pull requests. ## Community Guidelines This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). + +## Building the project + +To build, package, and run all unit tests run the command + +``` +mvn clean verify +``` + +### Running Integration tests + +To include integration tests when building the project, you need access to +a GCP Project with a valid service account. + +For instructions on how to generate a service account and corresponding +credentials JSON see: [Creating a Service Account][1]. + +Then run the following to build, package, run all unit tests and run all +integration tests. + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-integration-tests clean verify +``` + +## Code Samples + +Code Samples must be bundled in separate Maven modules, and guarded by a +Maven profile with the name `enable-samples`. + +The samples must be separate from the primary project for a few reasons: +1. Primary projects have a minimum Java version of Java 7 whereas samples have + a minimum Java version of Java 8. Due to this we need the ability to + selectively exclude samples from a build run. +2. Many code samples depend on external GCP services and need + credentials to access the service. +3. Code samples are not released as Maven artifacts and must be excluded from + release builds. + +### Building + +```bash +mvn -Penable-samples clean verify +``` + +Some samples require access to GCP services and require a service account: + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-samples clean verify +``` + +### Profile Config + +1. To add samples in a profile to your Maven project, add the following to your +`pom.xml` + + ```xml + + [...] + + + enable-samples + + sample + + + + [...] + + ``` + +2. [Activate](#profile-activation) the profile. +3. Define your samples in a normal Maven project in the `samples/` directory + +### Profile Activation + +To include code samples when building and testing the project, enable the +`enable-samples` Maven profile. + +#### Command line + +To activate the Maven profile on the command line add `-Penable-samples` to your +Maven command. + +#### Maven `settings.xml` + +To activate the Maven profile in your `~/.m2/settings.xml` add an entry of +`enable-samples` following the instructions in [Active Profiles][2]. + +This method has the benefit of applying to all projects you build (and is +respected by IntelliJ IDEA) and is recommended if you are going to be +contributing samples to several projects. + +#### IntelliJ IDEA + +To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in +[Activate Maven profiles][3] to activate `enable-samples`. + +[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account +[2]: https://maven.apache.org/settings.html#Active_Profiles +[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles diff --git a/synth.metadata b/synth.metadata index aa3ceb00b..7b71dfbb3 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-11-21T08:36:32.990208Z", + "updateTime": "2020-01-07T08:32:34.360210Z", "sources": [ { "template": { @@ -8,5 +8,1396 @@ "version": "2019.10.17" } } + ], + "newFiles": [ + { + "path": ".repo-metadata.json" + }, + { + "path": "checkstyle.xml" + }, + { + "path": "renovate.json" + }, + { + "path": "findbugs-exclude.xml" + }, + { + "path": "synth.py" + }, + { + "path": "CHANGELOG.md" + }, + { + "path": "codecov.yaml" + }, + { + "path": "LICENSE" + }, + { + "path": "instructions.html" + }, + { + "path": "checkstyle-suppressions.xml" + }, + { + "path": ".gitignore" + }, + { + "path": "pom.xml" + }, + { + "path": "CODE_OF_CONDUCT.md" + }, + { + "path": ".travis.yml" + }, + { + "path": "synth.metadata" + }, + { + "path": "README.md" + }, + { + "path": "versions.txt" + }, + { + "path": "CONTRIBUTING.md" + }, + { + "path": "clirr-ignored-differences.xml" + }, + { + "path": "google-http-client-assembly/readme.html" + }, + { + "path": "google-http-client-assembly/LICENSE.txt" + }, + { + "path": "google-http-client-assembly/pom.xml" + }, + { + "path": "google-http-client-assembly/proguard-google-http-client.txt" + }, + { + "path": "google-http-client-assembly/classpath-include" + }, + { + "path": "google-http-client-assembly/assembly.xml" + }, + { + "path": "google-http-client-assembly/licenses/CDDL-LICENSE.txt" + }, + { + "path": "google-http-client-assembly/licenses/xpp3_LICENSE.txt" + }, + { + "path": "google-http-client-assembly/licenses/APACHE-LICENSE.txt" + }, + { + "path": "google-http-client-assembly/licenses/BSD-LICENSE.txt" + }, + { + "path": "google-http-client-assembly/properties/google-http-client.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-android.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-gson.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-jackson2.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/protobuf-java.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/jackson-core.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-xml.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/gson.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-apache-v2.jar.properties" + }, + { + "path": "google-http-client-assembly/properties/google-http-client-protobuf.jar.properties" + }, + { + "path": "google-http-client-protobuf/pom.xml" + }, + { + "path": "google-http-client-protobuf/src/test/proto/simple_proto.proto" + }, + { + "path": "google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java" + }, + { + "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java" + }, + { + "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java" + }, + { + "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java" + }, + { + "path": "google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java" + }, + { + "path": "google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java" + }, + { + "path": "google-http-client-xml/pom.xml" + }, + { + "path": "google-http-client-xml/src/test/resources/sample-atom.xml" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlListTest.java" + }, + { + "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/GenericXml.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/package-info.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/package-info.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java" + }, + { + "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java" + }, + { + "path": "google-http-client-gson/pom.xml" + }, + { + "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonParserTest.java" + }, + { + "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java" + }, + { + "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonGeneratorTest.java" + }, + { + "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java" + }, + { + "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonGenerator.java" + }, + { + "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java" + }, + { + "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java" + }, + { + "path": "google-http-client-jackson2/pom.xml" + }, + { + "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java" + }, + { + "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonGeneratorTest.java" + }, + { + "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonParserTest.java" + }, + { + "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java" + }, + { + "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java" + }, + { + "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java" + }, + { + "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java" + }, + { + "path": "google-http-client-appengine/pom.xml" + }, + { + "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactoryTest.java" + }, + { + "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java" + }, + { + "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/http/UrlFetchTransportTest.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java" + }, + { + "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/logging.properties" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/instructions.html" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/pom.xml" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/DailyMotionSample.launch" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.ui.prefs" + }, + { + "path": "samples/dailymotion-simple-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/simple/DailyMotionSample.java" + }, + { + "path": "google-http-client-android/AndroidManifest.xml" + }, + { + "path": "google-http-client-android/project.properties" + }, + { + "path": "google-http-client-android/pom.xml" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/package-info.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/AndroidUtils.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonParser.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonGenerator.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactory.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/package-info.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/http/AndroidHttp.java" + }, + { + "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/http/package-info.java" + }, + { + "path": "google-http-client-test/pom.xml" + }, + { + "path": "google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java" + }, + { + "path": "google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java" + }, + { + "path": "google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java" + }, + { + "path": ".kokoro/build.bat" + }, + { + "path": ".kokoro/build.sh" + }, + { + "path": ".kokoro/dependencies.sh" + }, + { + "path": ".kokoro/common.cfg" + }, + { + "path": ".kokoro/trampoline.sh" + }, + { + "path": ".kokoro/coerce_logs.sh" + }, + { + "path": ".kokoro/linkage-monitor.sh" + }, + { + "path": ".kokoro/continuous/dependencies.cfg" + }, + { + "path": ".kokoro/continuous/samples.cfg" + }, + { + "path": ".kokoro/continuous/java7.cfg" + }, + { + "path": ".kokoro/continuous/java8-osx.cfg" + }, + { + "path": ".kokoro/continuous/java10.cfg" + }, + { + "path": ".kokoro/continuous/java8-win.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.sh" + }, + { + "path": ".kokoro/continuous/lint.cfg" + }, + { + "path": ".kokoro/continuous/java11.cfg" + }, + { + "path": ".kokoro/continuous/common.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.cfg" + }, + { + "path": ".kokoro/continuous/java8.cfg" + }, + { + "path": ".kokoro/continuous/integration.cfg" + }, + { + "path": ".kokoro/release/drop.sh" + }, + { + "path": ".kokoro/release/stage.cfg" + }, + { + "path": ".kokoro/release/promote.cfg" + }, + { + "path": ".kokoro/release/publish_javadoc.cfg" + }, + { + "path": ".kokoro/release/bump_snapshot.cfg" + }, + { + "path": ".kokoro/release/promote.sh" + }, + { + "path": ".kokoro/release/stage.sh" + }, + { + "path": ".kokoro/release/snapshot.sh" + }, + { + "path": ".kokoro/release/snapshot.cfg" + }, + { + "path": ".kokoro/release/common.cfg" + }, + { + "path": ".kokoro/release/bump_snapshot.sh" + }, + { + "path": ".kokoro/release/common.sh" + }, + { + "path": ".kokoro/release/drop.cfg" + }, + { + "path": ".kokoro/release/publish_javadoc.sh" + }, + { + "path": ".kokoro/presubmit/dependencies.cfg" + }, + { + "path": ".kokoro/presubmit/samples.cfg" + }, + { + "path": ".kokoro/presubmit/java7.cfg" + }, + { + "path": ".kokoro/presubmit/java8-osx.cfg" + }, + { + "path": ".kokoro/presubmit/linkage-monitor.cfg" + }, + { + "path": ".kokoro/presubmit/java10.cfg" + }, + { + "path": ".kokoro/presubmit/java8-win.cfg" + }, + { + "path": ".kokoro/presubmit/lint.cfg" + }, + { + "path": ".kokoro/presubmit/java11.cfg" + }, + { + "path": ".kokoro/presubmit/common.cfg" + }, + { + "path": ".kokoro/presubmit/clirr.cfg" + }, + { + "path": ".kokoro/presubmit/java8.cfg" + }, + { + "path": ".kokoro/presubmit/integration.cfg" + }, + { + "path": ".kokoro/nightly/dependencies.cfg" + }, + { + "path": ".kokoro/nightly/samples.cfg" + }, + { + "path": ".kokoro/nightly/java7.cfg" + }, + { + "path": ".kokoro/nightly/java8-osx.cfg" + }, + { + "path": ".kokoro/nightly/java8-win.cfg" + }, + { + "path": ".kokoro/nightly/lint.cfg" + }, + { + "path": ".kokoro/nightly/java11.cfg" + }, + { + "path": ".kokoro/nightly/common.cfg" + }, + { + "path": ".kokoro/nightly/java8.cfg" + }, + { + "path": ".kokoro/nightly/integration.cfg" + }, + { + "path": "google-http-client/pom.xml" + }, + { + "path": "google-http-client/src/test/resources/file.txt" + }, + { + "path": "google-http-client/src/test/resources/com/google/api/client/util/secret.pem" + }, + { + "path": "google-http-client/src/test/resources/com/google/api/client/util/secret.p12" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/json/GenericJsonTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpStatusCodesTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpBackOffIOExpcetionHandlerTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/ByteArrayContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/NanoClockTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/LoggingStreamingContentTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/DataTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/TypesTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/ObjectsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/ExponentialBackOffTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/BackOffTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/DateTimeTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/IOUtilsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/Base64Test.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/ClockTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/StringUtilsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/SecurityUtilsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/FieldInfoTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/PemReaderTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java" + }, + { + "path": "google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java" + }, + { + "path": "google-http-client/src/main/resources/google-http-client.properties" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonToken.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/Json.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/GenericJson.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/JsonString.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/javanet/MockHttpURLConnection.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/testing/util/LogRecordingHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/FileContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/ConsumingInputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/json/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Maps.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/NullValue.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/SslUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Lists.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/GenericData.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Types.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Collections2.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Key.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/BackOff.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Joiner.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Clock.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/DateTime.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/StringUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Beta.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ByteCountingOutputStream.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Data.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/DataMap.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Sleeper.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Value.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/NanoClock.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Throwables.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/IOUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Charsets.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Objects.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Base64.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Preconditions.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Strings.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/PemReader.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/Sets.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java" + }, + { + "path": "google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java" + }, + { + "path": ".github/CODEOWNERS" + }, + { + "path": ".github/.release-please.yml" + }, + { + "path": ".github/ISSUE_TEMPLATE.md" + }, + { + "path": ".github/release-please.yml" + }, + { + "path": ".github/PULL_REQUEST_TEMPLATE.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/bug_report.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/support_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/feature_request.md" + }, + { + "path": "__pycache__/synth.cpython-36.pyc" + }, + { + "path": "google-http-client-findbugs/pom.xml" + }, + { + "path": "google-http-client-findbugs/src/main/resources/messages.xml" + }, + { + "path": "google-http-client-findbugs/src/main/resources/bugrank.txt" + }, + { + "path": "google-http-client-findbugs/src/main/resources/findbugs.xml" + }, + { + "path": "google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java" + }, + { + "path": "google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/package-info.java" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/.project" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/.classpath" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/pom.xml" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/.settings/org.eclipse.jdt.core.prefs" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/.settings/org.eclipse.jdt.ui.prefs" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass2.java" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/Test.java" + }, + { + "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java" + }, + { + "path": ".git/index" + }, + { + "path": ".git/packed-refs" + }, + { + "path": ".git/HEAD" + }, + { + "path": ".git/config" + }, + { + "path": ".git/shallow" + }, + { + "path": ".git/objects/pack/pack-05aa278ffdf8a410aeb04cb592a33d2cb1daf479.idx" + }, + { + "path": ".git/objects/pack/pack-05aa278ffdf8a410aeb04cb592a33d2cb1daf479.pack" + }, + { + "path": ".git/refs/remotes/origin/HEAD" + }, + { + "path": ".git/refs/heads/autosynth" + }, + { + "path": ".git/refs/heads/master" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" + }, + { + "path": "google-http-client-apache-v2/pom.xml" + }, + { + "path": "google-http-client-apache-v2/src/test/java/com/google/api/client/http/apache/v2/ApacheHttpTransportTest.java" + }, + { + "path": "google-http-client-apache-v2/src/test/java/com/google/api/client/http/apache/v2/ApacheHttpRequestTest.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/HttpExtensionMethod.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ContentEntity.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpResponse.java" + }, + { + "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java" + }, + { + "path": "docs/index.md" + }, + { + "path": "docs/exponential-backoff.md" + }, + { + "path": "docs/_config.yml" + }, + { + "path": "docs/android.md" + }, + { + "path": "docs/component-modules.md" + }, + { + "path": "docs/google-app-engine.md" + }, + { + "path": "docs/support.md" + }, + { + "path": "docs/http-transport.md" + }, + { + "path": "docs/unit-testing.md" + }, + { + "path": "docs/json.md" + }, + { + "path": "docs/setup.md" + }, + { + "path": "docs/_layouts/default.html" + }, + { + "path": "docs/_data/navigation.yml" + }, + { + "path": "google-http-client-android-test/AndroidManifest.xml" + }, + { + "path": "google-http-client-android-test/pom.xml" + }, + { + "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java" + }, + { + "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java" + }, + { + "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java" + }, + { + "path": "google-http-client-bom/pom.xml" + }, + { + "path": "google-http-client-bom/README.md" + } ] } \ No newline at end of file From 686b000568b5580349b3567575bcbc19fd915343 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 10 Jan 2020 16:32:34 +0100 Subject: [PATCH 09/23] chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3 (#939) --- .../google-http-client-findbugs-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml index ecfef5908..820f9840c 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml +++ b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml @@ -19,7 +19,7 @@ maven-jar-plugin - 2.3.1 + 3.2.0 From 019b419ddc2d9feab24f22ba62b02c89624e8405 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 10 Jan 2020 11:46:44 -0500 Subject: [PATCH 10/23] chore(deps): 28.2-android (#938) @codyoss --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7cb05adc7..41c7d880c 100644 --- a/pom.xml +++ b/pom.xml @@ -556,7 +556,7 @@ 2.8.6 2.10.2 3.11.1 - 28.1-android + 28.2-android 1.1.4c 1.2 4.5.10 From fd904d26d67b06fac807d38f8fe4141891ef0330 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 00:23:02 +0100 Subject: [PATCH 11/23] deps: update dependency org.apache.httpcomponents:httpcore to v4.4.13 (#941) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41c7d880c..8437014b0 100644 --- a/pom.xml +++ b/pom.xml @@ -560,7 +560,7 @@ 1.1.4c 1.2 4.5.10 - 4.4.12 + 4.4.13 0.24.0 .. false From e76368ef9479a3bf06f7c7cb878d4e8e241bb58c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 01:43:25 +0100 Subject: [PATCH 12/23] deps: update dependency mysql:mysql-connector-java to v8.0.19 (#940) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8437014b0..27f3f9bab 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ mysql mysql-connector-java - 8.0.18 + 8.0.19 com.google.j2objc From dc78b713f330f8b7ff8865c2c525566ebf8b68ad Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 01:43:52 +0100 Subject: [PATCH 13/23] chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3 (#937) --- .../google-http-client-findbugs-test/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml index 820f9840c..1685b19e6 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml +++ b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml @@ -11,7 +11,7 @@ maven-compiler-plugin - 2.3.2 + 3.8.1 1.7 1.7 diff --git a/pom.xml b/pom.xml index 27f3f9bab..c67be42df 100644 --- a/pom.xml +++ b/pom.xml @@ -285,7 +285,7 @@ maven-compiler-plugin - 2.3.2 + 3.8.1 1.7 1.7 From 00ca9a6404bad510e99f5dab41a005254965abfc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 01:44:14 +0100 Subject: [PATCH 14/23] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m4 (#935) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c67be42df..f50a273df 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M4 -Xmx1024m sponge_log From 691ad32b199756b2c80e1ea2022b8d47de52386c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 01:44:26 +0100 Subject: [PATCH 15/23] chore(deps): update dependency org.apache.maven.plugins:maven-assembly-plugin to v3.2.0 (#932) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f50a273df..04b5a6c45 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ maven-assembly-plugin - 3.1.0 + 3.2.0 maven-compiler-plugin From 14736cab3dc060ea5b60522ea587cfaf66f29699 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 14 Jan 2020 11:16:20 -0500 Subject: [PATCH 16/23] deps: remove unnecessary MySQL dependency (#943) --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 04b5a6c45..14814e60a 100644 --- a/pom.xml +++ b/pom.xml @@ -231,11 +231,6 @@ mockito-all 1.10.19 - - mysql - mysql-connector-java - 8.0.19 - com.google.j2objc j2objc-annotations From f9942bfcbb9f4e9773404bdf16865518393fc9db Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Jan 2020 17:16:33 +0100 Subject: [PATCH 17/23] chore(deps): update dependency com.google.truth:truth to v1.0.1 (#944) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14814e60a..bb49fe682 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ com.google.truth truth - 1.0 + 1.0.1 test From 0c9251cfc79e0c8a1a54a324847f7040da2a3b8c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 21 Jan 2020 07:46:36 -0500 Subject: [PATCH 18/23] Update setup.md (#946) --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index a9b039293..3b29fdec2 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 3.3.0 + 3.4.0 pom import From f11b3af3077f7fc3e98b063f1d046ff01d4d8b4b Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 21 Jan 2020 10:49:56 -0500 Subject: [PATCH 19/23] Update apache httpclient (#948) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb49fe682..7b15b574d 100644 --- a/pom.xml +++ b/pom.xml @@ -554,7 +554,7 @@ 28.2-android 1.1.4c 1.2 - 4.5.10 + 4.5.11 4.4.13 0.24.0 .. From 9384459015b37e1671aebadc4b8c25dc9e1e033f Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 22 Jan 2020 15:25:27 -0500 Subject: [PATCH 20/23] fix: include '+' in SAFEPATHCHARS_URLENCODER (#955) --- .../com/google/api/client/util/escape/PercentEscaper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java index a4437095c..757d819a5 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java +++ b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java @@ -65,10 +65,10 @@ public class PercentEscaper extends UnicodeEscaper { public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;=+"; /** - * Contains the save characters plus all reserved characters. This happens to be the safe path - * characters plus those characters which are reserved for URI segments, namely '+', '/', and '?'. + * Contains the safe characters plus all reserved characters. This happens to be the safe path + * characters plus those characters which are reserved for URI segments, namely '/' and '?'. */ - public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER = SAFEPATHCHARS_URLENCODER + "+/?"; + public static final String SAFE_PLUS_RESERVED_CHARS_URLENCODER = SAFEPATHCHARS_URLENCODER + "/?"; /** * A string of characters that do not need to be encoded when used in URI user info part, as From 8e31198270a938eaa128828a760b7b555592842f Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 24 Jan 2020 13:27:37 -0500 Subject: [PATCH 21/23] test: add PercentEscaperTest (#957) --- .../api/client/util/escape/CharEscapers.java | 1 - .../util/escape/PercentEscaperTest.java | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java index b6172cc98..062e082d8 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java +++ b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java @@ -16,7 +16,6 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; /** diff --git a/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java b/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java new file mode 100644 index 000000000..0d08411a6 --- /dev/null +++ b/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package com.google.api.client.util.escape; + +import org.junit.Assert; +import org.junit.Test; + +public class PercentEscaperTest { + + @Test + public void testEscapeSpace() { + PercentEscaper escaper = + new PercentEscaper(PercentEscaper.SAFE_PLUS_RESERVED_CHARS_URLENCODER, false); + String actual = escaper.escape("Hello there"); + Assert.assertEquals("Hello%20there", actual); + } +} From 20ac5f6736f975b646cf3006f63112b195d0f32f Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sun, 26 Jan 2020 13:40:36 -0500 Subject: [PATCH 22/23] Prefer more spec compliant escaping (#959) --- .../client/util/escape/PercentEscaper.java | 55 +++++++++++++------ .../util/escape/PercentEscaperTest.java | 8 +++ 2 files changed, 46 insertions(+), 17 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java index 757d819a5..84f635cdc 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java +++ b/google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java @@ -16,7 +16,7 @@ /** * A {@code UnicodeEscaper} that escapes some set of Java characters using the URI percent encoding - * scheme. The set of safe characters (those which remain unescaped) can be specified on + * scheme. The set of safe characters (those which remain unescaped) is specified on * construction. * *

      For details on escaping URIs for use in web pages, see The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the * same. *

    • Any additionally specified safe characters remain the same. - *
    • If {@code plusForSpace} was specified, the space character " " is converted into a plus + *
    • If {@code plusForSpace} is true, the space character " " is converted into a plus * sign "+". - *
    • All other characters are converted into one or more bytes using UTF-8 encoding and each + *
    • All other characters are converted into one or more bytes using UTF-8 encoding. Each * byte is then represented by the 3-character string "%XY", where "XY" is the two-digit, * uppercase, hexadecimal representation of the byte value. *
    * - *

    RFC 2396 specifies the set of unreserved characters as "-", "_", ".", "!", "~", "*", "'", "(" - * and ")". It goes on to state: + *

    RFC 3986 defines the set of unreserved characters as "-", "_", "~", and "." + * It goes on to state: * - *

    Unreserved characters can be escaped without changing the semantics of the URI, but this - * should not be done unless the URI is being used in a context that does not allow the unescaped - * character to appear. - * - *

    For performance reasons the only currently supported character encoding of this class is - * UTF-8. + *

    URIs that differ in the replacement of an unreserved character with + its corresponding percent-encoded US-ASCII octet are equivalent: they + identify the same resource. However, URI comparison implementations + do not always perform normalization prior to comparison (see Section + 6). For consistency, percent-encoded octets in the ranges of ALPHA + (%41-%5A and %61-%7A), DIGIT (%30-%39), hyphen (%2D), period (%2E), + underscore (%5F), or tilde (%7E) should not be created by URI + producers and, when found in a URI, should be decoded to their + corresponding unreserved characters by URI normalizers. * *

    Note: This escaper produces uppercase hexadecimal sequences. From RFC 3986:
    + * href="https://tools.ietf.org/html/rfc3986">RFC 3986:
    * "URI producers and normalizers should use uppercase hexadecimal digits for all * percent-encodings." * @@ -100,21 +103,39 @@ public class PercentEscaper extends UnicodeEscaper { * escaped. */ private final boolean[] safeOctets; - + /** - * Constructs a URI escaper with the specified safe characters and optional handling of the space - * character. + * Constructs a URI escaper with the specified safe characters. The space + * character is escaped to %20 in accordance with the URI specification. * * @param safeChars a non null string specifying additional safe characters for this escaper (the * ranges 0..9, a..z and A..Z are always safe and should not be specified here) + * @throws IllegalArgumentException if any of the parameters are invalid + */ + public PercentEscaper(String safeChars) { + this(safeChars, false); + } + + /** + * Constructs a URI escaper that converts all but the specified safe characters + * into hexadecimal percent escapes. Optionally space characters can be converted into + * a plus sign {@code +} instead of {@code %20}. and optional handling of the space + * + * @param safeChars a non null string specifying additional safe characters for this escaper. The + * ranges 0..9, a..z and A..Z are always safe and should not be specified here. * @param plusForSpace true if ASCII space should be escaped to {@code +} rather than {@code %20} - * @throws IllegalArgumentException if any of the parameters were invalid + * @throws IllegalArgumentException if safeChars includes characters that are always safe or + * characters that must always be escaped + * @deprecated use {@code PercentEscaper(String safeChars)} instead which is the same as invoking + * this method with plusForSpace set to false. Escaping spaces as plus signs does not + * conform to the URI specification. */ + @Deprecated public PercentEscaper(String safeChars, boolean plusForSpace) { // Avoid any misunderstandings about the behavior of this escaper if (safeChars.matches(".*[0-9A-Za-z].*")) { throw new IllegalArgumentException( - "Alphanumeric characters are always 'safe' and should not be " + "explicitly specified"); + "Alphanumeric ASCII characters are always 'safe' and should not be " + "escaped."); } // Avoid ambiguous parameters. Safe characters are never modified so if // space is a safe character then setting plusForSpace is meaningless. diff --git a/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java b/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java index 0d08411a6..6b3e75085 100644 --- a/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java +++ b/google-http-client/src/test/java/com/google/api/client/util/escape/PercentEscaperTest.java @@ -26,4 +26,12 @@ public void testEscapeSpace() { String actual = escaper.escape("Hello there"); Assert.assertEquals("Hello%20there", actual); } + + @Test + public void testEscapeSpaceDefault() { + PercentEscaper escaper = + new PercentEscaper(PercentEscaper.SAFE_PLUS_RESERVED_CHARS_URLENCODER); + String actual = escaper.escape("Hello there"); + Assert.assertEquals("Hello%20there", actual); + } } From 879d81aad37554d7a2497ad3f7950543acea8dc8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 27 Jan 2020 12:41:21 -0800 Subject: [PATCH 23/23] chore: release 1.34.1 (#958) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated google-http-client-android-test/pom.xml [ci skip] * updated google-http-client-android/pom.xml [ci skip] * updated google-http-client-apache-v2/pom.xml [ci skip] * updated google-http-client-appengine/pom.xml [ci skip] * updated google-http-client-assembly/pom.xml [ci skip] * updated google-http-client-bom/pom.xml [ci skip] * updated google-http-client-findbugs/pom.xml [ci skip] * updated google-http-client-gson/pom.xml [ci skip] * updated google-http-client-jackson2/pom.xml [ci skip] * updated google-http-client-protobuf/pom.xml [ci skip] * updated google-http-client-test/pom.xml [ci skip] * updated google-http-client-xml/pom.xml [ci skip] * updated google-http-client/pom.xml [ci skip] * updated samples/dailymotion-simple-cmdline-sample/pom.xml [ci skip] * updated google-http-client-findbugs/google-http-client-findbugs-test/pom.xml [ci skip] * updated pom.xml [ci skip] --- CHANGELOG.md | 21 ++++++++++++++ google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 17 files changed, 74 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b8f96d27..876eacf23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +### [1.34.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.34.0...v1.34.1) (2020-01-26) + + +### Bug Fixes + +* include '+' in SAFEPATHCHARS_URLENCODER ([#955](https://www.github.com/googleapis/google-http-java-client/issues/955)) ([9384459](https://www.github.com/googleapis/google-http-java-client/commit/9384459015b37e1671aebadc4b8c25dc9e1e033f)) +* use random UUID for multipart boundary delimiter ([#916](https://www.github.com/googleapis/google-http-java-client/issues/916)) ([91c20a3](https://www.github.com/googleapis/google-http-java-client/commit/91c20a3dfb654e85104b1c09a0b2befbae356c19)) + + +### Dependencies + +* remove unnecessary MySQL dependency ([#943](https://www.github.com/googleapis/google-http-java-client/issues/943)) ([14736ca](https://www.github.com/googleapis/google-http-java-client/commit/14736cab3dc060ea5b60522ea587cfaf66f29699)) +* update dependency mysql:mysql-connector-java to v8.0.19 ([#940](https://www.github.com/googleapis/google-http-java-client/issues/940)) ([e76368e](https://www.github.com/googleapis/google-http-java-client/commit/e76368ef9479a3bf06f7c7cb878d4e8e241bb58c)) +* update dependency org.apache.httpcomponents:httpcore to v4.4.13 ([#941](https://www.github.com/googleapis/google-http-java-client/issues/941)) ([fd904d2](https://www.github.com/googleapis/google-http-java-client/commit/fd904d26d67b06fac807d38f8fe4141891ef0330)) + + +### Documentation + +* fix various paragraph issues in javadoc ([#867](https://www.github.com/googleapis/google-http-java-client/issues/867)) ([029bbbf](https://www.github.com/googleapis/google-http-java-client/commit/029bbbfb5ddfefe64e64ecca4b1413ae1c93ddd8)) +* libraries-bom 3.3.0 ([#921](https://www.github.com/googleapis/google-http-java-client/issues/921)) ([7e0b952](https://www.github.com/googleapis/google-http-java-client/commit/7e0b952a0d9c84ac43dff43914567c98f3e81f66)) + ## [1.34.0](https://www.github.com/googleapis/google-http-java-client/compare/v1.33.0...v1.34.0) (2019-12-17) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 37bdde14e..54dbbb7cb 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.34.1-SNAPSHOT + 1.34.1 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.34.1-SNAPSHOT + 1.34.1 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.34.1-SNAPSHOT + 1.34.1 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 3fddf9b74..6590ccedc 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-android - 1.34.1-SNAPSHOT + 1.34.1 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index eab639963..3a039269a 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-apache-v2 - 1.34.1-SNAPSHOT + 1.34.1 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 516262727..73dcb3be4 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-appengine - 1.34.1-SNAPSHOT + 1.34.1 Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index 8dd0401ec..760b8489f 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml com.google.http-client google-http-client-assembly - 1.34.1-SNAPSHOT + 1.34.1 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 712a4eb64..3189b3fd0 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.34.1-SNAPSHOT + 1.34.1 pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-android - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-apache-v2 - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-appengine - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-findbugs - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-gson - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-jackson2 - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-protobuf - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-test - 1.34.1-SNAPSHOT + 1.34.1 com.google.http-client google-http-client-xml - 1.34.1-SNAPSHOT + 1.34.1 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index e6e433ad6..8a47d151e 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-findbugs - 1.34.1-SNAPSHOT + 1.34.1 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 9bc78ddf3..03adfd898 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-gson - 1.34.1-SNAPSHOT + 1.34.1 GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index cfe69649b..29b26efc3 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-jackson2 - 1.34.1-SNAPSHOT + 1.34.1 Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 465d4c27c..a5079f435 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-protobuf - 1.34.1-SNAPSHOT + 1.34.1 Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index d11c2ae29..4a756e0c7 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-test - 1.34.1-SNAPSHOT + 1.34.1 Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 0c46baef9..462f8a61b 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client-xml - 1.34.1-SNAPSHOT + 1.34.1 XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 3d43747a8..c79a16661 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../pom.xml google-http-client - 1.34.1-SNAPSHOT + 1.34.1 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index 7b15b574d..aae5f7d58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -544,7 +544,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.34.1-SNAPSHOT + 1.34.1 1.9.71 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index a30dfc329..f5c1c9e81 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.34.1-SNAPSHOT + 1.34.1 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 250b4fa9f..4d2439e82 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.34.0:1.34.1-SNAPSHOT -google-http-client-bom:1.34.0:1.34.1-SNAPSHOT -google-http-client-parent:1.34.0:1.34.1-SNAPSHOT -google-http-client-android:1.34.0:1.34.1-SNAPSHOT -google-http-client-android-test:1.34.0:1.34.1-SNAPSHOT -google-http-client-apache-v2:1.34.0:1.34.1-SNAPSHOT -google-http-client-appengine:1.34.0:1.34.1-SNAPSHOT -google-http-client-assembly:1.34.0:1.34.1-SNAPSHOT -google-http-client-findbugs:1.34.0:1.34.1-SNAPSHOT -google-http-client-gson:1.34.0:1.34.1-SNAPSHOT -google-http-client-jackson2:1.34.0:1.34.1-SNAPSHOT -google-http-client-protobuf:1.34.0:1.34.1-SNAPSHOT -google-http-client-test:1.34.0:1.34.1-SNAPSHOT -google-http-client-xml:1.34.0:1.34.1-SNAPSHOT +google-http-client:1.34.1:1.34.1 +google-http-client-bom:1.34.1:1.34.1 +google-http-client-parent:1.34.1:1.34.1 +google-http-client-android:1.34.1:1.34.1 +google-http-client-android-test:1.34.1:1.34.1 +google-http-client-apache-v2:1.34.1:1.34.1 +google-http-client-appengine:1.34.1:1.34.1 +google-http-client-assembly:1.34.1:1.34.1 +google-http-client-findbugs:1.34.1:1.34.1 +google-http-client-gson:1.34.1:1.34.1 +google-http-client-jackson2:1.34.1:1.34.1 +google-http-client-protobuf:1.34.1:1.34.1 +google-http-client-test:1.34.1:1.34.1 +google-http-client-xml:1.34.1:1.34.1