You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2012/12/18 17:23:14 UTC
svn commit: r1423516 [1/4] - in /httpcomponents/httpclient/trunk:
httpclient-cache/src/main/java/org/apache/http/client/cache/
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/
httpclient/src/main/java/org/apache/http/auth/ httpclient/s...
Author: olegk
Date: Tue Dec 18 16:22:58 2012
New Revision: 1423516
URL: http://svn.apache.org/viewvc?rev=1423516&view=rev
Log:
Use Asserts to verify object state; use Args to verify method arguments
Modified:
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthOption.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnRouteParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/HttpRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/routing/RouteTracker.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java
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/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AIMDBackoffManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AuthenticationStrategyImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultServiceUnavailableRetryStrategy.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/BackoffStrategyExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/MainClientExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ProtocolExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RedirectExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RetryExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultSchemePortResolver.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/HttpClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/InMemoryDnsResolver.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ManagedClientConnectionImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/ProxySelectorRoutePlanner.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntry.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicCommentHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicExpiresHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicPathHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BasicSecureHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/DateUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftHeaderParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109VersionHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestBasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestHttpClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalTestServer.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/mockup/SocketFactoryMockup.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntityBuilder.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/AbstractContentBody.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/FileBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/InputStreamBody.java
httpcomponents/httpclient/trunk/httpmime/src/main/java/org/apache/http/entity/mime/content/StringBody.java
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/client/cache/HttpCacheEntry.java Tue Dec 18 16:22:58 2012
@@ -31,12 +31,14 @@ import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.http.Header;
import org.apache.http.HttpResponse;
import org.apache.http.ProtocolVersion;
import org.apache.http.StatusLine;
import org.apache.http.annotation.Immutable;
import org.apache.http.message.HeaderGroup;
+import org.apache.http.util.Args;
/**
* Structure used to store an {@link HttpResponse} in a cache. Some entries
@@ -85,18 +87,10 @@ public class HttpCacheEntry implements S
final Resource resource,
final Map<String,String> variantMap) {
super();
- if (requestDate == null) {
- throw new IllegalArgumentException("Request date may not be null");
- }
- if (responseDate == null) {
- throw new IllegalArgumentException("Response date may not be null");
- }
- if (statusLine == null) {
- throw new IllegalArgumentException("Status line may not be null");
- }
- if (responseHeaders == null) {
- throw new IllegalArgumentException("Response headers may not be null");
- }
+ Args.notNull(requestDate, "Request date");
+ Args.notNull(responseDate, "Response date");
+ Args.notNull(statusLine, "Status line");
+ Args.notNull(responseHeaders, "Response headers");
this.requestDate = requestDate;
this.responseDate = responseDate;
this.statusLine = statusLine;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java Tue Dec 18 16:22:58 2012
@@ -36,6 +36,7 @@ import org.apache.http.HttpEntity;
import org.apache.http.annotation.Immutable;
import org.apache.http.client.cache.HttpCacheEntry;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.Args;
@Immutable
class CacheEntity implements HttpEntity, Serializable {
@@ -74,9 +75,7 @@ class CacheEntity implements HttpEntity,
}
public void writeTo(final OutputStream outstream) throws IOException {
- if (outstream == null) {
- throw new IllegalArgumentException("Output stream may not be null");
- }
+ Args.notNull(outstream, "Output stream");
InputStream instream = this.cacheEntry.getResource().getInputStream();
try {
IOUtils.copy(instream, outstream);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java Tue Dec 18 16:22:58 2012
@@ -66,6 +66,7 @@ import org.apache.http.message.BasicHttp
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
import org.apache.http.util.EntityUtils;
import org.apache.http.util.VersionInfo;
@@ -119,12 +120,8 @@ public class CachingExec implements Clie
HttpCache cache,
CacheConfig config) {
super();
- if (backend == null) {
- throw new IllegalArgumentException("HTTP backend may not be null");
- }
- if (cache == null) {
- throw new IllegalArgumentException("HttpCache may not be null");
- }
+ Args.notNull(backend, "HTTP backend");
+ Args.notNull(cache, "HttpCache");
this.cacheConfig = config != null ? config : CacheConfig.DEFAULT;
this.backend = backend;
this.responseCache = cache;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java Tue Dec 18 16:22:58 2012
@@ -77,6 +77,7 @@ import org.apache.http.params.HttpParams
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
import org.apache.http.util.EntityUtils;
import org.apache.http.util.VersionInfo;
@@ -165,15 +166,9 @@ public class CachingHttpClient implement
HttpCache cache,
CacheConfig config) {
super();
- if (client == null) {
- throw new IllegalArgumentException("HttpClient may not be null");
- }
- if (cache == null) {
- throw new IllegalArgumentException("HttpCache may not be null");
- }
- if (config == null) {
- throw new IllegalArgumentException("CacheConfig may not be null");
- }
+ Args.notNull(client, "HttpClient");
+ Args.notNull(cache, "HttpCache");
+ Args.notNull(config, "CacheConfig");
this.maxObjectSizeBytes = config.getMaxObjectSize();
this.sharedCache = config.isSharedCache();
this.backend = client;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CombinedEntity.java Tue Dec 18 16:22:58 2012
@@ -35,6 +35,7 @@ import java.io.SequenceInputStream;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.client.cache.Resource;
import org.apache.http.entity.AbstractHttpEntity;
+import org.apache.http.util.Args;
@NotThreadSafe
class CombinedEntity extends AbstractHttpEntity {
@@ -66,9 +67,7 @@ class CombinedEntity extends AbstractHtt
}
public void writeTo(final OutputStream outstream) throws IOException {
- if (outstream == null) {
- throw new IllegalArgumentException("Output stream may not be null");
- }
+ Args.notNull(outstream, "Output stream");
InputStream instream = getContent();
try {
int l;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ManagedHttpCacheStorage.java Tue Dec 18 16:22:58 2012
@@ -37,6 +37,7 @@ import org.apache.http.client.cache.Http
import org.apache.http.client.cache.HttpCacheStorage;
import org.apache.http.client.cache.HttpCacheUpdateCallback;
import org.apache.http.client.cache.Resource;
+import org.apache.http.util.Args;
/**
* {@link HttpCacheStorage} implementation capable of deallocating resources associated with
@@ -84,12 +85,8 @@ public class ManagedHttpCacheStorage imp
}
public void putEntry(final String url, final HttpCacheEntry entry) throws IOException {
- if (url == null) {
- throw new IllegalArgumentException("URL may not be null");
- }
- if (entry == null) {
- throw new IllegalArgumentException("Cache entry may not be null");
- }
+ Args.notNull(url, "URL");
+ Args.notNull(entry, "Cache entry");
ensureValidState();
synchronized (this) {
this.entries.put(url, entry);
@@ -98,9 +95,7 @@ public class ManagedHttpCacheStorage imp
}
public HttpCacheEntry getEntry(final String url) throws IOException {
- if (url == null) {
- throw new IllegalArgumentException("URL may not be null");
- }
+ Args.notNull(url, "URL");
ensureValidState();
synchronized (this) {
return this.entries.get(url);
@@ -108,9 +103,7 @@ public class ManagedHttpCacheStorage imp
}
public void removeEntry(String url) throws IOException {
- if (url == null) {
- throw new IllegalArgumentException("URL may not be null");
- }
+ Args.notNull(url, "URL");
ensureValidState();
synchronized (this) {
// Cannot deallocate the associated resources immediately as the
@@ -122,12 +115,8 @@ public class ManagedHttpCacheStorage imp
public void updateEntry(
final String url,
final HttpCacheUpdateCallback callback) throws IOException {
- if (url == null) {
- throw new IllegalArgumentException("URL may not be null");
- }
- if (callback == null) {
- throw new IllegalArgumentException("Callback may not be null");
- }
+ Args.notNull(url, "URL");
+ Args.notNull(callback, "Callback");
ensureValidState();
synchronized (this) {
HttpCacheEntry existing = this.entries.get(url);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthOption.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthOption.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthOption.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthOption.java Tue Dec 18 16:22:58 2012
@@ -27,6 +27,7 @@
package org.apache.http.auth;
import org.apache.http.annotation.Immutable;
+import org.apache.http.util.Args;
/**
* @since 4.2
@@ -39,12 +40,8 @@ public final class AuthOption {
public AuthOption(final AuthScheme authScheme, final Credentials creds) {
super();
- if (authScheme == null) {
- throw new IllegalArgumentException("Auth scheme may not be null");
- }
- if (creds == null) {
- throw new IllegalArgumentException("User credentials may not be null");
- }
+ Args.notNull(authScheme, "Auth scheme");
+ Args.notNull(creds, "User credentials");
this.authScheme = authScheme;
this.creds = creds;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java Tue Dec 18 16:22:58 2012
@@ -36,10 +36,10 @@ import org.apache.http.HttpRequest;
import org.apache.http.annotation.ThreadSafe;
import org.apache.http.config.Lookup;
import org.apache.http.config.Registry;
-
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Authentication scheme registry that can be used to obtain the corresponding
@@ -78,12 +78,8 @@ public final class AuthSchemeRegistry im
public void register(
final String name,
final AuthSchemeFactory factory) {
- if (name == null) {
- throw new IllegalArgumentException("Name may not be null");
- }
- if (factory == null) {
- throw new IllegalArgumentException("Authentication scheme factory may not be null");
- }
+ Args.notNull(name, "Name");
+ Args.notNull(factory, "Authentication scheme factory");
registeredSchemes.put(name.toLowerCase(Locale.ENGLISH), factory);
}
@@ -94,9 +90,7 @@ public final class AuthSchemeRegistry im
* @param name the identifier of the class to unregister
*/
public void unregister(final String name) {
- if (name == null) {
- throw new IllegalArgumentException("Name may not be null");
- }
+ Args.notNull(name, "Name");
registeredSchemes.remove(name.toLowerCase(Locale.ENGLISH));
}
@@ -114,9 +108,7 @@ public final class AuthSchemeRegistry im
public AuthScheme getAuthScheme(final String name, final HttpParams params)
throws IllegalStateException {
- if (name == null) {
- throw new IllegalArgumentException("Name may not be null");
- }
+ Args.notNull(name, "Name");
AuthSchemeFactory factory = registeredSchemes.get(name.toLowerCase(Locale.ENGLISH));
if (factory != null) {
return factory.newInstance(params);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScope.java Tue Dec 18 16:22:58 2012
@@ -30,7 +30,7 @@ import java.util.Locale;
import org.apache.http.HttpHost;
import org.apache.http.annotation.Immutable;
-
+import org.apache.http.util.Args;
import org.apache.http.util.LangUtils;
/**
@@ -162,9 +162,7 @@ public class AuthScope {
*/
public AuthScope(final AuthScope authscope) {
super();
- if (authscope == null) {
- throw new IllegalArgumentException("Scope may not be null");
- }
+ Args.notNull(authscope, "Scope");
this.host = authscope.getHost();
this.port = authscope.getPort();
this.realm = authscope.getRealm();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Tue Dec 18 16:22:58 2012
@@ -29,6 +29,7 @@ package org.apache.http.auth;
import java.util.Queue;
import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.util.Args;
/**
* This class provides detailed information about the state of the authentication process.
@@ -108,12 +109,8 @@ public class AuthState {
* @since 4.2
*/
public void update(final AuthScheme authScheme, final Credentials credentials) {
- if (authScheme == null) {
- throw new IllegalArgumentException("Auth scheme may not be null or empty");
- }
- if (credentials == null) {
- throw new IllegalArgumentException("Credentials may not be null or empty");
- }
+ Args.notNull(authScheme, "Auth scheme");
+ Args.notNull(credentials, "Credentials");
this.authScheme = authScheme;
this.credentials = credentials;
this.authOptions = null;
@@ -146,9 +143,7 @@ public class AuthState {
* @since 4.2
*/
public void update(final Queue<AuthOption> authOptions) {
- if (authOptions == null || authOptions.isEmpty()) {
- throw new IllegalArgumentException("Queue of auth options may not be null or empty");
- }
+ Args.notEmpty(authOptions, "Queue of auth options");
this.authOptions = authOptions;
this.authScheme = null;
this.credentials = null;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/BasicUserPrincipal.java Tue Dec 18 16:22:58 2012
@@ -30,7 +30,7 @@ import java.io.Serializable;
import java.security.Principal;
import org.apache.http.annotation.Immutable;
-
+import org.apache.http.util.Args;
import org.apache.http.util.LangUtils;
/**
@@ -47,9 +47,7 @@ public final class BasicUserPrincipal im
public BasicUserPrincipal(final String username) {
super();
- if (username == null) {
- throw new IllegalArgumentException("User name may not be null");
- }
+ Args.notNull(username, "User name");
this.username = username;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java Tue Dec 18 16:22:58 2012
@@ -31,7 +31,7 @@ import java.security.Principal;
import java.util.Locale;
import org.apache.http.annotation.Immutable;
-
+import org.apache.http.util.Args;
import org.apache.http.util.LangUtils;
/**
@@ -62,9 +62,7 @@ public class NTCredentials implements Cr
*/
public NTCredentials(String usernamePassword) {
super();
- if (usernamePassword == null) {
- throw new IllegalArgumentException("Username:password string may not be null");
- }
+ Args.notNull(usernamePassword, "Username:password string");
String username;
int atColon = usernamePassword.indexOf(':');
if (atColon >= 0) {
@@ -102,9 +100,7 @@ public class NTCredentials implements Cr
final String workstation,
final String domain) {
super();
- if (userName == null) {
- throw new IllegalArgumentException("User name may not be null");
- }
+ Args.notNull(userName, "User name");
this.principal = new NTUserPrincipal(domain, userName);
this.password = password;
if (workstation != null) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java Tue Dec 18 16:22:58 2012
@@ -31,7 +31,7 @@ import java.security.Principal;
import java.util.Locale;
import org.apache.http.annotation.Immutable;
-
+import org.apache.http.util.Args;
import org.apache.http.util.LangUtils;
/**
@@ -52,9 +52,7 @@ public class NTUserPrincipal implements
final String domain,
final String username) {
super();
- if (username == null) {
- throw new IllegalArgumentException("User name may not be null");
- }
+ Args.notNull(username, "User name");
this.username = username;
if (domain != null) {
this.domain = domain.toUpperCase(Locale.ENGLISH);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java Tue Dec 18 16:22:58 2012
@@ -30,7 +30,7 @@ import java.io.Serializable;
import java.security.Principal;
import org.apache.http.annotation.Immutable;
-
+import org.apache.http.util.Args;
import org.apache.http.util.LangUtils;
/**
@@ -55,9 +55,7 @@ public class UsernamePasswordCredentials
*/
public UsernamePasswordCredentials(String usernamePassword) {
super();
- if (usernamePassword == null) {
- throw new IllegalArgumentException("Username:password string may not be null");
- }
+ Args.notNull(usernamePassword, "Username:password string");
int atColon = usernamePassword.indexOf(':');
if (atColon >= 0) {
this.principal = new BasicUserPrincipal(usernamePassword.substring(0, atColon));
@@ -77,9 +75,7 @@ public class UsernamePasswordCredentials
*/
public UsernamePasswordCredentials(String userName, String password) {
super();
- if (userName == null) {
- throw new IllegalArgumentException("Username may not be null");
- }
+ Args.notNull(userName, "Username");
this.principal = new BasicUserPrincipal(userName);
this.password = password;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/params/AuthParams.java Tue Dec 18 16:22:58 2012
@@ -30,9 +30,9 @@ package org.apache.http.auth.params;
import org.apache.http.annotation.Immutable;
import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.client.config.RequestConfig;
-
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.Args;
/**
* An adaptor for manipulating HTTP authentication parameters
@@ -59,9 +59,7 @@ public final class AuthParams {
* @return The charset
*/
public static String getCredentialCharset(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
String charset = (String) params.getParameter
(AuthPNames.CREDENTIAL_CHARSET);
if (charset == null) {
@@ -78,9 +76,7 @@ public final class AuthParams {
* @param charset The charset
*/
public static void setCredentialCharset(final HttpParams params, final String charset) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setParameter(AuthPNames.CREDENTIAL_CHARSET, charset);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/DecompressingEntity.java Tue Dec 18 16:22:58 2012
@@ -31,6 +31,7 @@ import java.io.OutputStream;
import org.apache.http.HttpEntity;
import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.util.Args;
import org.apache.http.util.EntityUtils;
/**
@@ -88,9 +89,7 @@ abstract class DecompressingEntity exten
*/
@Override
public void writeTo(OutputStream outstream) throws IOException {
- if (outstream == null) {
- throw new IllegalArgumentException("Output stream may not be null");
- }
+ Args.notNull(outstream, "Output stream");
InputStream instream = getContent();
try {
byte[] buffer = new byte[BUFFER_SIZE];
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/EntityBuilder.java Tue Dec 18 16:22:58 2012
@@ -28,7 +28,6 @@
package org.apache.http.client.entity;
import java.io.File;
-import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.util.Arrays;
@@ -196,13 +195,7 @@ public class EntityBuilder {
e = new UrlEncodedFormEntity(this.parameters,
this.contentType != null ? this.contentType.getCharset() : null);
} else if (this.serializable != null) {
- // TODO: replace with constructor from 4.3
- try {
- e = new SerializableEntity(this.serializable, false);
- } catch (IOException never) {
- throw new IllegalStateException(
- "I/O error creating SerializableEntity without buffering");
- }
+ e = new SerializableEntity(this.serializable);
e.setContentType(ContentType.DEFAULT_BINARY.toString());
} else if (this.file != null) {
e = new FileEntity(this.file, getContentOrDefault(ContentType.DEFAULT_BINARY));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/entity/GzipCompressingEntity.java Tue Dec 18 16:22:58 2012
@@ -37,6 +37,7 @@ import org.apache.http.HttpEntity;
import org.apache.http.entity.HttpEntityWrapper;
import org.apache.http.message.BasicHeader;
import org.apache.http.protocol.HTTP;
+import org.apache.http.util.Args;
/**
* Wrapping entity that compresses content when {@link #writeTo writing}.
@@ -75,9 +76,7 @@ public class GzipCompressingEntity exten
@Override
public void writeTo(final OutputStream outstream) throws IOException {
- if (outstream == null) {
- throw new IllegalArgumentException("Output stream may not be null");
- }
+ Args.notNull(outstream, "Output stream");
GZIPOutputStream gzip = new GZIPOutputStream(outstream);
try {
wrappedEntity.writeTo(gzip);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/HttpOptions.java Tue Dec 18 16:22:58 2012
@@ -31,12 +31,12 @@ import java.net.URI;
import java.util.HashSet;
import java.util.Set;
-import org.apache.http.annotation.NotThreadSafe;
-
import org.apache.http.Header;
import org.apache.http.HeaderElement;
import org.apache.http.HeaderIterator;
import org.apache.http.HttpResponse;
+import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.util.Args;
/**
* HTTP OPTIONS method.
@@ -83,9 +83,7 @@ public class HttpOptions extends HttpReq
}
public Set<String> getAllowedMethods(final HttpResponse response) {
- if (response == null) {
- throw new IllegalArgumentException("HTTP response may not be null");
- }
+ Args.notNull(response, "HTTP response");
HeaderIterator it = response.headerIterator("Allow");
Set<String> methods = new HashSet<String>();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/HttpClientParams.java Tue Dec 18 16:22:58 2012
@@ -28,9 +28,9 @@ package org.apache.http.client.params;
import org.apache.http.annotation.Immutable;
import org.apache.http.client.config.RequestConfig;
-
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.Args;
/**
* An adaptor for manipulating HTTP client parameters in {@link HttpParams}.
@@ -48,41 +48,31 @@ public class HttpClientParams {
}
public static boolean isRedirecting(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
return params.getBooleanParameter
(ClientPNames.HANDLE_REDIRECTS, true);
}
public static void setRedirecting(final HttpParams params, boolean value) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setBooleanParameter
(ClientPNames.HANDLE_REDIRECTS, value);
}
public static boolean isAuthenticating(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
return params.getBooleanParameter
(ClientPNames.HANDLE_AUTHENTICATION, true);
}
public static void setAuthenticating(final HttpParams params, boolean value) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setBooleanParameter
(ClientPNames.HANDLE_AUTHENTICATION, value);
}
public static String getCookiePolicy(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
String cookiePolicy = (String)
params.getParameter(ClientPNames.COOKIE_POLICY);
if (cookiePolicy == null) {
@@ -92,9 +82,7 @@ public class HttpClientParams {
}
public static void setCookiePolicy(final HttpParams params, final String cookiePolicy) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setParameter(ClientPNames.COOKIE_POLICY, cookiePolicy);
}
@@ -104,9 +92,7 @@ public class HttpClientParams {
* @since 4.2
*/
public static void setConnectionManagerTimeout(final HttpParams params, long timeout) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setLongParameter(ClientPNames.CONN_MANAGER_TIMEOUT, timeout);
}
@@ -120,9 +106,7 @@ public class HttpClientParams {
* @return the timeout value
*/
public static long getConnectionManagerTimeout(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
Long timeout = (Long) params.getParameter(ClientPNames.CONN_MANAGER_TIMEOUT);
if (timeout != null) {
return timeout.longValue();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ClientContextConfigurer.java Tue Dec 18 16:22:58 2012
@@ -34,6 +34,7 @@ import org.apache.http.client.CookieStor
import org.apache.http.client.CredentialsProvider;
import org.apache.http.cookie.CookieSpecRegistry;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Configuration facade for {@link HttpContext} instances.
@@ -49,8 +50,7 @@ public class ClientContextConfigurer imp
private final HttpContext context;
public ClientContextConfigurer (final HttpContext context) {
- if (context == null)
- throw new IllegalArgumentException("HTTP context may not be null");
+ Args.notNull(context, "HTTP context");
this.context = context;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java Tue Dec 18 16:22:58 2012
@@ -54,6 +54,7 @@ import org.apache.http.cookie.CookieSpec
import org.apache.http.cookie.CookieSpecProvider;
import org.apache.http.cookie.SetCookie2;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Request interceptor that matches cookies available in the current
@@ -73,12 +74,8 @@ public class RequestAddCookies implement
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(request, "HTTP request");
+ Args.notNull(context, "HTTP context");
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java Tue Dec 18 16:22:58 2012
@@ -45,6 +45,7 @@ import org.apache.http.client.AuthCache;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.conn.routing.RouteInfo;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Request interceptor that can preemptively authenticate against known hosts,
@@ -64,12 +65,8 @@ public class RequestAuthCache implements
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(request, "HTTP request");
+ Args.notNull(context, "HTTP context");
HttpClientContext clientContext = HttpClientContext.adapt(context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAuthenticationBase.java Tue Dec 18 16:22:58 2012
@@ -43,6 +43,7 @@ import org.apache.http.auth.Authenticati
import org.apache.http.auth.ContextAwareAuthScheme;
import org.apache.http.auth.Credentials;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Asserts;
@Deprecated
abstract class RequestAuthenticationBase implements HttpRequestInterceptor {
@@ -108,9 +109,7 @@ abstract class RequestAuthenticationBase
}
private void ensureAuthScheme(final AuthScheme authScheme) {
- if (authScheme == null) {
- throw new IllegalStateException("Auth scheme is not set");
- }
+ Asserts.notNull(authScheme, "Auth scheme");
}
private Header authenticate(
@@ -118,9 +117,7 @@ abstract class RequestAuthenticationBase
final Credentials creds,
final HttpRequest request,
final HttpContext context) throws AuthenticationException {
- if (authScheme == null) {
- throw new IllegalStateException("Auth state object is null");
- }
+ Asserts.notNull(authScheme, "Auth scheme");
if (authScheme instanceof ContextAwareAuthScheme) {
return ((ContextAwareAuthScheme) authScheme).authenticate(creds, request, context);
} else {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestClientConnControl.java Tue Dec 18 16:22:58 2012
@@ -31,14 +31,14 @@ import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.http.annotation.Immutable;
-
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.annotation.Immutable;
import org.apache.http.conn.routing.RouteInfo;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* This protocol interceptor is responsible for adding <code>Connection</code>
@@ -60,9 +60,7 @@ public class RequestClientConnControl im
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
+ Args.notNull(request, "HTTP request");
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java Tue Dec 18 16:22:58 2012
@@ -30,14 +30,14 @@ package org.apache.http.client.protocol;
import java.io.IOException;
import java.util.Collection;
-import org.apache.http.annotation.Immutable;
-
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
+import org.apache.http.annotation.Immutable;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Request interceptor that adds default request headers.
@@ -64,9 +64,7 @@ public class RequestDefaultHeaders imple
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
+ Args.notNull(request, "HTTP request");
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java Tue Dec 18 16:22:58 2012
@@ -39,6 +39,7 @@ import org.apache.http.conn.routing.Http
import org.apache.http.impl.client.HttpAuthenticator;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Generates authentication header for the proxy host, if required,
@@ -58,12 +59,8 @@ public class RequestProxyAuthentication
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(request, "HTTP request");
+ Args.notNull(context, "HTTP context");
if (request.containsHeader(AUTH.PROXY_AUTH_RESP)) {
return;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java Tue Dec 18 16:22:58 2012
@@ -36,6 +36,7 @@ import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthState;
import org.apache.http.impl.client.HttpAuthenticator;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Generates authentication header for the target host, if required,
@@ -55,12 +56,8 @@ public class RequestTargetAuthentication
public void process(final HttpRequest request, final HttpContext context)
throws HttpException, IOException {
- if (request == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(request, "HTTP request");
+ Args.notNull(context, "HTTP context");
String method = request.getRequestLine().getMethod();
if (method.equalsIgnoreCase("CONNECT")) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java Tue Dec 18 16:22:58 2012
@@ -46,6 +46,7 @@ import org.apache.http.conn.scheme.Schem
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.protocol.ExecutionContext;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Response interceptor that adds successfully completed {@link AuthScheme}s
@@ -69,12 +70,8 @@ public class ResponseAuthCache implement
public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
- if (response == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(response, "HTTP request");
+ Args.notNull(context, "HTTP context");
AuthCache authCache = (AuthCache) context.getAttribute(ClientContext.AUTH_CACHE);
HttpHost target = (HttpHost) context.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java Tue Dec 18 16:22:58 2012
@@ -30,8 +30,6 @@ package org.apache.http.client.protocol;
import java.io.IOException;
import java.util.List;
-import org.apache.http.annotation.Immutable;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.Header;
@@ -39,6 +37,7 @@ import org.apache.http.HeaderIterator;
import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
+import org.apache.http.annotation.Immutable;
import org.apache.http.client.CookieStore;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
@@ -46,6 +45,7 @@ import org.apache.http.cookie.CookieSpec
import org.apache.http.cookie.MalformedCookieException;
import org.apache.http.cookie.SM;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.Args;
/**
* Response interceptor that populates the current {@link CookieStore} with data
@@ -64,12 +64,8 @@ public class ResponseProcessCookies impl
public void process(final HttpResponse response, final HttpContext context)
throws HttpException, IOException {
- if (response == null) {
- throw new IllegalArgumentException("HTTP request may not be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("HTTP context may not be null");
- }
+ Args.notNull(response, "HTTP request");
+ Args.notNull(context, "HTTP context");
HttpClientContext clientContext = HttpClientContext.adapt(context);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java Tue Dec 18 16:22:58 2012
@@ -30,9 +30,9 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Stack;
-import org.apache.http.annotation.Immutable;
-
import org.apache.http.HttpHost;
+import org.apache.http.annotation.Immutable;
+import org.apache.http.util.Args;
/**
* A collection of utilities for {@link URI URIs}, to workaround
@@ -128,9 +128,7 @@ public class URIUtils {
final URI uri,
final HttpHost target,
boolean dropFragment) throws URISyntaxException {
- if (uri == null) {
- throw new IllegalArgumentException("URI may not be null");
- }
+ Args.notNull(uri, "URI");
URIBuilder uribuilder = new URIBuilder(uri);
if (target != null) {
uribuilder.setScheme(target.getSchemeName());
@@ -169,9 +167,7 @@ public class URIUtils {
* If the resulting URI is invalid.
*/
public static URI rewriteURI(final URI uri) throws URISyntaxException {
- if (uri == null) {
- throw new IllegalArgumentException("URI may not be null");
- }
+ Args.notNull(uri, "URI");
if (uri.getFragment() != null || uri.getUserInfo() != null) {
return new URIBuilder(uri).setFragment(null).setUserInfo(null).build();
} else {
@@ -200,12 +196,8 @@ public class URIUtils {
* @return the resulting URI
*/
public static URI resolve(final URI baseURI, URI reference){
- if (baseURI == null) {
- throw new IllegalArgumentException("Base URI may nor be null");
- }
- if (reference == null) {
- throw new IllegalArgumentException("Reference URI may nor be null");
- }
+ Args.notNull(baseURI, "Base URI");
+ Args.notNull(reference, "Reference URI");
String s = reference.toString();
if (s.startsWith("?")) {
return resolveReferenceStartingWithQueryString(baseURI, reference);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java Tue Dec 18 16:22:58 2012
@@ -31,6 +31,7 @@ import java.io.InputStream;
import java.io.IOException;
import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.util.Args;
/**
* Basic implementation of {@link EofSensorWatcher}. The underlying connection
@@ -58,10 +59,7 @@ public class BasicEofSensorWatcher imple
*/
public BasicEofSensorWatcher(ManagedClientConnection conn,
boolean reuse) {
- if (conn == null)
- throw new IllegalArgumentException
- ("Connection may not be null.");
-
+ Args.notNull(conn, "Connection");
managedConn = conn;
attemptReuse = reuse;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java Tue Dec 18 16:22:58 2012
@@ -36,6 +36,7 @@ import org.apache.http.annotation.NotThr
import org.apache.http.HttpEntity;
import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.util.Args;
import org.apache.http.util.EntityUtils;
/**
@@ -73,11 +74,7 @@ public class BasicManagedEntity extends
ManagedClientConnection conn,
boolean reuse) {
super(entity);
-
- if (conn == null)
- throw new IllegalArgumentException
- ("Connection may not be null.");
-
+ Args.notNull(conn, "Connection");
this.managedConn = conn;
this.attemptReuse = reuse;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/EofSensorInputStream.java Tue Dec 18 16:22:58 2012
@@ -26,10 +26,11 @@
package org.apache.http.conn;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import org.apache.http.annotation.NotThreadSafe;
+import org.apache.http.util.Args;
/**
* A stream wrapper that triggers actions on {@link #close close()} and EOF.
@@ -80,9 +81,7 @@ public class EofSensorInputStream extend
*/
public EofSensorInputStream(final InputStream in,
final EofSensorWatcher watcher) {
- if (in == null) {
- throw new IllegalArgumentException("Wrapped stream may not be null");
- }
+ Args.notNull(in, "Wrapped stream");
wrappedStream = in;
selfClosed = false;
eofWatcher = watcher;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/HttpInetSocketAddress.java Tue Dec 18 16:22:58 2012
@@ -30,6 +30,7 @@ import java.net.InetAddress;
import java.net.InetSocketAddress;
import org.apache.http.HttpHost;
+import org.apache.http.util.Args;
/**
* Extended {@link InetSocketAddress} implementation that also provides access to the original
@@ -48,9 +49,7 @@ public class HttpInetSocketAddress exten
public HttpInetSocketAddress(final HttpHost httphost, final InetAddress addr, int port) {
super(addr, port);
- if (httphost == null) {
- throw new IllegalArgumentException("HTTP host may not be null");
- }
+ Args.notNull(httphost, "HTTP host");
this.httphost = httphost;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/MultihomePlainSocketFactory.java Tue Dec 18 16:22:58 2012
@@ -43,6 +43,8 @@ import org.apache.http.conn.scheme.Schem
import org.apache.http.conn.scheme.SocketFactory;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.Args;
+import org.apache.http.util.Asserts;
/**
* Socket factory that implements a simple multi-home fail-over on connect failure,
@@ -106,13 +108,8 @@ public final class MultihomePlainSocketF
InetAddress localAddress, int localPort,
HttpParams params)
throws IOException {
-
- if (host == null) {
- throw new IllegalArgumentException("Target host may not be null.");
- }
- if (params == null) {
- throw new IllegalArgumentException("Parameters may not be null.");
- }
+ Args.notNull(host, "Target host");
+ Args.notNull(params, "HTTP parameters");
if (sock == null)
sock = createSocket();
@@ -170,22 +167,10 @@ public final class MultihomePlainSocketF
public final boolean isSecure(Socket sock)
throws IllegalArgumentException {
- if (sock == null) {
- throw new IllegalArgumentException("Socket may not be null.");
- }
- // This class check assumes that createSocket() calls the constructor
- // directly. If it was using javax.net.SocketFactory, we couldn't make
- // an assumption about the socket class here.
- if (sock.getClass() != Socket.class) {
- throw new IllegalArgumentException
- ("Socket not created by this factory.");
- }
+ Args.notNull(sock, "Socket");
// This check is performed last since it calls a method implemented
// by the argument object. getClass() is final in java.lang.Object.
- if (sock.isClosed()) {
- throw new IllegalArgumentException("Socket is closed.");
- }
-
+ Asserts.check(!sock.isClosed(), "Socket is closed");
return false;
} // isSecure
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java Tue Dec 18 16:22:58 2012
@@ -27,10 +27,10 @@
package org.apache.http.conn.params;
import org.apache.http.annotation.Immutable;
-
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
+import org.apache.http.util.Args;
/**
* An adaptor for manipulating HTTP connection management
@@ -60,9 +60,7 @@ public final class ConnManagerParams imp
*/
@Deprecated
public static long getTimeout(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
return params.getLongParameter(TIMEOUT, 0);
}
@@ -77,9 +75,7 @@ public final class ConnManagerParams imp
*/
@Deprecated
public static void setTimeout(final HttpParams params, long timeout) {
- if (params == null) {
- throw new IllegalArgumentException("HTTP parameters may not be null");
- }
+ Args.notNull(params, "HTTP parameters");
params.setLongParameter(TIMEOUT, timeout);
}
@@ -101,10 +97,7 @@ public final class ConnManagerParams imp
*/
public static void setMaxConnectionsPerRoute(final HttpParams params,
final ConnPerRoute connPerRoute) {
- if (params == null) {
- throw new IllegalArgumentException
- ("HTTP parameters must not be null.");
- }
+ Args.notNull(params, "HTTP parameters");
params.setParameter(MAX_CONNECTIONS_PER_ROUTE, connPerRoute);
}
@@ -116,10 +109,7 @@ public final class ConnManagerParams imp
* @return lookup interface for maximum number of connections allowed per route.
*/
public static ConnPerRoute getMaxConnectionsPerRoute(final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException
- ("HTTP parameters must not be null.");
- }
+ Args.notNull(params, "HTTP parameters");
ConnPerRoute connPerRoute = (ConnPerRoute) params.getParameter(MAX_CONNECTIONS_PER_ROUTE);
if (connPerRoute == null) {
connPerRoute = DEFAULT_CONN_PER_ROUTE;
@@ -136,10 +126,7 @@ public final class ConnManagerParams imp
public static void setMaxTotalConnections(
final HttpParams params,
int maxTotalConnections) {
- if (params == null) {
- throw new IllegalArgumentException
- ("HTTP parameters must not be null.");
- }
+ Args.notNull(params, "HTTP parameters");
params.setIntParameter(MAX_TOTAL_CONNECTIONS, maxTotalConnections);
}
@@ -152,10 +139,7 @@ public final class ConnManagerParams imp
*/
public static int getMaxTotalConnections(
final HttpParams params) {
- if (params == null) {
- throw new IllegalArgumentException
- ("HTTP parameters must not be null.");
- }
+ Args.notNull(params, "HTTP parameters");
return params.getIntParameter(MAX_TOTAL_CONNECTIONS, DEFAULT_MAX_TOTAL_CONNECTIONS);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1423516&r1=1423515&r2=1423516&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java Tue Dec 18 16:22:58 2012
@@ -33,6 +33,7 @@ import org.apache.http.annotation.Thread
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.pool.ConnPoolControl;
+import org.apache.http.util.Args;
/**
* This class maintains a map of HTTP routes to maximum number of connections allowed
@@ -77,30 +78,18 @@ public final class ConnPerRouteBean impl
}
public void setDefaultMaxPerRoute(int max) {
- if (max < 1) {
- throw new IllegalArgumentException
- ("The maximum must be greater than 0.");
- }
+ Args.positive(max, "Defautl max per route");
this.defaultMax = max;
}
public void setMaxForRoute(final HttpRoute route, int max) {
- if (route == null) {
- throw new IllegalArgumentException
- ("HTTP route may not be null.");
- }
- if (max < 1) {
- throw new IllegalArgumentException
- ("The maximum must be greater than 0.");
- }
+ Args.notNull(route, "HTTP route");
+ Args.positive(max, "Max per route");
this.maxPerHostMap.put(route, Integer.valueOf(max));
}
public int getMaxForRoute(final HttpRoute route) {
- if (route == null) {
- throw new IllegalArgumentException
- ("HTTP route may not be null.");
- }
+ Args.notNull(route, "HTTP route");
Integer max = this.maxPerHostMap.get(route);
if (max != null) {
return max.intValue();