You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2013/01/13 05:46:54 UTC
svn commit: r1432551 - in /httpcomponents/httpclient/trunk:
httpclient/src/main/java/org/apache/http/impl/auth/
httpclient/src/main/java/org/apache/http/impl/conn/
httpmime/src/main/java/org/apache/http/entity/mime/content/
Author: ggregory
Date: Sun Jan 13 04:46:54 2013
New Revision: 1432551
URL: http://svn.apache.org/viewvc?rev=1432551&view=rev
Log:
Add missing '@Override' annotations.
Add missing '@Deprecated' annotations.
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java?rev=1432551&r1=1432550&r2=1432551&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java Sun Jan 13 04:46:54 2013
@@ -66,7 +66,8 @@ public abstract class AuthSchemeBase imp
*
* @deprecated (4.3) do not use.
*/
- public AuthSchemeBase(final ChallengeState challengeState) {
+ @Deprecated
+ public AuthSchemeBase(final ChallengeState challengeState) {
super();
this.challengeState = challengeState;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java?rev=1432551&r1=1432550&r2=1432551&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SystemDefaultRoutePlanner.java Sun Jan 13 04:46:54 2013
@@ -65,7 +65,8 @@ public class SystemDefaultRoutePlanner e
this.proxySelector = proxySelector != null ? proxySelector : ProxySelector.getDefault();
}
- protected HttpHost determineProxy(
+ @Override
+ protected HttpHost determineProxy(
final HttpHost target,
final HttpRequest request,
final HttpContext context) throws HttpException {
Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java?rev=1432551&r1=1432550&r2=1432551&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/ByteArrayBody.java Sun Jan 13 04:46:54 2013
@@ -63,7 +63,8 @@ public class ByteArrayBody extends Abstr
* @deprecated (4.3) use {@link ByteArrayBody#ByteArrayBody(byte[], ContentType, String)}
* or {@link MultipartEntityBuilder}
*/
- public ByteArrayBody(final byte[] data, final String mimeType, final String filename) {
+ @Deprecated
+ public ByteArrayBody(final byte[] data, final String mimeType, final String filename) {
this(data, ContentType.create(mimeType), filename);
}
@@ -95,7 +96,8 @@ public class ByteArrayBody extends Abstr
out.write(data);
}
- public String getCharset() {
+ @Override
+ public String getCharset() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java?rev=1432551&r1=1432550&r2=1432551&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java Sun Jan 13 04:46:54 2013
@@ -54,7 +54,8 @@ public class InputStreamBody extends Abs
* @deprecated (4.3) use {@link InputStreamBody#InputStreamBody(InputStream, ContentType,
* String)} or {@link MultipartEntityBuilder}
*/
- public InputStreamBody(final InputStream in, final String mimeType, final String filename) {
+ @Deprecated
+ public InputStreamBody(final InputStream in, final String mimeType, final String filename) {
this(in, ContentType.create(mimeType), filename);
}