Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(3397)

Issue 5844050: [Issue 75] Solve commons-codec conflict on Android (Closed)

Can't Edit
Can't Publish+Mail
Start Review
Created:
12 years, 1 month ago by yanivi
Modified:
12 years, 1 month ago
Reviewers:
aiuto, rmistry
Base URL:
https://google-http-java-client.googlecode.com/hg/
Visibility:
Public.

Description

Android runtime includes Apache Commons Codec version 1.3, but we need features from version 1.6. When methods from 1.6 are invoked that are not available in 1.3, you get NoSuchMethodError's at runtime. To avoid the conflict on Android, we use jarjar to include private of Apache Commons Codec. We now provide a proxy classes com.google.api.client.util.Base64 and StringUtils to invoke the private version of Base64 and StringUtils from commons-codec version 1.6.

Patch Set 1 #

Total comments: 4

Patch Set 2 : Base64Codec #

Patch Set 3 : add a comment #

Patch Set 4 : revert GenericUrlTest #

Total comments: 2

Patch Set 5 : comments #

Patch Set 6 : comments #

Unified diffs Side-by-side diffs Delta from patch set Stats (+268 lines, -942 lines) Patch
M google-http-client/pom.xml View 1 2 3 chunks +31 lines, -0 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java View 1 2 3 4 5 2 chunks +3 lines, -4 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java View 1 2 3 4 5 1 chunk +2 lines, -3 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java View 1 2 3 4 5 9 chunks +25 lines, -18 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java View 1 2 3 4 5 4 chunks +4 lines, -6 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/http/LogContent.java View 1 2 3 4 5 1 chunk +1 line, -2 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java View 1 2 3 4 5 1 chunk +1 line, -2 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/testing/json/AbstractJsonFactoryTest.java View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M google-http-client/src/main/java/com/google/api/client/util/Base64.java View 1 2 3 4 2 chunks +83 lines, -834 lines 0 comments Download
A google-http-client/src/main/java/com/google/api/client/util/StringUtils.java View 1 2 3 4 5 1 chunk +78 lines, -0 lines 0 comments Download
M google-http-client/src/main/java/com/google/api/client/util/Strings.java View 1 2 3 4 5 1 chunk +8 lines, -45 lines 0 comments Download
M google-http-client/src/test/java/com/google/api/client/http/ByteArrayContentTest.java View 1 2 3 4 5 1 chunk +2 lines, -1 line 0 comments Download
M google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M google-http-client/src/test/java/com/google/api/client/http/MultipartRelatedContentTest.java View 1 2 3 4 5 1 chunk +1 line, -1 line 0 comments Download
M google-http-client/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java View 1 2 3 4 5 2 chunks +7 lines, -7 lines 0 comments Download
M google-http-client/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java View 1 2 3 4 5 2 chunks +6 lines, -6 lines 0 comments Download
M google-http-client/src/test/java/com/google/api/client/util/StringUtilsTest.java View 1 2 3 4 5 1 chunk +6 lines, -8 lines 0 comments Download
M pom.xml View 1 chunk +5 lines, -0 lines 0 comments Download

Messages

Total messages: 7
yanivi
12 years, 1 month ago (2012-03-16 21:12:36 UTC) #1
aiuto
do you need this for appengine too? We should only include the repacked when we ...
12 years, 1 month ago (2012-03-19 02:28:28 UTC) #2
yanivi
http://codereview.appspot.com/5844050/diff/1/google-http-client-android2/pom.xml File google-http-client-android2/pom.xml (right): http://codereview.appspot.com/5844050/diff/1/google-http-client-android2/pom.xml#newcode52 google-http-client-android2/pom.xml:52: <pattern>org.apache.commons.codec.**</pattern> On 2012/03/19 02:28:28, aiuto wrote: > This seems ...
12 years, 1 month ago (2012-03-20 15:01:04 UTC) #3
aiuto
http://codereview.appspot.com/5844050/diff/13/google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java File google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java (right): http://codereview.appspot.com/5844050/diff/13/google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java#newcode32 google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java:32: public class Base64Codec { Could this have been named ...
12 years, 1 month ago (2012-03-20 16:15:15 UTC) #4
yanivi
http://codereview.appspot.com/5844050/diff/13/google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java File google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java (right): http://codereview.appspot.com/5844050/diff/13/google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java#newcode32 google-http-client/src/main/java/com/google/api/client/util/Base64Codec.java:32: public class Base64Codec { On 2012/03/20 16:15:15, aiuto wrote: ...
12 years, 1 month ago (2012-03-20 16:53:36 UTC) #5
aiuto
lgtm
12 years, 1 month ago (2012-03-20 18:17:06 UTC) #6
yanivi
12 years, 1 month ago (2012-03-20 18:57:02 UTC) #7
On 2012/03/20 18:17:06, aiuto wrote:
> lgtm

Thanks for the feedback Tony!  I will submit this as soon as the other two
interdependent changesets are lgtm'ed:
http://codereview.appspot.com/5846074/
http://codereview.appspot.com/5848069/
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b