8000 http: "the future" -> "1.14" or "1.15" · robccan/google-http-java-client@bc0f7a3 · GitHub
[go: up one dir, main page]
Skip to content

Commit bc0f7a3

Browse files
author
Yaniv Inbar
committed
http: "the future" -> "1.14" or "1.15"
https://codereview.appspot.com/7336048/
1 parent 81e46f6 commit bc0f7a3

21 files changed

+41
-48
lines changed

‎google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public final boolean getCloseInputStream() {
101101
* should override by calling super.
102102
*
103103
* @since 1.5
104-
* @deprecated (scheduled to be removed in the future) Use {@link HttpEncoding} instead.
104+
* @deprecated (scheduled to be removed in 1.15) Use {@link HttpEncoding} instead.
105105
*/
106106
@Deprecated
107107
public AbstractInputStreamContent setEncoding(String encoding) {
@@ -156,7 +156,7 @@ static void downloadMedia(HttpResponse response, File file)
156156
*
157157
* @param inputStream source input stream
158158
* @param outputStream destination output stream
159-
* @deprecated (scheduled to be removed in the future) Use
159+
* @deprecated (scheduled to be removed in 1.15) Use
160160
* {@link IOUtils#copy(InputStream, OutputStream)} instead
161161
*/
162162
@Deprecated
@@ -188,7 +188,7 @@ static void downloadMedia(HttpResponse response, File file)
188188
* @param outputStream destination output stream
189189
* @param closeInputStream whether the input stream should be closed at the end of this method
190190
* @since 1.7
191-
* @deprecated (scheduled to be removed in the future) Use
191+
* @deprecated (scheduled to be removed in 1.15) Use
192192
* {@link IOUtils#copy(InputStream, OutputStream, boolean)} instead
193193
*/
194194
@Deprecated

‎google-http-client/src/main/java/com/google/api/client/http/HttpContent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public interface HttpContent extends StreamingContent {
3737
/**
3838
* Returns the content encoding (for example {@code "gzip"}) or {@code null} for none.
3939
*
40-
* @deprecated (scheduled to be removed in the future) Use {@link HttpEncoding} instead
40+
* @deprecated (scheduled to be removed in 1.15) Use {@link HttpEncoding} instead
4141
*/
4242
@Deprecated
4343
String getEncoding();

‎google-http-client/src/main/java/com/google/api/client/http/HttpMethod.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*
2020
* @since 1.3
2121
* @author Yaniv Inbar
22-
* @deprecated (scheduled to be removed in the future) Use {@link HttpMethods} instead.
23-
* The purpose of this deprecation is to allow any arbitrary HTTP method to be used,
24-
* rather than restrict it to a small set of HTTP methods.
22+
* @deprecated (scheduled to be removed in 1.14) Use {@link HttpMethods} instead. The purpose of
23+
* this deprecation is to allow any arbitrary HTTP method to be used, rather than
24+
* restrict it to a small set of HTTP methods.
2525
*/
2626
@Deprecated
2727
public enum HttpMethod {

‎google-http-client/src/main/java/com/google/api/client/http/HttpParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @since 1.0
2929
* @author Yaniv Inbar
30-
* @deprecated (scheduled to be removed in the future) Use {@link ObjectParser} instead.
30+
* @deprecated (scheduled to be removed in 1.14) Use {@link ObjectParser} instead.
3131
*/
3232
@Deprecated
3333
public interface HttpParser {

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public HttpTransport getTransport() {
225225
* values in {@link HttpMethod}.
226226
*
227227
* @since 1.5
228-
* @deprecated (scheduled to be removed in the future) Use {@link #getRequestMethod()} instead
228+
* @deprecated (scheduled to be removed in 1.14) Use {@link #getRequestMethod()} instead
229229
*/
230230
@Deprecated
231231
public HttpMethod getMethod() {
@@ -236,7 +236,7 @@ public HttpMethod getMethod() {
236236
* Sets the HTTP request method.
237237
*
238238
* @since 1.5
239-
* @deprecated (scheduled to be removed in the future) Use {@link #setRequestMethod} instead
239+
* @deprecated (scheduled to be removed in 1.14) Use {@link #setRequestMethod} instead
240240
*/
241241
@Deprecated
242242
public HttpRequest setMethod(HttpMethod method) {
@@ -344,7 +344,7 @@ public HttpRequest setEncoding(HttpEncoding encoding) {
344344
* Returns whether to enable gzip compression of HTTP content.
345345
*
346346
* @since 1.5
347-
* @deprecated (scheduled to be removed in the future) Use {@link #getEncoding()} instead.
347+
* @deprecated (scheduled to be removed in 1.15) Use {@link #getEncoding()} instead.
348348
*/
349349
@Deprecated
350350
public boolean getEnableGZipContent() {
@@ -379,7 +379,7 @@ public void intercept(HttpRequest request) throws IOException {
379379
* </p>
380380
*
381381
* @since 1.5
382-
* @deprecated (scheduled to be removed in the future) Use {@link #setEncoding(HttpEncoding)} with
382+
* @deprecated (scheduled to be removed in 1.15) Use {@link #setEncoding(HttpEncoding)} with
383383
* {@link GZipEncoding} instead.
384384
*/
385385
@Deprecated
@@ -724,8 +724,7 @@ public HttpRequest setNumberOfRetries(int numRetries) {
724724
* </p>
725725
*
726726
* @since 1.4
727-
* @deprecated (scheduled to be removed in the future) Use {@link #setParser(ObjectParser)}
728-
* instead.
727+
* @deprecated (scheduled to be removed in 1.14) Use {@link #setParser(ObjectParser)} instead.
729728
*/
730729
@Deprecated
731730
public void addParser(HttpParser parser) {
@@ -755,7 +754,7 @@ public HttpRequest setParser(ObjectParser parser) {
755754
* @param contentType content type or {@code null} for {@code null} result
756755
* @return HTTP response content parser or {@code null} for {@code null} input
757756
* @since 1.4
758-
* @deprecated (scheduled to be removed in the future) Use {@link #getParser()} instead.
757+
* @deprecated (scheduled to be removed in 1.14) Use {@link #getParser()} instead.
759758
*/
760759
@Deprecated
761760
public final HttpParser getParser(String contentType) {
@@ -1268,7 +1267,7 @@ private void sleep(long millis) {
12681267
* {@code null} result
12691268
* @return normalized media type without parameters or {@code null} for {@code null} input
12701269
* @since 1.4
1271-
* @deprecated (scheduled to be removed in the future) Use
1270+
* @deprecated (scheduled to be removed in 1.14) Use
12721271
* {@link HttpMediaType#equalsIgnoreParameters(HttpMediaType)} instead
12731272
*/
12741273
@Deprecated

‎google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public HttpRequestInitializer getInitializer() {
8484
* @param url HTTP request URL or {@code null} for none
8585
* @param content HTTP request content or {@code null} for none
8686
* @return new HTTP request
87-
* @deprecated (scheduled to be removed in the future) Use
87+
* @deprecated (scheduled to be removed in 1.14) Use
8888
* {@link #buildRequest(String, GenericUrl, HttpContent)} instead
8989
*/
9090
@Deprecated

‎google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public void disconnect() throws IOException {
455455
* Returns the HTTP response content parser to use for the content type of this HTTP response or
456456
* {@code null} for none.
457457
*
458-
* @deprecated (scheduled to be removed in the future) Use {@link #getRequest()}.
458+
* @deprecated (scheduled to be removed in 1.14) Use {@link #getRequest()}.
459459
* {@link HttpRequest#getParser()} instead
460460
*/
461461
@Deprecated

‎google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public HttpResponseException(HttpResponse response) {
8787
* @param response HTTP response
8888
* @param message detail message to use or {@code null} for none
8989
* @since 1.6
90-
* @deprecated (scheduled to be removed in the future) Use {@link #HttpResponseException(Builder)}
90+
* @deprecated (scheduled to be removed in 1.15) Use {@link #HttpResponseException(Builder)}
9191
* instead
9292
*/
9393
@Deprecated

‎google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ HttpRequest buildRequest() {
134134
* </p>
135135
*
136136
* @since 1.3
137-
* @deprecated (scheduled to be removed in the future) Use {@link #supportsMethod(String)} instead
137+
* @deprecated (scheduled to be removed in 1.14) Use {@link #supportsMethod(String)} instead
138138
*/
139139
@Deprecated
140140
public boolean supportsHead() throws IOException {
@@ -154,7 +154,7 @@ public boolean supportsHead() throws IOException {
154154
* </p>
155155
*
156156
* @since 1.3
157-
* @deprecated (scheduled to be removed in the future) Use {@link #supportsMethod(String)} instead
157+
* @deprecated (scheduled to be removed in 1.14) Use {@link #supportsMethod(String)} instead
158158
*/
159159
@Deprecated
160160
public boolean supportsPatch() throws IOException {
@@ -206,8 +206,7 @@ protected LowLevelHttpRequest buildRequest(String method, String url) throws IOE
206206
*
207207
* @param url URL
208208
* @since 1.3
209-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
210-
* instead
209+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
211210
*/
212211
@Deprecated
213212
protected LowLevelHttpRequest buildDeleteRequest(String url) throws IOException {
@@ -223,8 +222,7 @@ protected LowLevelHttpRequest buildDeleteRequest(String url) throws IOException
223222
*
224223
* @param url URL
225224
* @since 1.3
226-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
227-
* instead
225+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
228226
*/
229227
@Deprecated
230228
protected LowLevelHttpRequest buildGetRequest(String url) throws IOException {
@@ -249,8 +247,7 @@ protected LowLevelHttpRequest buildGetRequest(String url) throws IOException {
249247
*
250248
* @param url URL
251249
* @since 1.3
252-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
253-
* instead
250+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
254251
*/
255252
@Deprecated
256253
protected LowLevelHttpRequest buildHeadRequest(String url) throws IOException {
@@ -275,8 +272,7 @@ protected LowLevelHttpRequest buildHeadRequest(String url) throws IOException {
275272
*
276273
* @param url URL
277274
* @since 1.3
278-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
279-
* instead
275+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
280276
*/
281277
@Deprecated
282278
protected LowLevelHttpRequest buildPatchRequest(String url) throws IOException {
@@ -292,8 +288,7 @@ protected LowLevelHttpRequest buildPatchRequest(String url) throws IOException {
292288
*
293289
* @param url URL
294290
* @since 1.3
295-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
296-
* instead
291+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
297292
*/
298293
@Deprecated
299294
protected LowLevelHttpRequest buildPostRequest(String url) throws IOException {
@@ -309,8 +304,7 @@ protected LowLevelHttpRequest buildPostRequest(String url) throws IOException {
309304
*
310305
* @param url URL
311306
* @since 1.3
312-
* @deprecated (scheduled to be removed in the future) Use {@link #buildRequest(String, String)}
313-
* instead
307+
* @deprecated (scheduled to be removed in 1.14) Use {@link #buildRequest(String, String)} instead
314308
*/
315309
@Deprecated
316310
protected LowLevelHttpRequest buildPutRequest(String url) throws IOException {

‎google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public abstract class LowLevelHttpRequest {
6767
* <p>Default implementation does nothing.</p>
6868
*
6969
* @throws IOException I/O exception
70-
* @deprecated (scheduled to be removed in the future) Use {@link #setContentLength(long)},
70+
* @deprecated (scheduled to be removed in 1.15) Use {@link #setContentLength(long)},
7171
* {@link #setContentEncoding(String)}, {@link #setContentType(String)}, and
7272
* {@link #setStreamingContent(StreamingContent)} instead.
7373
*/

‎google-http-client/src/main/java/com/google/api/client/http/MultipartRelatedContent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static void setMediaWithMetadataContent(
5858
*
5959
* @since 1.1
6060
* @author Yaniv Inbar
61-
* @deprecated (scheduled to be removed in the future) Use {@link MultipartContent} instead.
61+
* @deprecated (scheduled to be removed in 1.15) Use {@link MultipartContent} instead.
6262
*/
6363
@Deprecated
6464
public final class MultipartRelatedContent extends AbstractHttpContent {

‎google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*
4040
* @since 1.6
4141
* @author Ravi Mistry
42-
* @deprecated (scheduled to be removed in the future) Use {@link HttpTransport} instead.
42+
* @deprecated (scheduled to be removed in 1.14) Use {@link HttpTransport} instead.
4343
*/
4444
@Deprecated
4545
public class JsonHttpClient {
@@ -529,7 +529,7 @@ protected InputStream executeAsInputStream(HttpMethod method, GenericUrl url, Ob
529529
* </p>
530530
*
531531
* @since 1.6
532-
* @deprecated (scheduled to be removed in the future) Use {@link HttpTransport} instead.
532+
* @deprecated (scheduled to be removed in 1.14) Use {@link HttpTransport} instead.
533533
*/
534534
@Deprecated
535535
public static class Builder {

‎google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void setParser(HttpRequest request) {
4545
*
4646
* @since 1.0
4747
* @author Yaniv Inbar
48-
* @deprecated (scheduled to be removed in the future) Use {@link JsonObjectParser} instead.
48+
* @deprecated (scheduled to be removed in 1.14) Use {@link JsonObjectParser} instead.
4949
*/
5050
@Deprecated
5151
public class JsonHttpParser implements HttpParser {

‎google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
* @since 1.6
3939
* @author Ravi Mistry
40-
* @deprecated (scheduled to be removed in the future) Use {@link HttpRequest} instead.
40+
* @deprecated (scheduled to be removed in 1.14) Use {@link HttpRequest} instead.
4141
*/
4242
@Deprecated
4343
public class JsonHttpRequest extends GenericData {

‎google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpRequestInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/**
22
* Copyright (c) 2011 Google Inc.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -41,7 +41,7 @@ public void initialize(JsonHttpRequest request) {
4141
*
4242
* @since 1.6
4343
* @author Ravi Mistry
44-
* @deprecated (scheduled to be removed in the future) Use {@link HttpRequestInitializer} instead.
44+
* @deprecated (scheduled to be removed in 1.14) Use {@link HttpRequestInitializer} instead.
4545
*/
4646
@Deprecated
4747
public interface JsonHttpRequestInitializer {

‎google-http-client/src/main/java/com/google/api/client/http/xml/XmlHttpParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void setParser(HttpRequest request, XmlNamespaceDictionary namespaceDicti
4747
*
4848
* @since 1.0
4949
* @author Yaniv Inbar
50-
* @deprecated (scheduled to be removed in the future) Use {@link XmlObjectParser} instead.
50+
* @deprecated (scheduled to be removed in 1.14) Use {@link XmlObjectParser} instead.
5151
*/
5252
@Deprecated
5353
public class XmlHttpParser< C2EE /span> implements HttpParser {

‎google-http-client/src/main/java/com/google/api/client/http/xml/atom/AtomParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ static void setParser(HttpRequest request, XmlNamespaceDictionary namespaceDicti
4141
*
4242
* @since 1.4
4343
* @author Yaniv Inbar
44-
* @deprecated (scheduled to be removed in the future) Content-Type is no longer stored inside of
45-
* the Parser. Use an {@link XmlObjectParser} instead.
44+
* @deprecated (scheduled to be removed in 1.14) Content-Type is no longer stored inside of the
45+
* Parser. Use an {@link XmlObjectParser} instead.
4646
*/
4747
@Deprecated
4848
public final class AtomParser extends XmlHttpParser {

‎google-http-client/src/main/java/com/google/api/client/json/Json.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class Json {
2727
/**
2828
* {@code "application/json"} content type.
29-
* @deprecated (scheduled to be removed in the future) Use {@link #MEDIA_TYPE} instead.
29+
* @deprecated (scheduled to be removed in 1.14) Use {@link #MEDIA_TYPE} instead.
3030
*/
3131
@Deprecated
3232
public static final String CONTENT_TYPE = "application/json";

‎google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpContent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public MockHttpContent setContent(byte[] content) {
9595
* Sets the HTTP content encoding or {@code null} for none.
9696
*
9797
* @since 1.5
98-
* @deprecated (scheduled to be removed in the future) Use {@link HttpEncoding} instead.
98+
* @deprecated (scheduled to be removed in 1.15) Use {@link HttpEncoding} instead.
9999
*/
100100
@Deprecated
101101
public MockHttpContent setEncoding(String encoding) {

‎google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected MockHttpTransport(Builder builder) {
6363
* supported
6464
*
6565
* @since 1.12
66-
* @deprecated (scheduled to be removed in the future) Use {@link #MockHttpTransport(Builder)}
66+
* @deprecated (scheduled to be removed in 1.15) Use {@link #MockHttpTransport(Builder)}
6767
*/
6868
@Deprecated
6969
protected MockHttpTransport(Set<String> supportedMethods) {

‎google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public MockLowLevelHttpRequest setUrl(String url) {
161161
* Returns the HTTP content or {@code null} for none.
162162
*
163163
* @since 1.5
164-
* @deprecated (scheduled to be removed in the future) Use {@link #getContentLength()},
164+
* @deprecated (scheduled to be removed in 1.15) Use {@link #getContentLength()},
165165
* {@link #getContentEncoding()}, {@link #getContentType()}, or
166166
* {@link #getStreamingContent()} instead.
167167
*/

0 commit comments

Comments
 (0)
0