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/15 19:30:06 UTC
svn commit: r1433569 [8/12] - in /httpcomponents:
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchmark/httpcore/
benchmark/httpcore/trunk/src/main/java/org/apache/http/benchm...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java Tue Jan 15 18:29:58 2013
@@ -97,7 +97,7 @@ public final class DateUtils {
* @throws DateParseException if the value could not be parsed using any of the
* supported date formats
*/
- public static Date parseDate(String dateValue) throws DateParseException {
+ public static Date parseDate(final String dateValue) throws DateParseException {
return parseDate(dateValue, null, null);
}
@@ -111,7 +111,7 @@ public final class DateUtils {
*
* @throws DateParseException if none of the dataFormats could parse the dateValue
*/
- public static Date parseDate(final String dateValue, String[] dateFormats)
+ public static Date parseDate(final String dateValue, final String[] dateFormats)
throws DateParseException {
return parseDate(dateValue, dateFormats, null);
}
@@ -173,7 +173,7 @@ public final class DateUtils {
*
* @see #PATTERN_RFC1123
*/
- public static String formatDate(Date date) {
+ public static String formatDate(final Date date) {
return formatDate(date, PATTERN_RFC1123);
}
@@ -190,7 +190,7 @@ public final class DateUtils {
*
* @see SimpleDateFormat
*/
- public static String formatDate(Date date, String pattern) {
+ public static String formatDate(final Date date, final String pattern) {
Args.notNull(date, "Date");
Args.notNull(pattern, "Pattern");
SimpleDateFormat formatter = DateFormatHolder.formatFor(pattern);
@@ -241,7 +241,7 @@ public final class DateUtils {
* to {@link SimpleDateFormat#applyPattern(String) apply} to a
* different pattern.
*/
- public static SimpleDateFormat formatFor(String pattern) {
+ public static SimpleDateFormat formatFor(final String pattern) {
SoftReference<Map<String, SimpleDateFormat>> ref = THREADLOCAL_FORMATS.get();
Map<String, SimpleDateFormat> formats = ref.get();
if (formats == null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java Tue Jan 15 18:29:58 2013
@@ -48,12 +48,12 @@ public class IgnoreSpec extends CookieSp
return 0;
}
- public List<Cookie> parse(Header header, CookieOrigin origin)
+ public List<Cookie> parse(final Header header, final CookieOrigin origin)
throws MalformedCookieException {
return Collections.emptyList();
}
- public List<Header> formatCookies(List<Cookie> cookies) {
+ public List<Header> formatCookies(final List<Cookie> cookies) {
return Collections.emptyList();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java Tue Jan 15 18:29:58 2013
@@ -92,7 +92,7 @@ public class NetscapeDomainHandler exten
}
@Override
- public boolean match(Cookie cookie, CookieOrigin origin) {
+ public boolean match(final Cookie cookie, final CookieOrigin origin) {
Args.notNull(cookie, "Cookie");
Args.notNull(origin, "Cookie origin");
String host = origin.getHost();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class PublicSuffixFilter implemen
private Set<String> exceptions;
private Set<String> suffixes;
- public PublicSuffixFilter(CookieAttributeHandler wrapped) {
+ public PublicSuffixFilter(final CookieAttributeHandler wrapped) {
this.wrapped = wrapped;
}
@@ -62,7 +62,7 @@ public class PublicSuffixFilter implemen
* TODO add support for patterns like "lib.*.us"
* @param suffixes
*/
- public void setPublicSuffixes(Collection<String> suffixes) {
+ public void setPublicSuffixes(final Collection<String> suffixes) {
this.suffixes = new HashSet<String>(suffixes);
}
@@ -71,29 +71,29 @@ public class PublicSuffixFilter implemen
* TODO add support for patterns
* @param exceptions
*/
- public void setExceptions(Collection<String> exceptions) {
+ public void setExceptions(final Collection<String> exceptions) {
this.exceptions = new HashSet<String>(exceptions);
}
/**
* Never matches if the cookie's domain is from the blacklist.
*/
- public boolean match(Cookie cookie, CookieOrigin origin) {
+ public boolean match(final Cookie cookie, final CookieOrigin origin) {
if (isForPublicSuffix(cookie)) {
return false;
}
return wrapped.match(cookie, origin);
}
- public void parse(SetCookie cookie, String value) throws MalformedCookieException {
+ public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
wrapped.parse(cookie, value);
}
- public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+ public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
wrapped.validate(cookie, origin);
}
- private boolean isForPublicSuffix(Cookie cookie) {
+ private boolean isForPublicSuffix(final Cookie cookie) {
String domain = cookie.getDomain();
if (domain.startsWith(".")) {
domain = domain.substring(1);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java Tue Jan 15 18:29:58 2013
@@ -45,7 +45,7 @@ public class PublicSuffixListParser {
private static final int MAX_LINE_LEN = 256;
private final PublicSuffixFilter filter;
- PublicSuffixListParser(PublicSuffixFilter filter) {
+ PublicSuffixListParser(final PublicSuffixFilter filter) {
this.filter = filter;
}
@@ -57,7 +57,7 @@ public class PublicSuffixListParser {
* @param list the suffix list. The caller is responsible for closing the reader.
* @throws IOException on error while reading from list
*/
- public void parse(Reader list) throws IOException {
+ public void parse(final Reader list) throws IOException {
Collection<String> rules = new ArrayList<String>();
Collection<String> exceptions = new ArrayList<String>();
BufferedReader r = new BufferedReader(list);
@@ -101,7 +101,7 @@ public class PublicSuffixListParser {
* @return false when the end of the stream is reached
* @throws IOException
*/
- private boolean readLine(Reader r, StringBuilder sb) throws IOException {
+ private boolean readLine(final Reader r, final StringBuilder sb) throws IOException {
sb.setLength(0);
int b;
boolean hitWhitespace = false;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java Tue Jan 15 18:29:58 2013
@@ -70,7 +70,7 @@ public class RFC2109Spec extends CookieS
private final boolean oneHeader;
/** Default constructor */
- public RFC2109Spec(final String[] datepatterns, boolean oneHeader) {
+ public RFC2109Spec(final String[] datepatterns, final boolean oneHeader) {
super();
if (datepatterns != null) {
this.datepatterns = datepatterns.clone();
@@ -181,7 +181,7 @@ public class RFC2109Spec extends CookieS
* @param version The cookie version
*/
protected void formatParamAsVer(final CharArrayBuffer buffer,
- final String name, final String value, int version) {
+ final String name, final String value, final int version) {
buffer.append(name);
buffer.append("=");
if (value != null) {
@@ -203,7 +203,7 @@ public class RFC2109Spec extends CookieS
* @param version The version to use.
*/
protected void formatCookieAsVer(final CharArrayBuffer buffer,
- final Cookie cookie, int version) {
+ final Cookie cookie, final int version) {
formatParamAsVer(buffer, cookie.getName(), cookie.getValue(), version);
if (cookie.getPath() != null) {
if (cookie instanceof ClientCookie
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java Tue Jan 15 18:29:58 2013
@@ -93,7 +93,7 @@ public class RFC2965DomainAttributeHandl
* @param domain The cookie domain attribute.
* @return true if the specified host matches the given domain.
*/
- public boolean domainMatch(String host, String domain) {
+ public boolean domainMatch(final String host, final String domain) {
boolean match = host.equals(domain)
|| (domain.startsWith(".") && host.endsWith(domain));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java Tue Jan 15 18:29:58 2013
@@ -90,7 +90,7 @@ public class RFC2965PortAttributeHandler
* @return true returns <tt>true</tt> if the given port exists in
* the given ports list; <tt>false</tt> otherwise.
*/
- private static boolean portMatch(int port, int[] ports) {
+ private static boolean portMatch(final int port, final int[] ports) {
boolean portInList = false;
for (int port2 : ports) {
if (port == port2) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java Tue Jan 15 18:29:58 2013
@@ -63,7 +63,7 @@ public class RFC2965Spec extends RFC2109
this(null, false);
}
- public RFC2965Spec(final String[] datepatterns, boolean oneHeader) {
+ public RFC2965Spec(final String[] datepatterns, final boolean oneHeader) {
super(datepatterns, oneHeader);
registerAttribHandler(ClientCookie.DOMAIN_ATTR, new RFC2965DomainAttributeHandler());
registerAttribHandler(ClientCookie.PORT_ATTR, new RFC2965PortAttributeHandler());
@@ -159,7 +159,7 @@ public class RFC2965Spec extends RFC2109
*/
@Override
protected void formatCookieAsVer(final CharArrayBuffer buffer,
- final Cookie cookie, int version) {
+ final Cookie cookie, final int version) {
super.formatCookieAsVer(buffer, cookie, version);
// format port attribute
if (cookie instanceof ClientCookie) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java Tue Jan 15 18:29:58 2013
@@ -111,7 +111,7 @@ class ResponseEntityWrapper extends Http
return false;
}
- public boolean streamClosed(InputStream wrapped) throws IOException {
+ public boolean streamClosed(final InputStream wrapped) throws IOException {
try {
boolean open = connReleaseTrigger != null && !connReleaseTrigger.isReleased();
// this assumes that closing the stream will
@@ -130,7 +130,7 @@ class ResponseEntityWrapper extends Http
return false;
}
- public boolean streamAbort(InputStream wrapped) throws IOException {
+ public boolean streamAbort(final InputStream wrapped) throws IOException {
cleanup();
return false;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java Tue Jan 15 18:29:58 2013
@@ -437,7 +437,7 @@ public class TestRequestAddCookies {
}
// Helper method
- private BasicClientCookie makeCookie(String name, String value, String domain, String path) {
+ private BasicClientCookie makeCookie(final String name, final String value, final String domain, final String path) {
BasicClientCookie cookie = new BasicClientCookie(name, value);
cookie.setDomain(domain);
cookie.setPath(path);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java Tue Jan 15 18:29:58 2013
@@ -191,7 +191,7 @@ public class TestURLEncodedUtils {
0x432, 0x435, 0x442
};
- private static String constructString(int [] unicodeChars) {
+ private static String constructString(final int [] unicodeChars) {
StringBuffer buffer = new StringBuffer();
if (unicodeChars != null) {
for (int unicodeChar : unicodeChars) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java Tue Jan 15 18:29:58 2013
@@ -554,9 +554,9 @@ public class TestRouteTracker {
/** Helper to check the status of the four flags. */
- public final static void checkCTLS(RouteTracker rt,
- boolean c, boolean t,
- boolean l, boolean s) {
+ public final static void checkCTLS(final RouteTracker rt,
+ final boolean c, final boolean t,
+ final boolean l, final boolean s) {
String rts = rt.toString();
Assert.assertEquals("wrong flag connected: " + rts, c, rt.isConnected());
Assert.assertEquals("wrong flag tunnelled: " + rts, t, rt.isTunnelled());
@@ -583,8 +583,8 @@ public class TestRouteTracker {
*
* @return <code>true</code> iff the route is complete
*/
- public final static boolean checkVia(RouteTracker rt, HttpRoute r,
- HttpRouteDirector rd, int steps) {
+ public final static boolean checkVia(final RouteTracker rt, final HttpRoute r,
+ final HttpRouteDirector rd, int steps) {
final String msg = r.toString() + " @ " + rt.toString();
@@ -690,7 +690,7 @@ public class TestRouteTracker {
*
* @return the result of <code>rt.toString()</code>
*/
- public final static String checkToString(RouteTracker rt) {
+ public final static String checkToString(final RouteTracker rt) {
if (rt == null) {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java Tue Jan 15 18:29:58 2013
@@ -220,8 +220,8 @@ public class TestHostnameVerifier {
}
- public void exceptionPlease(X509HostnameVerifier hv, String host,
- X509Certificate x509) {
+ public void exceptionPlease(final X509HostnameVerifier hv, final String host,
+ final X509Certificate x509) {
try {
hv.verify(host, x509);
Assert.fail("HostnameVerifier shouldn't allow [" + host + "]");
@@ -232,8 +232,8 @@ public class TestHostnameVerifier {
}
// Test helper method
- private void checkMatching(X509HostnameVerifier hv, String host,
- String[] cns, String[] alts, boolean shouldFail) {
+ private void checkMatching(final X509HostnameVerifier hv, final String host,
+ final String[] cns, final String[] alts, final boolean shouldFail) {
try {
hv.verify(host, cns, alts);
if (shouldFail) {
@@ -332,7 +332,7 @@ public class TestHostnameVerifier {
}
// Helper
- private void checkWildcard(String host, boolean isOK) {
+ private void checkWildcard(final String host, final boolean isOK) {
Assert.assertTrue(host+" should be "+isOK, isOK==AbstractVerifier.acceptableCountryWildcard(host));
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Tue Jan 15 18:29:58 2013
@@ -121,18 +121,18 @@ public class TestSSLSocketFactory extend
private boolean fired = false;
- public boolean verify(String host, SSLSession session) {
+ public boolean verify(final String host, final SSLSession session) {
return true;
}
- public void verify(String host, SSLSocket ssl) throws IOException {
+ public void verify(final String host, final SSLSocket ssl) throws IOException {
this.fired = true;
}
- public void verify(String host, String[] cns, String[] subjectAlts) throws SSLException {
+ public void verify(final String host, final String[] cns, final String[] subjectAlts) throws SSLException {
}
- public void verify(String host, X509Certificate cert) throws SSLException {
+ public void verify(final String host, final X509Certificate cert) throws SSLException {
}
public boolean isFired() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java Tue Jan 15 18:29:58 2013
@@ -46,7 +46,7 @@ public class TestNTLMEngineImpl {
}
/* Test suite helper */
- static byte toNibble(char c) {
+ static byte toNibble(final char c) {
if (c >= 'a' && c <= 'f') {
return (byte) (c - 'a' + 0x0a);
}
@@ -54,7 +54,7 @@ public class TestNTLMEngineImpl {
}
/* Test suite helper */
- static byte[] toBytes(String hex) {
+ static byte[] toBytes(final String hex) {
byte[] rval = new byte[hex.length() / 2];
int i = 0;
while (i < rval.length) {
@@ -66,7 +66,7 @@ public class TestNTLMEngineImpl {
}
/* Test suite MD4 helper */
- static void checkMD4(String input, String hexOutput) throws Exception {
+ static void checkMD4(final String input, final String hexOutput) throws Exception {
NTLMEngineImpl.MD4 md4;
md4 = new NTLMEngineImpl.MD4();
md4.update(input.getBytes("ASCII"));
@@ -225,7 +225,7 @@ public class TestNTLMEngineImpl {
}
/* Byte array check helper */
- static void checkArraysMatch(byte[] a1, byte[] a2)
+ static void checkArraysMatch(final byte[] a1, final byte[] a2)
throws Exception {
Assert.assertEquals(a1.length,a2.length);
for (int i = 0; i < a1.length; i++) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java Tue Jan 15 18:29:58 2013
@@ -52,7 +52,7 @@ public class DummyHttpClient implements
private HttpRequest request;
private HttpResponse response = new BasicHttpResponse(new ProtocolVersion("HTTP",1,1), HttpStatus.SC_OK, "OK");
- public void setParams(HttpParams params) {
+ public void setParams(final HttpParams params) {
this.params = params;
}
@@ -64,11 +64,11 @@ public class DummyHttpClient implements
return connManager;
}
- public void setConnectionManager(ClientConnectionManager ccm) {
+ public void setConnectionManager(final ClientConnectionManager ccm) {
connManager = ccm;
}
- public void setResponse(HttpResponse resp) {
+ public void setResponse(final HttpResponse resp) {
response = resp;
}
@@ -76,53 +76,53 @@ public class DummyHttpClient implements
return request;
}
- public HttpResponse execute(HttpUriRequest request) throws IOException,
+ public HttpResponse execute(final HttpUriRequest request) throws IOException,
ClientProtocolException {
this.request = request;
return response;
}
- public HttpResponse execute(HttpUriRequest request, HttpContext context)
+ public HttpResponse execute(final HttpUriRequest request, final HttpContext context)
throws IOException, ClientProtocolException {
this.request = request;
return response;
}
- public HttpResponse execute(HttpHost target, HttpRequest request)
+ public HttpResponse execute(final HttpHost target, final HttpRequest request)
throws IOException, ClientProtocolException {
this.request = request;
return response;
}
- public HttpResponse execute(HttpHost target, HttpRequest request,
- HttpContext context) throws IOException, ClientProtocolException {
+ public HttpResponse execute(final HttpHost target, final HttpRequest request,
+ final HttpContext context) throws IOException, ClientProtocolException {
this.request = request;
return response;
}
- public <T> T execute(HttpUriRequest request,
- ResponseHandler<? extends T> responseHandler) throws IOException,
+ public <T> T execute(final HttpUriRequest request,
+ final ResponseHandler<? extends T> responseHandler) throws IOException,
ClientProtocolException {
this.request = request;
return responseHandler.handleResponse(response);
}
- public <T> T execute(HttpUriRequest request,
- ResponseHandler<? extends T> responseHandler, HttpContext context)
+ public <T> T execute(final HttpUriRequest request,
+ final ResponseHandler<? extends T> responseHandler, final HttpContext context)
throws IOException, ClientProtocolException {
this.request = request;
return responseHandler.handleResponse(response);
}
- public <T> T execute(HttpHost target, HttpRequest request,
- ResponseHandler<? extends T> responseHandler) throws IOException,
+ public <T> T execute(final HttpHost target, final HttpRequest request,
+ final ResponseHandler<? extends T> responseHandler) throws IOException,
ClientProtocolException {
this.request = request;
return responseHandler.handleResponse(response);
}
- public <T> T execute(HttpHost target, HttpRequest request,
- ResponseHandler<? extends T> responseHandler, HttpContext context)
+ public <T> T execute(final HttpHost target, final HttpRequest request,
+ final ResponseHandler<? extends T> responseHandler, final HttpContext context)
throws IOException, ClientProtocolException {
this.request = request;
return responseHandler.handleResponse(response);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockClock.java Tue Jan 15 18:29:58 2013
@@ -34,7 +34,7 @@ public class MockClock implements Clock
return t;
}
- public void setCurrentTime(long now) {
+ public void setCurrentTime(final long now) {
t = now;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public final class MockConnPoolControl i
this.defaultMax = 2;
}
- public void setMaxTotal(int max) {
+ public void setMaxTotal(final int max) {
this.totalMax = max;
}
@@ -67,11 +67,11 @@ public final class MockConnPoolControl i
return this.defaultMax;
}
- public void setDefaultMaxPerRoute(int max) {
+ public void setDefaultMaxPerRoute(final int max) {
this.defaultMax = max;
}
- public void setMaxPerRoute(final HttpRoute route, int max) {
+ public void setMaxPerRoute(final HttpRoute route, final int max) {
this.maxPerHostMap.put(route, Integer.valueOf(max));
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java Tue Jan 15 18:29:58 2013
@@ -150,7 +150,7 @@ public class TestDecompressingHttpClient
assertSame(mockConnManager, impl.getConnectionManager());
}
- private void assertAcceptEncodingGzipAndDeflateWereAddedToRequest(HttpRequest captured) {
+ private void assertAcceptEncodingGzipAndDeflateWereAddedToRequest(final HttpRequest captured) {
boolean foundGzip = false;
boolean foundDeflate = false;
for(Header h : captured.getHeaders("Accept-Encoding")) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java Tue Jan 15 18:29:58 2013
@@ -77,8 +77,8 @@ public class TestAbortHandling extends I
final CountDownLatch wait = new CountDownLatch(1);
this.localServer.register("*", new HttpRequestHandler(){
- public void handle(HttpRequest request, HttpResponse response,
- HttpContext context) throws HttpException, IOException {
+ public void handle(final HttpRequest request, final HttpResponse response,
+ final HttpContext context) throws HttpException, IOException {
try {
wait.countDown(); // trigger abort
Thread.sleep(2000); // allow time for abort to happen
@@ -329,7 +329,7 @@ public class TestAbortHandling extends I
private final int statuscode = HttpStatus.SC_SEE_OTHER;
private final int port;
- public BasicRedirectService(int port) {
+ public BasicRedirectService(final int port) {
this.port = port;
}
@@ -348,14 +348,14 @@ public class TestAbortHandling extends I
private final CountDownLatch connLatch;
private final CountDownLatch awaitLatch;
- public ConnMan4(CountDownLatch connLatch, CountDownLatch awaitLatch) {
+ public ConnMan4(final CountDownLatch connLatch, final CountDownLatch awaitLatch) {
super();
this.connLatch = connLatch;
this.awaitLatch = awaitLatch;
}
@Override
- public ConnectionRequest requestConnection(HttpRoute route, Object state) {
+ public ConnectionRequest requestConnection(final HttpRoute route, final Object state) {
// If this is the redirect route, stub the return value
// so-as to pretend the host is waiting on a slot...
if(route.getTargetHost().getHostName().equals("localhost")) {
@@ -369,7 +369,7 @@ public class TestAbortHandling extends I
}
public HttpClientConnection get(
- long timeout, TimeUnit tunit)
+ long timeout, final TimeUnit tunit)
throws InterruptedException,
ConnectionPoolTimeoutException {
connLatch.countDown(); // notify waiter that we're getting a connection
@@ -397,12 +397,12 @@ public class TestAbortHandling extends I
private final CountDownLatch connLatch;
private final CountDownLatch awaitLatch;
- public ConMan(CountDownLatch connLatch, CountDownLatch awaitLatch) {
+ public ConMan(final CountDownLatch connLatch, final CountDownLatch awaitLatch) {
this.connLatch = connLatch;
this.awaitLatch = awaitLatch;
}
- public void closeIdleConnections(long idletime, TimeUnit tunit) {
+ public void closeIdleConnections(final long idletime, final TimeUnit tunit) {
throw new UnsupportedOperationException("just a mockup");
}
@@ -410,8 +410,8 @@ public class TestAbortHandling extends I
throw new UnsupportedOperationException("just a mockup");
}
- public HttpClientConnection getConnection(HttpRoute route,
- long timeout, TimeUnit tunit) {
+ public HttpClientConnection getConnection(final HttpRoute route,
+ final long timeout, final TimeUnit tunit) {
throw new UnsupportedOperationException("just a mockup");
}
@@ -429,7 +429,7 @@ public class TestAbortHandling extends I
}
public HttpClientConnection get(
- long timeout, TimeUnit tunit)
+ long timeout, final TimeUnit tunit)
throws InterruptedException,
ConnectionPoolTimeoutException {
connLatch.countDown(); // notify waiter that we're getting a connection
@@ -458,7 +458,7 @@ public class TestAbortHandling extends I
public void releaseConnection(
final HttpClientConnection conn,
final Object newState,
- long validDuration, TimeUnit timeUnit) {
+ final long validDuration, final TimeUnit timeUnit) {
throw new UnsupportedOperationException("just a mockup");
}
@@ -482,13 +482,13 @@ public class TestAbortHandling extends I
private static class CustomGet extends HttpGet {
private final CountDownLatch releaseTriggerLatch;
- public CustomGet(String uri, CountDownLatch releaseTriggerLatch) {
+ public CustomGet(final String uri, final CountDownLatch releaseTriggerLatch) {
super(uri);
this.releaseTriggerLatch = releaseTriggerLatch;
}
@Override
- public void setCancellable(Cancellable cancellable) {
+ public void setCancellable(final Cancellable cancellable) {
try {
if(!releaseTriggerLatch.await(1, TimeUnit.SECONDS)) {
throw new RuntimeException("Waited too long...");
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java Tue Jan 15 18:29:58 2013
@@ -147,12 +147,12 @@ public class TestClientAuthentication ex
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthenticationFallBack.java Tue Jan 15 18:29:58 2013
@@ -117,12 +117,12 @@ public class TestClientAuthenticationFal
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java Tue Jan 15 18:29:58 2013
@@ -135,12 +135,12 @@ public class TestClientReauthentication
public void clear() {
}
- public Credentials getCredentials(AuthScope authscope) {
+ public Credentials getCredentials(final AuthScope authscope) {
this.authscope = authscope;
return this.creds;
}
- public void setCredentials(AuthScope authscope, Credentials credentials) {
+ public void setCredentials(final AuthScope authscope, final Credentials credentials) {
}
public AuthScope getAuthScope() {
@@ -156,7 +156,7 @@ public class TestClientReauthentication
BasicSchemeFactory myBasicAuthSchemeFactory = new BasicSchemeFactory() {
@Override
- public AuthScheme create(HttpContext context) {
+ public AuthScheme create(final HttpContext context) {
return new BasicScheme() {
@Override
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java Tue Jan 15 18:29:58 2013
@@ -90,7 +90,7 @@ public class TestClientRequestExecution
private final String failureMsg;
- public FaultyHttpRequestExecutor(String failureMsg) {
+ public FaultyHttpRequestExecutor(final String failureMsg) {
this.failureMsg = failureMsg;
}
@@ -130,7 +130,7 @@ public class TestClientRequestExecution
public boolean retryRequest(
final IOException exception,
- int executionCount,
+ final int executionCount,
final HttpContext context) {
return true;
}
@@ -170,7 +170,7 @@ public class TestClientRequestExecution
public boolean retryRequest(
final IOException exception,
- int executionCount,
+ final int executionCount,
final HttpContext context) {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java Tue Jan 15 18:29:58 2013
@@ -81,8 +81,8 @@ public class TestConnectionManagement ex
private static HttpClientConnection getConnection(
final HttpClientConnectionManager mgr,
final HttpRoute route,
- long timeout,
- TimeUnit unit) throws ConnectionPoolTimeoutException, InterruptedException {
+ final long timeout,
+ final TimeUnit unit) throws ConnectionPoolTimeoutException, InterruptedException {
ConnectionRequest connRequest = mgr.requestConnection(route, null);
return connRequest.get(timeout, unit);
}
@@ -601,7 +601,7 @@ public class TestConnectionManagement ex
private final CountDownLatch waitLatch = new CountDownLatch(1);
protected final WaitPolicy waitPolicy;
- LatchSupport(CountDownLatch continueLatch, WaitPolicy waitPolicy) {
+ LatchSupport(final CountDownLatch continueLatch, final WaitPolicy waitPolicy) {
this.continueLatch = continueLatch;
this.waitPolicy = waitPolicy;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionReuse.java Tue Jan 15 18:29:58 2013
@@ -289,8 +289,8 @@ public class TestConnectionReuse {
final HttpClient httpclient,
final HttpHost target,
final URI requestURI,
- int repetitions,
- boolean forceClose) {
+ final int repetitions,
+ final boolean forceClose) {
super();
this.httpclient = httpclient;
this.requestURI = requestURI;
@@ -327,7 +327,7 @@ public class TestConnectionReuse {
// A very basic keep-alive header interceptor, to add Keep-Alive: timeout=1
// if there is no Connection: close header.
private static class ResponseKeepAlive implements HttpResponseInterceptor {
- public void process(HttpResponse response, HttpContext context)
+ public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
Header connection = response.getFirstHeader(HTTP.CONN_DIRECTIVE);
if(connection != null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestContentCodings.java Tue Jan 15 18:29:58 2013
@@ -88,9 +88,9 @@ public class TestContentCodings extends
* {@inheritDoc}
*/
public void handle(
- HttpRequest request,
- HttpResponse response,
- HttpContext context) throws HttpException, IOException {
+ final HttpRequest request,
+ final HttpResponse response,
+ final HttpContext context) throws HttpException, IOException {
response.setStatusCode(HttpStatus.SC_NO_CONTENT);
}
});
@@ -308,9 +308,9 @@ public class TestContentCodings extends
* {@inheritDoc}
*/
public void handle(
- HttpRequest request,
- HttpResponse response,
- HttpContext context) throws HttpException, IOException {
+ final HttpRequest request,
+ final HttpResponse response,
+ final HttpContext context) throws HttpException, IOException {
response.setEntity(new StringEntity(entityText));
response.addHeader("Content-Type", "text/plain");
Header[] acceptEncodings = request.getHeaders("Accept-Encoding");
@@ -357,9 +357,9 @@ public class TestContentCodings extends
* {@inheritDoc}
*/
public void handle(
- HttpRequest request,
- HttpResponse response,
- HttpContext context) throws HttpException, IOException {
+ final HttpRequest request,
+ final HttpResponse response,
+ final HttpContext context) throws HttpException, IOException {
response.setEntity(new StringEntity(entityText));
response.addHeader("Content-Type", "text/plain");
Header[] acceptEncodings = request.getHeaders("Accept-Encoding");
@@ -442,7 +442,7 @@ public class TestContentCodings extends
*/
private String text;
- WorkerTask(HttpClient client, boolean identity, CountDownLatch startGate, CountDownLatch endGate) {
+ WorkerTask(final HttpClient client, final boolean identity, final CountDownLatch startGate, final CountDownLatch endGate) {
this.client = client;
this.request = new HttpGet("/some-resource");
if (identity) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestIdleConnectionEviction.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestIdleConnectionEviction.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestIdleConnectionEviction.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestIdleConnectionEviction.java Tue Jan 15 18:29:58 2013
@@ -98,7 +98,7 @@ public class TestIdleConnectionEviction
final HttpClient httpclient,
final HttpHost target,
final HttpUriRequest request,
- int count) {
+ final int count) {
super();
this.httpclient = httpclient;
this.target = target;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java Tue Jan 15 18:29:58 2013
@@ -77,7 +77,7 @@ public class TestRedirects extends Integ
private final int statuscode;
- public BasicRedirectService(int statuscode) {
+ public BasicRedirectService(final int statuscode) {
super();
this.statuscode = statuscode > 0 ? statuscode : HttpStatus.SC_MOVED_TEMPORARILY;
}
@@ -188,7 +188,7 @@ public class TestRedirects extends Integ
private static class BogusRedirectService implements HttpRequestHandler {
private final String url;
- public BogusRedirectService(String redirectUrl) {
+ public BogusRedirectService(final String redirectUrl) {
super();
this.url = redirectUrl;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java Tue Jan 15 18:29:58 2013
@@ -140,7 +140,7 @@ public class TestSPNegoScheme extends In
scheme = new NegotiateSchemeWithMockGssManager();
}
- public AuthScheme create(HttpContext context) {
+ public AuthScheme create(final HttpContext context) {
return scheme;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java Tue Jan 15 18:29:58 2013
@@ -154,7 +154,7 @@ public class TestStatefulConnManagement
public HttpWorker(
final String uid,
final HttpContext context,
- int requestCount,
+ final int requestCount,
final HttpHost target,
final HttpClient httpclient) {
super();
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java Tue Jan 15 18:29:58 2013
@@ -47,7 +47,7 @@ public class SessionInputBufferMock exte
public SessionInputBufferMock(
final InputStream instream,
- int buffersize,
+ final int buffersize,
final MessageConstraints constrains,
final CharsetDecoder decoder) {
super(new HttpTransportMetricsImpl(), buffersize, -1, constrains, decoder);
@@ -56,13 +56,13 @@ public class SessionInputBufferMock exte
public SessionInputBufferMock(
final InputStream instream,
- int buffersize) {
+ final int buffersize) {
this(instream, buffersize, null, null);
}
public SessionInputBufferMock(
final byte[] bytes,
- int buffersize,
+ final int buffersize,
final MessageConstraints constrains,
final CharsetDecoder decoder) {
this(new ByteArrayInputStream(bytes), buffersize, constrains, decoder);
@@ -70,14 +70,14 @@ public class SessionInputBufferMock exte
public SessionInputBufferMock(
final byte[] bytes,
- int buffersize,
+ final int buffersize,
final MessageConstraints constrains) {
this(new ByteArrayInputStream(bytes), buffersize, constrains, null);
}
public SessionInputBufferMock(
final byte[] bytes,
- int buffersize) {
+ final int buffersize) {
this(new ByteArrayInputStream(bytes), buffersize);
}
@@ -104,7 +104,7 @@ public class SessionInputBufferMock exte
}
@Override
- public boolean isDataAvailable(int timeout) throws IOException {
+ public boolean isDataAvailable(final int timeout) throws IOException {
return true;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultClientConnectOperator.java Tue Jan 15 18:29:58 2013
@@ -72,7 +72,7 @@ public class TestDefaultClientConnectOpe
operator.resolveHostname("localhost");
}
- private InetAddress[] translateIp(String ip) throws UnknownHostException {
+ private InetAddress[] translateIp(final String ip) throws UnknownHostException {
String[] ipParts = ip.split("\\.");
byte[] byteIpAddress = new byte[4];
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultHttpResponseParser.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultHttpResponseParser.java Tue Jan 15 18:29:58 2013
@@ -85,7 +85,7 @@ public class TestDefaultHttpResponsePars
HttpMessageParser<HttpResponse> parser = new DefaultHttpResponseParser(inbuffer) {
@Override
- protected boolean reject(final CharArrayBuffer line, int count) {
+ protected boolean reject(final CharArrayBuffer line, final int count) {
return count >= 2;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestAbstractCookieSpec.java Tue Jan 15 18:29:58 2013
@@ -43,19 +43,19 @@ public class TestAbstractCookieSpec {
private static class DummyCookieSpec extends AbstractCookieSpec {
- public List<Header> formatCookies(List<Cookie> cookies) {
+ public List<Header> formatCookies(final List<Cookie> cookies) {
return null;
}
- public boolean match(Cookie cookie, CookieOrigin origin) {
+ public boolean match(final Cookie cookie, final CookieOrigin origin) {
return true;
}
- public List<Cookie> parse(Header header, CookieOrigin origin) throws MalformedCookieException {
+ public List<Cookie> parse(final Header header, final CookieOrigin origin) throws MalformedCookieException {
return null;
}
- public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+ public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
}
public int getVersion() {
@@ -70,14 +70,14 @@ public class TestAbstractCookieSpec {
private static class DummyCookieAttribHandler implements CookieAttributeHandler {
- public boolean match(Cookie cookie, CookieOrigin origin) {
+ public boolean match(final Cookie cookie, final CookieOrigin origin) {
return true;
}
- public void parse(SetCookie cookie, String value) throws MalformedCookieException {
+ public void parse(final SetCookie cookie, final String value) throws MalformedCookieException {
}
- public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
+ public void validate(final Cookie cookie, final CookieOrigin origin) throws MalformedCookieException {
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java Tue Jan 15 18:29:58 2013
@@ -649,7 +649,7 @@ public class TestBrowserCompatSpec {
}
}
- private void checkDate(String date) throws Exception {
+ private void checkDate(final String date) throws Exception {
Header header = new BasicHeader("Set-Cookie", "custno=12345;Expires='"+date+"';");
CookieSpec cookiespec = new BrowserCompatSpec();
CookieOrigin origin = new CookieOrigin("localhost", 80, "/", false);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java Tue Jan 15 18:29:58 2013
@@ -200,7 +200,7 @@ public class LocalTestServer {
* @param pattern the URL pattern to match
* @param handler the handler to apply
*/
- public void register(String pattern, HttpRequestHandler handler) {
+ public void register(final String pattern, final HttpRequestHandler handler) {
handlerRegistry.register(pattern, handler);
}
@@ -209,7 +209,7 @@ public class LocalTestServer {
*
* @param pattern the URL pattern
*/
- public void unregister(String pattern) {
+ public void unregister(final String pattern) {
handlerRegistry.unregister(pattern);
}
@@ -217,7 +217,7 @@ public class LocalTestServer {
return timeout;
}
- public void setTimeout(int timeout) {
+ public void setTimeout(final int timeout) {
this.timeout = timeout;
}
@@ -261,7 +261,7 @@ public class LocalTestServer {
}
}
- public void awaitTermination(long timeMs) throws InterruptedException {
+ public void awaitTermination(final long timeMs) throws InterruptedException {
if (listenerThread != null) {
listenerThread.join(timeMs);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java Tue Jan 15 18:29:58 2013
@@ -154,7 +154,7 @@ public class RandomHandler
* @param len the number of random bytes to generate,
* 0 to maxint
*/
- public RandomEntity(long len) {
+ public RandomEntity(final long len) {
length = len;
}
@@ -204,7 +204,7 @@ public class RandomHandler
*
* @param out where to write the content to
*/
- public void writeTo(OutputStream out) throws IOException {
+ public void writeTo(final OutputStream out) throws IOException {
final int blocksize = 2048;
int remaining = (int) length; // range checked in constructor
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SecureSocketFactoryMockup.java Tue Jan 15 18:29:58 2013
@@ -43,7 +43,7 @@ public class SecureSocketFactoryMockup e
/* A default instance of this mockup. */
public final static SchemeLayeredSocketFactory INSTANCE = new SecureSocketFactoryMockup("INSTANCE");
- public SecureSocketFactoryMockup(String name) {
+ public SecureSocketFactoryMockup(final String name) {
super(name);
}
@@ -55,8 +55,8 @@ public class SecureSocketFactoryMockup e
}
- public Socket createLayeredSocket(Socket socket, String host, int port,
- HttpParams params) {
+ public Socket createLayeredSocket(final Socket socket, final String host, final int port,
+ final HttpParams params) {
throw new UnsupportedOperationException("I'm a mockup!");
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java Tue Jan 15 18:29:58 2013
@@ -48,7 +48,7 @@ public class SocketFactoryMockup impleme
/** The name of this mockup socket factory. */
protected final String mockup_name;
- public SocketFactoryMockup(String name) {
+ public SocketFactoryMockup(final String name) {
mockup_name = (name != null) ? name : String.valueOf(hashCode());
}
@@ -64,14 +64,14 @@ public class SocketFactoryMockup impleme
}
public Socket connectSocket(
- Socket sock,
- InetSocketAddress remoteAddress,
- InetSocketAddress localAddress,
- HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
+ final Socket sock,
+ final InetSocketAddress remoteAddress,
+ final InetSocketAddress localAddress,
+ final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
throw new UnsupportedOperationException("I'm a mockup!");
}
- public boolean isSecure(Socket sock) {
+ public boolean isSecure(final Socket sock) {
// no way that the argument is from *this* factory...
throw new UnsupportedOperationException("I'm a mockup!");
}
Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java Tue Jan 15 18:29:58 2013
@@ -111,7 +111,7 @@ public class HttpMultipart {
* @param mode the mode to use
* @throws IllegalArgumentException if charset is null or boundary is null
*/
- public HttpMultipart(final String subType, final Charset charset, final String boundary, HttpMultipartMode mode) {
+ public HttpMultipart(final String subType, final Charset charset, final String boundary, final HttpMultipartMode mode) {
super();
Args.notNull(subType, "Multipart subtype");
Args.notNull(boundary, "Multipart boundary");
@@ -169,7 +169,7 @@ public class HttpMultipart {
private void doWriteTo(
final HttpMultipartMode mode,
final OutputStream out,
- boolean writeContent) throws IOException {
+ final boolean writeContent) throws IOException {
ByteArrayBuffer boundary = encode(this.charset, getBoundary());
for (FormBodyPart part: this.parts) {
Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java Tue Jan 15 18:29:58 2013
@@ -69,7 +69,7 @@ public class MultipartEntity implements
public MultipartEntity(
HttpMultipartMode mode,
String boundary,
- Charset charset) {
+ final Charset charset) {
super();
if (boundary == null) {
boundary = generateBoundary();
Modified: httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java Tue Jan 15 18:29:58 2013
@@ -111,7 +111,7 @@ public class StringBody extends Abstract
public StringBody(
final String text,
final String mimeType,
- Charset charset) throws UnsupportedEncodingException {
+ final Charset charset) throws UnsupportedEncodingException {
this(text, ContentType.create(mimeType, charset));
}
Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartForm.java Tue Jan 15 18:29:58 2013
@@ -209,7 +209,7 @@ public class TestMultipartForm {
0x432, 0x435, 0x442
};
- private static String constructString(int [] unicodeChars) {
+ private static String constructString(final int [] unicodeChars) {
StringBuilder buffer = new StringBuilder();
if (unicodeChars != null) {
for (int unicodeChar : unicodeChars) {
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkConnection.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkConnection.java Tue Jan 15 18:29:58 2013
@@ -37,7 +37,7 @@ class BenchmarkConnection extends Defaul
private final Stats stats;
- BenchmarkConnection(int bufsize, final Stats stats) {
+ BenchmarkConnection(final int bufsize, final Stats stats) {
super(bufsize);
this.stats = stats;
}
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/BenchmarkWorker.java Tue Jan 15 18:29:58 2013
@@ -226,7 +226,7 @@ class BenchmarkWorker implements Runnabl
}
}
- private void verboseOutput(HttpResponse response) {
+ private void verboseOutput(final HttpResponse response) {
if (config.getVerbosity() >= 3) {
System.out.println(">> " + request.getRequestLine().toString());
Header[] headers = request.getAllHeaders();
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CommandLineUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CommandLineUtils.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CommandLineUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CommandLineUtils.java Tue Jan 15 18:29:58 2013
@@ -122,7 +122,7 @@ public class CommandLineUtils {
return options;
}
- public static void parseCommandLine(CommandLine cmd, Config config) {
+ public static void parseCommandLine(final CommandLine cmd, final Config config) {
if (cmd.hasOption('v')) {
String s = cmd.getOptionValue('v');
try {
@@ -221,7 +221,7 @@ public class CommandLineUtils {
formatter.printHelp("HttpBenchmark [options] [http://]hostname[:port]/path?query", options);
}
- static void printError(String msg) {
+ static void printError(final String msg) {
System.err.println(msg);
showUsage(getOptions());
System.exit(-1);
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/Config.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/Config.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/Config.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/Config.java Tue Jan 15 18:29:58 2013
@@ -75,7 +75,7 @@ public class Config {
return url;
}
- public void setUrl(URL url) {
+ public void setUrl(final URL url) {
this.url = url;
}
@@ -83,7 +83,7 @@ public class Config {
return requests;
}
- public void setRequests(int requests) {
+ public void setRequests(final int requests) {
this.requests = requests;
}
@@ -91,7 +91,7 @@ public class Config {
return threads;
}
- public void setThreads(int threads) {
+ public void setThreads(final int threads) {
this.threads = threads;
}
@@ -99,7 +99,7 @@ public class Config {
return keepAlive;
}
- public void setKeepAlive(boolean keepAlive) {
+ public void setKeepAlive(final boolean keepAlive) {
this.keepAlive = keepAlive;
}
@@ -107,7 +107,7 @@ public class Config {
return verbosity;
}
- public void setVerbosity(int verbosity) {
+ public void setVerbosity(final int verbosity) {
this.verbosity = verbosity;
}
@@ -115,7 +115,7 @@ public class Config {
return headInsteadOfGet;
}
- public void setHeadInsteadOfGet(boolean headInsteadOfGet) {
+ public void setHeadInsteadOfGet(final boolean headInsteadOfGet) {
this.headInsteadOfGet = headInsteadOfGet;
this.method = "HEAD";
}
@@ -124,7 +124,7 @@ public class Config {
return useHttp1_0;
}
- public void setUseHttp1_0(boolean useHttp1_0) {
+ public void setUseHttp1_0(final boolean useHttp1_0) {
this.useHttp1_0 = useHttp1_0;
}
@@ -132,7 +132,7 @@ public class Config {
return payloadFile;
}
- public void setPayloadFile(File payloadFile) {
+ public void setPayloadFile(final File payloadFile) {
this.payloadFile = payloadFile;
}
@@ -140,7 +140,7 @@ public class Config {
return contentType;
}
- public void setContentType(String contentType) {
+ public void setContentType(final String contentType) {
this.contentType = contentType;
}
@@ -148,7 +148,7 @@ public class Config {
return headers;
}
- public void setHeaders(String[] headers) {
+ public void setHeaders(final String[] headers) {
this.headers = headers;
}
@@ -156,23 +156,23 @@ public class Config {
return socketTimeout;
}
- public void setSocketTimeout(int socketTimeout) {
+ public void setSocketTimeout(final int socketTimeout) {
this.socketTimeout = socketTimeout;
}
- public void setMethod(String method) {
+ public void setMethod(final String method) {
this.method = method;
}
- public void setUseChunking(boolean useChunking) {
+ public void setUseChunking(final boolean useChunking) {
this.useChunking = useChunking;
}
- public void setUseExpectContinue(boolean useExpectContinue) {
+ public void setUseExpectContinue(final boolean useExpectContinue) {
this.useExpectContinue = useExpectContinue;
}
- public void setUseAcceptGZip(boolean useAcceptGZip) {
+ public void setUseAcceptGZip(final boolean useAcceptGZip) {
this.useAcceptGZip = useAcceptGZip;
}
@@ -220,31 +220,31 @@ public class Config {
return identityStorePassword;
}
- public void setPayloadText(String payloadText) {
+ public void setPayloadText(final String payloadText) {
this.payloadText = payloadText;
}
- public void setSoapAction(String soapAction) {
+ public void setSoapAction(final String soapAction) {
this.soapAction = soapAction;
}
- public void setDisableSSLVerification(boolean disableSSLVerification) {
+ public void setDisableSSLVerification(final boolean disableSSLVerification) {
this.disableSSLVerification = disableSSLVerification;
}
- public void setTrustStorePath(String trustStorePath) {
+ public void setTrustStorePath(final String trustStorePath) {
this.trustStorePath = trustStorePath;
}
- public void setIdentityStorePath(String identityStorePath) {
+ public void setIdentityStorePath(final String identityStorePath) {
this.identityStorePath = identityStorePath;
}
- public void setTrustStorePassword(String trustStorePassword) {
+ public void setTrustStorePassword(final String trustStorePassword) {
this.trustStorePassword = trustStorePassword;
}
- public void setIdentityStorePassword(String identityStorePassword) {
+ public void setIdentityStorePassword(final String identityStorePassword) {
this.identityStorePassword = identityStorePassword;
}
}
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingInputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingInputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingInputStream.java Tue Jan 15 18:29:58 2013
@@ -49,7 +49,7 @@ class CountingInputStream extends Filter
}
@Override
- public int read(byte[] b) throws IOException {
+ public int read(final byte[] b) throws IOException {
int bytesRead = this.in.read(b);
if (bytesRead > 0) {
this.stats.incTotalBytesRecv(bytesRead);
@@ -58,7 +58,7 @@ class CountingInputStream extends Filter
}
@Override
- public int read(byte[] b, int off, int len) throws IOException {
+ public int read(final byte[] b, final int off, final int len) throws IOException {
int bytesRead = this.in.read(b, off, len);
if (bytesRead > 0) {
this.stats.incTotalBytesRecv(bytesRead);
@@ -67,7 +67,7 @@ class CountingInputStream extends Filter
}
@Override
- public long skip(long n) throws IOException {
+ public long skip(final long n) throws IOException {
long bytesRead = this.in.skip(n);
if (bytesRead > 0) {
this.stats.incTotalBytesRecv(bytesRead);
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingOutputStream.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingOutputStream.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/CountingOutputStream.java Tue Jan 15 18:29:58 2013
@@ -40,19 +40,19 @@ class CountingOutputStream extends Filte
}
@Override
- public void write(int b) throws IOException {
+ public void write(final int b) throws IOException {
this.out.write(b);
this.stats.incTotalBytesSent(1);
}
@Override
- public void write(byte[] b) throws IOException {
+ public void write(final byte[] b) throws IOException {
this.out.write(b);
this.stats.incTotalBytesSent(b.length);
}
@Override
- public void write(byte[] b, int off, int len) throws IOException {
+ public void write(final byte[] b, final int off, final int len) throws IOException {
this.out.write(b, off, len);
this.stats.incTotalBytesSent(len);
}
Modified: httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java?rev=1433569&r1=1433568&r2=1433569&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-ab/src/main/java/org/apache/http/benchmark/HttpBenchmark.java Tue Jan 15 18:29:58 2013
@@ -70,7 +70,7 @@ public class HttpBenchmark {
private final Config config;
- public static void main(String[] args) throws Exception {
+ public static void main(final String[] args) throws Exception {
Options options = CommandLineUtils.getOptions();
CommandLineParser parser = new PosixParser();
@@ -176,7 +176,7 @@ public class HttpBenchmark {
new LinkedBlockingQueue<Runnable>(),
new ThreadFactory() {
- public Thread newThread(Runnable r) {
+ public Thread newThread(final Runnable r) {
return new Thread(r, "ClientPool");
}
@@ -196,11 +196,11 @@ public class HttpBenchmark {
}
public void checkClientTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
+ final java.security.cert.X509Certificate[] certs, final String authType) {
}
public void checkServerTrusted(
- java.security.cert.X509Certificate[] certs, String authType) {
+ final java.security.cert.X509Certificate[] certs, final String authType) {
}
}
};