Skip to content

Commit 8a777b2

Browse files
author
Yaniv Inbar
committed
http issue 231: Remove Beta API deprecated in 1.15 [backwards incompatible]
https://code.google.com/p/google-http-java-client/issues/detail?id=231 https://codereview.appspot.com/9685050/
1 parent b6b7aef commit 8a777b2

File tree

14 files changed

+19
-405
lines changed

14 files changed

+19
-405
lines changed

clirr-ignored-differences.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- see http://mojo.codehaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3-
43
<differences>
4+
<!-- 7002 (method removed): className, method -->
5+
<difference>
6+
<differenceType>7002</differenceType>
7+
<className>com/google/api/client/http/protobuf/ProtoHttpContent</className>
8+
<method>com.google.api.client.http.protobuf.ProtoHttpContent setType(java.lang.String)</method>
9+
</difference>
510
<!-- 8001 (Class removed): className -->
11+
<difference>
12+
<differenceType>8001</differenceType>
13+
<className>com/google/api/client/testing/http/json/*</className>
14+
</difference>
615
<difference>
716
<differenceType>8001</differenceType>
817
<className>com/google/api/client/repackaged/**</className>

google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
package com.google.api.client.extensions.appengine.http;
1616

1717
import com.google.api.client.http.HttpMethods;
18-
import com.google.api.client.http.HttpResponse;
1918
import com.google.api.client.http.HttpTransport;
2019
import com.google.api.client.util.Preconditions;
2120
import com.google.appengine.api.urlfetch.FetchOptions;
2221
import com.google.appengine.api.urlfetch.HTTPMethod;
23-
import com.google.appengine.api.urlfetch.HTTPResponse;
2422

2523
import java.io.IOException;
2624
import java.net.HttpURLConnection;
@@ -46,13 +44,6 @@
4644
* is the recommended transport to use on App Engine.
4745
* </p>
4846
*
49-
* <p>
50-
* Upgrade warning: in prior version 1.14 duplicate response headers in
51-
* {@link HttpResponse#getHeaders()} were combined into a single string value using
52-
* {@link HTTPResponse#getHeaders()} but starting in version 1.15 such headers are now "uncombined"
53-
* into a list of strings using {@link HTTPResponse#getHeadersUncombined()}.
54-
* </p>
55-
*
5647
* @since 1.10
5748
* @author Yaniv Inbar
5849
*/

google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
* </p>
3434
*
3535
* <pre>
36-
* <code>
3736
static HttpRequest buildPostRequest(
3837
HttpRequestFactory requestFactory, GenericUrl url, MessageLite message) throws IOException {
3938
return requestFactory.buildPostRequest(url, new ProtoHttpContent(message));
4039
}
41-
* </code>
4240
* </pre>
4341
*
4442
* <p>
@@ -72,19 +70,6 @@ public void writeTo(OutputStream out) throws IOException {
7270
out.flush();
7371
}
7472

