Skip to content

chore(deps): update project.http.version to v1.36.0 #1505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

chore(deps): update project.http.version to v1.36.0 #1505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6eb2be2
fix: include request URL into GoogleJsonResponseException message
medb Mar 9, 2020
c46ae01
fix: make implementation more readable
medb Mar 9, 2020
8289ed1
fix: improve tests readability
medb Mar 9, 2020
327a5e8
Make exception message platform independent
medb Mar 13, 2020
35a3379
Upgrade to HTTP client that logs exception message
medb Mar 16, 2020
b22d1e2
Delete exception message code
medb Mar 16, 2020
f4ba31b
Update google-http-java-client
medb May 3, 2020
13ed03a
Merge branch 'master' into master
medb Jul 1, 2020
9f4fde2
Update pom.xml
medb Jul 1, 2020
4c116ec
Merge branch 'master' into master
medb Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: include request URL into GoogleJsonResponseException message
  • Loading branch information
@medb
medb committed Mar 16, 2020
commit 6eb2be2cb83e4e292ebaf192c44940d14b563745
3 changes: 3 additions & 0 deletions ...ient/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ public static GoogleJsonResponseException from(JsonFactory jsonFactory, HttpResp
}
// message
StringBuilder message = HttpResponseException.computeMessageBuffer(response);
(message.length() == 0 ? message : message.append(StringUtils.LINE_SEPARATOR))
.append("Request URL: ")
.append(response.getRequest().getUrl());
if (!com.google.api.client.util.Strings.isNullOrEmpty(detailString)) {
message.append(StringUtils.LINE_SEPARATOR).append(detailString);
builder.setContent(detailString);
Expand Down
33 changes: 25 additions & 8 deletions .../src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.api.client.googleapis.json;

import com.google.api.client.googleapis.json.GoogleJsonErrorTest.ErrorTransport;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpTransport;
Expand Down Expand Up @@ -42,7 +43,7 @@ public void testFrom_noDetails() throws Exception {
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("200", ge.getMessage());
assertEquals("200" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

public void testFrom_withDetails() throws Exception {
Expand All @@ -55,7 +56,13 @@ public void testFrom_withDetails() throws Exception {
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertEquals(GoogleJsonErrorTest.ERROR, GoogleJsonErrorTest.FACTORY.toString(ge.getDetails()));
assertTrue(
ge.getMessage(), ge.getMessage().startsWith("403" + StringUtils.LINE_SEPARATOR + "{"));
ge.getMessage(),
ge.getMessage()
.startsWith(
"403"
+ getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL)
+ StringUtils.LINE_SEPARATOR
+ "{"));
}

public void testFrom_detailsMissingContent() throws Exception {
Expand All @@ -67,7 +74,7 @@ public void testFrom_detailsMissingContent() throws Exception {
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("403", ge.getMessage());
assertEquals("403" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

public void testFrom_detailsArbitraryJsonContent() throws Exception {
Expand All @@ -79,7 +86,7 @@ public void testFrom_detailsArbitraryJsonContent() throws Exception {
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("403", ge.getMessage());
assertEquals("403" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

public void testFrom_detailsArbitraryXmlContent() throws Exception {
Expand All @@ -92,7 +99,13 @@ public void testFrom_detailsArbitraryXmlContent() throws Exception {
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertTrue(
ge.getMessage(), ge.getMessage().startsWith("403" + StringUtils.LINE_SEPARATOR + "<"));
ge.getMessage(),
ge.getMessage()
.startsWith(
"403"
+ getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL)
+ StringUtils.LINE_SEPARATOR
+ "<"));
}

public void testFrom_errorNoContentButWithJsonContentType() throws Exception {
Expand All @@ -104,7 +117,7 @@ public void testFrom_errorNoContentButWithJsonContentType() throws Exception {
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("403", ge.getMessage());
assertEquals("403" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

public void testFrom_errorEmptyContentButWithJsonContentType() throws Exception {
Expand All @@ -116,7 +129,7 @@ public void testFrom_errorEmptyContentButWithJsonContentType() throws Exception
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("403", ge.getMessage());
assertEquals("403" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

public void testFrom_detailsErrorObject() throws Exception {
Expand Down Expand Up @@ -154,6 +167,10 @@ public void testFrom_detailsNoErrorField() throws Exception {
GoogleJsonResponseException ge =
GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
assertNull(ge.getDetails());
assertEquals("403", ge.getMessage());
assertEquals("403" + getRequestUrlMessage(HttpTesting.SIMPLE_GENERIC_URL), ge.getMessage());
}

private static String getRequestUrlMessage(GenericUrl requestUrl) {
return StringUtils.LINE_SEPARATOR + "Request URL: " + requestUrl;
}
}