75-
/**
76-
* Sets the content type or {@code null} for none.
77-
*
78-
* <p>
79-
* Default value is {@link ProtocolBuffers#CONTENT_TYPE}.
80-
* </p>
81-
* @deprecated (scheduled to be removed in 1.16) Use {@link #setMediaType(HttpMediaType)} instead.
82-
*/
83-
@Deprecated
84-
public ProtoHttpContent setType(String type) {
85-
return setMediaType(type == null ? null : new HttpMediaType(type));
86-
}
87-
8873
/** Returns the message to serialize. */
8974
public final MessageLite getMessage() {
9075
return message;

google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*
2525
* @since 1.7
2626
* @author Ravi Mistry
27-
* @deprecated (scheduled to be removed in the 1.16). Use
28-
* {@link HttpBackOffUnsuccessfulResponseHandler} instead.
27+
* @deprecated (scheduled to be removed in 1.17) Use {@link HttpBackOffUnsuccessfulResponseHandler}
28+
* instead.
2929
*/
3030
@Deprecated
3131
@Beta

google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,8 @@
7575
*
7676
* @since 1.7
7777
* @author Ravi Mistry
78-
* @deprecated (scheduled to be removed in the 1.16). Use
79-
* {@link HttpBackOffUnsuccessfulResponseHandler} with {@link ExponentialBackOff}
80-
* instead.
78+
* @deprecated (scheduled to be removed in 1.17). Use {@link HttpBackOffUnsuccessfulResponseHandler}
79+
* with {@link ExponentialBackOff} instead.
8180
*/
8281
@Beta
8382
@Deprecated

google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
* </p>
5151
*
5252
* <p>
53-
* Upgrade warning: in prior version 1.14 the user info part in the URL was dropped, but starting
54-
* with version 1.15 this URL class contains the user info, and it can be retrieved or set with
55-
* {@link #getUserInfo} and {@link #setUserInfo}.
56-
* </p>
57-
*
58-
* <p>
5953
* Implementation is not thread-safe.
6054
* </p>
6155
*

google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ public HttpRequest setEncoding(HttpEncoding encoding) {
300300
* Returns the {@link BackOffPolicy} to use between retry attempts or {@code null} for none.
301301
*
302302
* @since 1.7
303-
* @deprecated (scheduled to be removed in the 1.16).
303+
* @deprecated (scheduled to be removed in 1.17).
304304
* {@link #setUnsuccessfulResponseHandler(HttpUnsuccessfulResponseHandler)} with a new
305305
* {@link HttpBackOffUnsuccessfulResponseHandler} instead.
306306
*/
@@ -315,7 +315,7 @@ public BackOffPolicy getBackOffPolicy() {
315315
* Sets the {@link BackOffPolicy} to use between retry attempts or {@code null} for none.
316316
*
317317
* @since 1.7
318-
* @deprecated (scheduled to be removed in the 1.16). Use
318+
* @deprecated (scheduled to be removed in 1.17). Use
319319
* {@link #setUnsuccessfulResponseHandler(HttpUnsuccessfulResponseHandler)} with a new
320320
* {@link HttpBackOffUnsuccessfulResponseHandler} instead.
321321
*/
@@ -735,7 +735,7 @@ public HttpRequest setThrowExceptionOnExecuteError(boolean throwExceptionOnExecu
735735
* {@link LowLevelHttpRequest#execute()}.
736736
*
737737
* @since 1.9
738-
* @deprecated (scheduled to be removed in 1.16) Use
738+
* @deprecated (scheduled to be removed in 1.17) Use
739739
* {@link #setIOExceptionHandler(HttpIOExceptionHandler)} instead.
740740
*/
741741
@Deprecated
@@ -754,7 +754,7 @@ public boolean getRetryOnExecuteIOException() {
754754
* </p>
755755
*
756756
* @since 1.9
757-
* @deprecated (scheduled to be removed in 1.16) Use
757+
* @deprecated (scheduled to be removed in 1.17) Use
758758
* {@link #setIOExceptionHandler(HttpIOExceptionHandler)} instead.
759759
*/
760760
@Deprecated

google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,7 @@ public abstract class LowLevelHttpResponse {
5454
/** Returns the response status line or {@code null} for none. */
5555
public abstract String getStatusLine() throws IOException;
5656

57-
/**
58-
* Returns the response status code or {@code <=0} for none.
59-
*
60-
* <p>
61-
* Upgrade warning: in prior version 1.14 it could not return a negative number, but starting with
62-
* version 1.15 it may.
63-
* </p>
64-
*/
57+
/** Returns the response status code or {@code <=0} for none. */
6558
public abstract int getStatusCode() throws IOException;
6659

6760
/** Returns the HTTP reason phrase or {@code null} for none. */

google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@
5353
* </p>
5454
*
5555
* <p>
56-
* Upgrade warning: in prior version 1.14 caching was always disabled, but starting with version
57-
* 1.15 we honor the default global caching behavior.
58-
* </p>
59-
*
60-
* <p>
6156
* Implementation is thread-safe. For maximum efficiency, applications should use a single
6257
* globally-shared instance of the HTTP transport.
6358
* </p>

google-http-client/src/main/java/com/google/api/client/testing/http/json/MockJsonFactory.java

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)