diff --git a/client/pom.xml b/client/pom.xml index d1f2f1e..51ac0fa 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ com.nesscomputing.components ness-httpclient-parent - 2.0.6-SNAPSHOT + 1.0-SNAPSHOT ness-httpclient @@ -14,10 +14,6 @@ jar Ness HTTP client component. - - ${project.parent.basedir} - - com.nesscomputing.components @@ -66,12 +62,7 @@ com.google.code.findbugs - jsr305 - - - - com.nesscomputing.testing - findbugs-annotations + annotations diff --git a/client/src/main/java/com/nesscomputing/httpclient/HttpClient.java b/client/src/main/java/com/nesscomputing/httpclient/HttpClient.java index 69d9b12..93e7736 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/HttpClient.java +++ b/client/src/main/java/com/nesscomputing/httpclient/HttpClient.java @@ -24,6 +24,7 @@ import javax.annotation.Nonnull; import com.google.common.base.Preconditions; + import com.nesscomputing.httpclient.factory.httpclient4.ApacheHttpClient4Factory; import com.nesscomputing.httpclient.internal.HttpClientFactory; import com.nesscomputing.httpclient.internal.HttpClientMethod; diff --git a/client/src/main/java/com/nesscomputing/httpclient/HttpClientRequest.java b/client/src/main/java/com/nesscomputing/httpclient/HttpClientRequest.java index 70dcf2e..26808cb 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/HttpClientRequest.java +++ b/client/src/main/java/com/nesscomputing/httpclient/HttpClientRequest.java @@ -29,17 +29,18 @@ import javax.annotation.Nonnull; import javax.servlet.http.Cookie; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; + import com.nesscomputing.httpclient.internal.HttpClientBodySource; import com.nesscomputing.httpclient.internal.HttpClientFactory; import com.nesscomputing.httpclient.internal.HttpClientHeader; import com.nesscomputing.httpclient.internal.HttpClientMethod; +import org.apache.commons.lang3.StringUtils; + /** * A request to a remote server. Composed step-by-step using a builder. @@ -433,7 +434,7 @@ public Builder setContent(Multimap kvPairs, String encoding sb.append(URLEncoder.encode(key, encoding)); sb.append('='); - if (key != null) { + if (value != null) { sb.append(URLEncoder.encode(value, encoding)); } } diff --git a/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponse.java b/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponse.java index 4ac6535..026934d 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponse.java +++ b/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponse.java @@ -15,74 +15,74 @@ */ package com.nesscomputing.httpclient; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.util.List; import java.util.Map; +import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; + /** Response from the remote server. */ public interface HttpClientResponse { - /** - * Returns the status code for the request. - * - * @return the status code, use the related {@link HttpServletRequest} constants - */ - int getStatusCode(); + /** + * Returns the status code for the request. + * + * @return the status code, use the related {@link HttpServletRequest} constants + */ + int getStatusCode(); - /** - * Returns the status text for the request. - * - * @return the status text - */ - String getStatusText(); + /** + * Returns the status text for the request. + * + * @return the status text + */ + String getStatusText(); - /** - * Returns an input stream for the response body. - * - * @return the input stream - * @throws IOException on error - */ - InputStream getResponseBodyAsStream() throws IOException; + /** + * Returns an input stream for the response body. + * + * @return the input stream + * @throws IOException on error + */ + InputStream getResponseBodyAsStream() throws IOException; - /** @return the URI of the request. */ - URI getUri(); + /** @return the URI of the request. */ + URI getUri(); - /** @return Content type of the response. */ - String getContentType(); + /** @return Content type of the response. */ + String getContentType(); - /** - * @return Length of the content, if present. Can be null (not present), -1 (chunked) or 0 (no - * content). - */ - @CheckForNull - Long getContentLength(); + /** + * @return Length of the content, if present. Can be null (not present), -1 (chunked) or 0 (no + * content). + */ + @CheckForNull + Long getContentLength(); - /** @return Content charset if present in the header. Can be null. */ - @CheckForNull - String getCharset(); + /** @return Content charset if present in the header. Can be null. */ + @CheckForNull + String getCharset(); - /** - * @param name the header name - * @return The named header from the response. Response can be null. - */ - @CheckForNull - String getHeader(String name); + /** + * @param name the header name + * @return The named header from the response. Response can be null. + */ + @CheckForNull + String getHeader(String name); - /** - * @param name the header name - * @return all values for the given header. Response can be null. - */ - @CheckForNull - List getHeaders(String name); + /** + * @param name the header name + * @return all values for the given header. Response can be null. + */ + @CheckForNull + List getHeaders(String name); - /** @return Map of header name -> list of values for each header name */ + /** @return Map of header name -> list of values for each header name */ @Nonnull - public Map> getAllHeaders(); + Map> getAllHeaders(); - /** @return true if the response redirects to another object. */ - boolean isRedirected(); + /** @return true if the response redirects to another object. */ + boolean isRedirected(); } diff --git a/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponseHandler.java b/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponseHandler.java index d23e1c0..ab94c71 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponseHandler.java +++ b/client/src/main/java/com/nesscomputing/httpclient/HttpClientResponseHandler.java @@ -19,7 +19,7 @@ /** * A content handler. It parses the response from the server and generates the - * content object. + * content object. */ public interface HttpClientResponseHandler { diff --git a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/ApacheHttpClient4Factory.java b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/ApacheHttpClient4Factory.java index 8092a50..749132c 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/ApacheHttpClient4Factory.java +++ b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/ApacheHttpClient4Factory.java @@ -38,6 +38,21 @@ import com.google.common.base.Preconditions; import com.google.common.net.HttpHeaders; +import com.nesscomputing.httpclient.HttpClientAuthProvider; +import com.nesscomputing.httpclient.HttpClientConnectionContext; +import com.nesscomputing.httpclient.HttpClientDefaults; +import com.nesscomputing.httpclient.HttpClientObserver; +import com.nesscomputing.httpclient.HttpClientRequest; +import com.nesscomputing.httpclient.HttpClientResponse; +import com.nesscomputing.httpclient.HttpClientResponseHandler; +import com.nesscomputing.httpclient.internal.AlwaysTrustServerTrustManager; +import com.nesscomputing.httpclient.internal.HttpClientBodySource; +import com.nesscomputing.httpclient.internal.HttpClientFactory; +import com.nesscomputing.httpclient.internal.HttpClientHeader; +import com.nesscomputing.httpclient.internal.HttpClientTrustManagerFactory; +import com.nesscomputing.httpclient.internal.MultiTrustManager; +import com.nesscomputing.logging.Log; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.Charsets; import org.apache.commons.lang3.StringUtils; @@ -74,21 +89,6 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; -import com.nesscomputing.httpclient.HttpClientAuthProvider; -import com.nesscomputing.httpclient.HttpClientConnectionContext; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientObserver; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.HttpClientResponseHandler; -import com.nesscomputing.httpclient.internal.AlwaysTrustServerTrustManager; -import com.nesscomputing.httpclient.internal.HttpClientBodySource; -import com.nesscomputing.httpclient.internal.HttpClientFactory; -import com.nesscomputing.httpclient.internal.HttpClientHeader; -import com.nesscomputing.httpclient.internal.HttpClientTrustManagerFactory; -import com.nesscomputing.httpclient.internal.MultiTrustManager; -import com.nesscomputing.logging.Log; - /** Apache HttpClient4 based implementation of {@link HttpClientFactory}. */ public class ApacheHttpClient4Factory implements HttpClientFactory { diff --git a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalCredentialsProvider.java b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalCredentialsProvider.java index 03e1bc6..81926bb 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalCredentialsProvider.java +++ b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalCredentialsProvider.java @@ -19,13 +19,13 @@ import java.security.Principal; import java.util.List; +import com.nesscomputing.httpclient.HttpClientAuthProvider; + import org.apache.http.auth.AuthScope; import org.apache.http.auth.BasicUserPrincipal; import org.apache.http.auth.Credentials; import org.apache.http.client.CredentialsProvider; -import com.nesscomputing.httpclient.HttpClientAuthProvider; - /** * An Apache Httpclient credentials provider that uses the internal structures of the tc-httpclient to provide * credentials. diff --git a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalHttpBodySource.java b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalHttpBodySource.java index c408fb6..cbd5d57 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalHttpBodySource.java +++ b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalHttpBodySource.java @@ -16,13 +16,13 @@ package com.nesscomputing.httpclient.factory.httpclient4; -import org.apache.http.HttpEntity; -import org.apache.http.entity.AbstractHttpEntity; +import java.io.IOException; +import java.io.InputStream; import com.nesscomputing.httpclient.internal.HttpClientBodySource; -import java.io.IOException; -import java.io.InputStream; +import org.apache.http.HttpEntity; +import org.apache.http.entity.AbstractHttpEntity; /** diff --git a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponse.java b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponse.java index aa8aa37..71c0a3b 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponse.java +++ b/client/src/main/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponse.java @@ -15,9 +15,6 @@ */ package com.nesscomputing.httpclient.factory.httpclient4; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.logging.Log; - import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -28,6 +25,11 @@ import javax.annotation.Nonnull; +import com.google.common.collect.Lists; + +import com.nesscomputing.httpclient.HttpClientResponse; +import com.nesscomputing.logging.Log; + import org.apache.commons.io.input.NullInputStream; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; @@ -38,8 +40,6 @@ import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.util.EntityUtils; -import com.google.common.collect.Lists; - /** * Apache HttpClient4 implementation of {@link HttpClientResponse}. */ @@ -124,9 +124,9 @@ public List getHeaders(final String name) return values; } - @Override + @Override @Nonnull - public Map> getAllHeaders() { + public Map> getAllHeaders() { Map> headerMap = new TreeMap>(String.CASE_INSENSITIVE_ORDER); @@ -196,8 +196,8 @@ public boolean isRedirected() @Override public String toString() { return String.format("InternalResponse [getContentType()=%s, getContentLength()=%s," + - " getCharset()=%s, getAllHeaders()=%s, getStatusCode()=%s," + - " getStatusText()=%s, getUri()=%s, isRedirected()=%s]", + " getCharset()=%s, getAllHeaders()=%s, getStatusCode()=%s," + + " getStatusText()=%s, getUri()=%s, isRedirected()=%s]", getContentType(), getContentLength(), getCharset(), getAllHeaders(), getStatusCode(), getStatusText(), getUri(), isRedirected()); diff --git a/client/src/main/java/com/nesscomputing/httpclient/internal/AlwaysTrustServerTrustManager.java b/client/src/main/java/com/nesscomputing/httpclient/internal/AlwaysTrustServerTrustManager.java index 172ae5c..a2152e0 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/internal/AlwaysTrustServerTrustManager.java +++ b/client/src/main/java/com/nesscomputing/httpclient/internal/AlwaysTrustServerTrustManager.java @@ -15,10 +15,11 @@ */ package com.nesscomputing.httpclient.internal; -import javax.net.ssl.X509TrustManager; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import javax.net.ssl.X509TrustManager; + /** * A wrapper around another X509TrustManager that always trusts server certificates. */ diff --git a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientFactory.java b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientFactory.java index 2af8bb6..9833c0a 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientFactory.java +++ b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientFactory.java @@ -38,17 +38,17 @@ public interface HttpClientFactory * Stop the Factory. Should free all resources and shut down all connections. After stop() has been called, * the factory should throw exceptions on all related method calls. */ - void stop(); + void stop(); - /** - * True if the start() method was invoked successfully. - */ - boolean isStarted(); + /** + * True if the start() method was invoked successfully. + */ + boolean isStarted(); /** * True if the stop() method was invoked successfully. */ - boolean isStopped(); + boolean isStopped(); /** * @return a {@link HttpClientConnectionContext} object to modify settings for this factory. @@ -59,7 +59,7 @@ public interface HttpClientFactory * For requests that accept a body, generate a {@link HttpClientBodySource} object that wraps * the content object. Can return null if no appropriate body source is available. */ - @CheckForNull + @CheckForNull HttpClientBodySource getHttpBodySourceFor(Object content); /** diff --git a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientHeader.java b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientHeader.java index 9a92195..875434b 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientHeader.java +++ b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientHeader.java @@ -28,9 +28,9 @@ public class HttpClientHeader /** * Create a new header. - * @param name header name - * @param value header value - */ + * @param name header name + * @param value header value + */ public HttpClientHeader(final String name, final String value) { this.name = name; diff --git a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientTrustManagerFactory.java b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientTrustManagerFactory.java index 2123d2f..5a0c63c 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientTrustManagerFactory.java +++ b/client/src/main/java/com/nesscomputing/httpclient/internal/HttpClientTrustManagerFactory.java @@ -15,9 +15,6 @@ */ package com.nesscomputing.httpclient.internal; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.logging.Log; - import java.io.IOException; import java.net.URL; import java.security.GeneralSecurityException; @@ -32,11 +29,14 @@ import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Preconditions; import com.google.common.io.Resources; +import com.nesscomputing.httpclient.HttpClientDefaults; +import com.nesscomputing.logging.Log; + +import org.apache.commons.lang3.StringUtils; + public final class HttpClientTrustManagerFactory { private static final Log LOG = Log.findLog(); diff --git a/client/src/main/java/com/nesscomputing/httpclient/io/SizeLimitingInputStream.java b/client/src/main/java/com/nesscomputing/httpclient/io/SizeLimitingInputStream.java index 61e18cc..19661b7 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/io/SizeLimitingInputStream.java +++ b/client/src/main/java/com/nesscomputing/httpclient/io/SizeLimitingInputStream.java @@ -49,7 +49,7 @@ public SizeLimitingInputStream(final InputStream in, final int limit) throws IOE } } - private final void ensureLimit() + private void ensureLimit() throws SizeExceededException { if (count > maxSize) { @@ -57,7 +57,7 @@ private final void ensureLimit() } } - private final void throwException() + private void throwException() throws SizeExceededException { throw new SizeExceededException("SizeLimitInputStream: maximum size %d exceeded, actual = %d", maxSize, count); diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/AbstractErrorHandlingContentConverter.java b/client/src/main/java/com/nesscomputing/httpclient/response/AbstractErrorHandlingContentConverter.java index c0311e9..50e39fe 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/AbstractErrorHandlingContentConverter.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/AbstractErrorHandlingContentConverter.java @@ -15,16 +15,17 @@ */ package com.nesscomputing.httpclient.response; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.logging.Log; - import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.Charset; + import com.google.common.base.Charsets; import com.google.common.base.Objects; +import com.nesscomputing.httpclient.HttpClientResponse; +import com.nesscomputing.logging.Log; + import org.apache.commons.io.IOUtils; /** diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/ContentResponseHandler.java b/client/src/main/java/com/nesscomputing/httpclient/response/ContentResponseHandler.java index de7be4f..8dde84e 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/ContentResponseHandler.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/ContentResponseHandler.java @@ -21,17 +21,17 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import net.jpountz.lz4.LZ4BlockInputStream; - -import org.apache.commons.io.input.NullInputStream; -import org.apache.commons.lang3.StringUtils; - import com.nesscomputing.httpclient.HttpClientResponse; import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.io.SizeExceededException; import com.nesscomputing.httpclient.io.SizeLimitingInputStream; import com.nesscomputing.logging.Log; +import net.jpountz.lz4.LZ4BlockInputStream; + +import org.apache.commons.io.input.NullInputStream; +import org.apache.commons.lang3.StringUtils; + /** * A generic content response handler for the Http Client. It handles all cases of redirect, compressed responses etc. diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/HttpResponseContentConverter.java b/client/src/main/java/com/nesscomputing/httpclient/response/HttpResponseContentConverter.java index bdf68c4..1b86666 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/HttpResponseContentConverter.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/HttpResponseContentConverter.java @@ -16,18 +16,19 @@ package com.nesscomputing.httpclient.response; -import org.apache.commons.io.IOUtils; - -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; -import com.nesscomputing.httpclient.HttpClientResponse; - import java.io.IOException; import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; + +import com.nesscomputing.httpclient.HttpClientResponse; + +import org.apache.commons.io.IOUtils; + /** * ContentConverter implementation that exposes the response directly. */ diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/NumberContentConverter.java b/client/src/main/java/com/nesscomputing/httpclient/response/NumberContentConverter.java index 2b46c62..7aa1435 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/NumberContentConverter.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/NumberContentConverter.java @@ -17,9 +17,6 @@ import static java.lang.String.format; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.logging.Log; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -33,6 +30,9 @@ import com.google.common.io.CharStreams; import com.google.common.io.Closeables; +import com.nesscomputing.httpclient.HttpClientResponse; +import com.nesscomputing.logging.Log; + /** * A basic implementation of ContentConverter that returns a number. */ diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/StringContentConverter.java b/client/src/main/java/com/nesscomputing/httpclient/response/StringContentConverter.java index ba7027d..e424431 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/StringContentConverter.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/StringContentConverter.java @@ -15,7 +15,6 @@ */ package com.nesscomputing.httpclient.response; -import com.nesscomputing.httpclient.HttpClientResponse; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -27,6 +26,8 @@ import com.google.common.io.CharStreams; import com.google.common.io.Closeables; +import com.nesscomputing.httpclient.HttpClientResponse; + /** * A basic implementation of ContentConverter when you only want a string back. */ diff --git a/client/src/main/java/com/nesscomputing/httpclient/response/Valid2xxContentConverter.java b/client/src/main/java/com/nesscomputing/httpclient/response/Valid2xxContentConverter.java index 41f0877..c22adeb 100644 --- a/client/src/main/java/com/nesscomputing/httpclient/response/Valid2xxContentConverter.java +++ b/client/src/main/java/com/nesscomputing/httpclient/response/Valid2xxContentConverter.java @@ -15,12 +15,13 @@ */ package com.nesscomputing.httpclient.response; -import com.nesscomputing.httpclient.HttpClientResponse; import java.io.IOException; import java.io.InputStream; import javax.annotation.concurrent.Immutable; +import com.nesscomputing.httpclient.HttpClientResponse; + /** * Returns true for a 200/201/204 response code, false otherwise. Can be set to explode if response code != 200/201/204. */ diff --git a/client/src/test/java/com/nesscomputing/httpclient/AbstractTestHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/AbstractTestHttpClient.java index 61b6a02..fe63f44 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/AbstractTestHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/AbstractTestHttpClient.java @@ -19,19 +19,16 @@ import java.io.IOException; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) public abstract class AbstractTestHttpClient diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestAlwaysTrustServerSSLCert.java b/client/src/test/java/com/nesscomputing/httpclient/TestAlwaysTrustServerSSLCert.java index 1679c6e..bc05278 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestAlwaysTrustServerSSLCert.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestAlwaysTrustServerSSLCert.java @@ -16,24 +16,22 @@ package com.nesscomputing.httpclient; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.fail; + +import java.io.IOException; + +import javax.net.ssl.SSLException; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import javax.net.ssl.SSLPeerUnverifiedException; -import java.io.IOException; - -import static org.junit.Assert.fail; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) public class TestAlwaysTrustServerSSLCert { @@ -66,8 +64,8 @@ public void testWithServerCertVerificationEnabled() throws IOException { final String uri = "https://" + localHttpService.getHost() + ":" + localHttpService.getPort() + "/data"; httpClient.get(uri, responseHandler).perform(); fail(); - } catch (SSLPeerUnverifiedException ignored) { - // success + } catch (SSLException e) { + // ignore } } diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthHttpClient.java index f8ac86d..0454ac7 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthHttpClient.java @@ -16,13 +16,11 @@ package com.nesscomputing.httpclient; +import com.nesscomputing.httpclient.testsupport.LocalHttpService; + import org.junit.Assert; import org.junit.Before; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.testsupport.LocalHttpService; - public class TestBasicAuthHttpClient extends AbstractTestHttpClient { diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthSSLHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthSSLHttpClient.java index 41d4d70..8c69e00 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthSSLHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestBasicAuthSSLHttpClient.java @@ -17,9 +17,7 @@ import com.google.common.io.Resources; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientRequest; + import com.nesscomputing.httpclient.testsupport.LocalHttpService; import org.junit.Assert; diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestCharset.java b/client/src/test/java/com/nesscomputing/httpclient/TestCharset.java index d14917a..c6a38ee 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestCharset.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestCharset.java @@ -20,19 +20,16 @@ import java.io.IOException; import java.io.InputStream; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestContentLength.java b/client/src/test/java/com/nesscomputing/httpclient/TestContentLength.java index 9a6332d..c8bcf03 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestContentLength.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestContentLength.java @@ -22,19 +22,16 @@ import java.io.IOException; import java.io.InputStream; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestFallbackManager.java b/client/src/test/java/com/nesscomputing/httpclient/TestFallbackManager.java index 46806f1..1056061 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestFallbackManager.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestFallbackManager.java @@ -19,92 +19,90 @@ import java.io.IOException; -import javax.net.ssl.SSLPeerUnverifiedException; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import javax.net.ssl.SSLException; import com.google.common.io.Resources; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientResponseHandler; + import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"*:443"}) public class TestFallbackManager { - private HttpClientResponseHandler responseHandler = - new ContentResponseHandler(new StringResponseConverter()); - protected HttpClient httpClient = null; - - @After - public void tearDown() { - Assert.assertNotNull(httpClient); - httpClient.close(); - httpClient = null; - } - - @Test - public void testNoFallback() throws IOException { - - final HttpClientDefaults defaults = new HttpClientDefaults() { - @Override - public String getSSLTruststore() { - return Resources.getResource(this.getClass(), "/test-httpclient-keystore.jks") - .toString(); - } - - @Override - public String getSSLTruststorePassword() { - return "verysecret"; - } - - @Override - public boolean useSSLTruststoreFallback() { - return false; - } - }; - - httpClient = new HttpClient(defaults).start(); - - try { - final String uri = "https://encrypted.google.com/"; - httpClient.get(uri, responseHandler).perform(); - fail(); - } catch (SSLPeerUnverifiedException ignored) { - // success - } - } - - @Test - public void testWithFallback() throws IOException { - - final HttpClientDefaults defaults = new HttpClientDefaults() { - @Override - public String getSSLTruststore() { - return Resources.getResource(this.getClass(), "/test-httpclient-keystore.jks") - .toString(); - } - - @Override - public String getSSLTruststorePassword() { - return "verysecret"; - } - - @Override - public boolean useSSLTruststoreFallback() { - return true; - } - }; - - httpClient = new HttpClient(defaults).start(); - - final String uri = "https://encrypted.google.com/"; - final String response = httpClient.get(uri, responseHandler).perform(); - Assert.assertNotNull(response); - } + private HttpClientResponseHandler responseHandler = + new ContentResponseHandler(new StringResponseConverter()); + protected HttpClient httpClient = null; + + @After + public void tearDown() { + Assert.assertNotNull(httpClient); + httpClient.close(); + httpClient = null; + } + + @Test + public void testNoFallback() throws IOException { + + final HttpClientDefaults defaults = new HttpClientDefaults() { + @Override + public String getSSLTruststore() { + return Resources.getResource(this.getClass(), "/test-httpclient-keystore.jks") + .toString(); + } + + @Override + public String getSSLTruststorePassword() { + return "verysecret"; + } + + @Override + public boolean useSSLTruststoreFallback() { + return false; + } + }; + + httpClient = new HttpClient(defaults).start(); + + try { + final String uri = "https://encrypted.google.com/"; + httpClient.get(uri, responseHandler).perform(); + fail(); + } catch (SSLException e) { + // ignore + } + } + + @Test + public void testWithFallback() throws IOException { + + final HttpClientDefaults defaults = new HttpClientDefaults() { + @Override + public String getSSLTruststore() { + return Resources.getResource(this.getClass(), "/test-httpclient-keystore.jks") + .toString(); + } + + @Override + public String getSSLTruststorePassword() { + return "verysecret"; + } + + @Override + public boolean useSSLTruststoreFallback() { + return true; + } + }; + + httpClient = new HttpClient(defaults).start(); + + final String uri = "https://encrypted.google.com/"; + final String response = httpClient.get(uri, responseHandler).perform(); + Assert.assertNotNull(response); + } } diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/TestHttpClient.java index 5760f44..0bbed9d 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestHttpClient.java @@ -16,13 +16,11 @@ package com.nesscomputing.httpclient; +import com.nesscomputing.httpclient.testsupport.LocalHttpService; + import org.junit.Assert; import org.junit.Before; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.testsupport.LocalHttpService; - public class TestHttpClient extends AbstractTestHttpClient { diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestObserverExtension.java b/client/src/test/java/com/nesscomputing/httpclient/TestObserverExtension.java index 7a8ea46..cdce717 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestObserverExtension.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestObserverExtension.java @@ -31,12 +31,6 @@ import com.google.inject.Stage; import com.google.inject.name.Named; -import org.eclipse.jetty.server.Request; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.nesscomputing.config.ConfigModule; import com.nesscomputing.httpclient.HttpClientRequest.Builder; import com.nesscomputing.httpclient.guice.HttpClientModule; @@ -48,7 +42,13 @@ import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; import com.nesscomputing.logging.Log; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.eclipse.jetty.server.Request; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) public class TestObserverExtension { diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestObserverGroups.java b/client/src/test/java/com/nesscomputing/httpclient/TestObserverGroups.java index 254ed05..d47b6e7 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestObserverGroups.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestObserverGroups.java @@ -26,15 +26,15 @@ import com.google.inject.Inject; import com.google.inject.name.Named; -import org.easymock.EasyMock; -import org.junit.Test; - import com.nesscomputing.config.ConfigModule; import com.nesscomputing.httpclient.factory.httpclient4.ApacheHttpClient4Factory; import com.nesscomputing.httpclient.factory.httpclient4.ApacheHttpClientAccess; import com.nesscomputing.httpclient.guice.HttpClientModule; import com.nesscomputing.httpclient.internal.HttpClientFactory; +import org.easymock.EasyMock; +import org.junit.Test; + public class TestObserverGroups { diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestReading.java b/client/src/test/java/com/nesscomputing/httpclient/TestReading.java index c4af82c..d4aeca7 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestReading.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestReading.java @@ -20,17 +20,15 @@ import java.io.IOException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericReadingHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) public class TestReading { diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerHttpClient.java index 1dbd472..4971308 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerHttpClient.java @@ -17,9 +17,7 @@ import com.google.common.io.Resources; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientRequest; + import com.nesscomputing.httpclient.testsupport.LocalHttpService; import org.junit.Assert; diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerSSLClientCertHttpClient.java b/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerSSLClientCertHttpClient.java index 288920f..01d8e98 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerSSLClientCertHttpClient.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestSSLServerSSLClientCertHttpClient.java @@ -17,9 +17,7 @@ import com.google.common.io.Resources; -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaults; -import com.nesscomputing.httpclient.HttpClientRequest; + import com.nesscomputing.httpclient.testsupport.LocalHttpService; import org.junit.Assert; diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestVariousThings.java b/client/src/test/java/com/nesscomputing/httpclient/TestVariousThings.java index e0c4634..e57fbab 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestVariousThings.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestVariousThings.java @@ -19,27 +19,22 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; - import java.io.IOException; import java.util.List; import javax.servlet.http.Cookie; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.internal.HttpClientHeader; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestWriting.java b/client/src/test/java/com/nesscomputing/httpclient/TestWriting.java index e4366ed..aaa109d 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestWriting.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestWriting.java @@ -19,19 +19,16 @@ import java.io.IOException; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericWritingContentHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) diff --git a/client/src/test/java/com/nesscomputing/httpclient/TestWrongCredentials.java b/client/src/test/java/com/nesscomputing/httpclient/TestWrongCredentials.java index 5a5fa91..338f2ac 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/TestWrongCredentials.java +++ b/client/src/test/java/com/nesscomputing/httpclient/TestWrongCredentials.java @@ -21,19 +21,16 @@ import javax.servlet.http.HttpServletResponse; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientDefaultAuthProvider; -import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.testsupport.GenericTestHandler; import com.nesscomputing.httpclient.testsupport.LocalHttpService; import com.nesscomputing.httpclient.testsupport.StringResponseConverter; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowNetworkAccess(endpoints={"127.0.0.1:*"}) public class TestWrongCredentials diff --git a/client/src/test/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponseTest.java b/client/src/test/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponseTest.java index d7f78ad..f7f05de 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponseTest.java +++ b/client/src/test/java/com/nesscomputing/httpclient/factory/httpclient4/InternalResponseTest.java @@ -16,10 +16,15 @@ package com.nesscomputing.httpclient.factory.httpclient4; +import static org.junit.Assert.assertEquals; + +import java.util.List; +import java.util.Map; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.factory.httpclient4.InternalResponse; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -31,11 +36,6 @@ import org.apache.http.message.BasicStatusLine; import org.junit.Test; -import java.util.List; -import java.util.Map; - -import static org.junit.Assert.assertEquals; - public class InternalResponseTest { @Test diff --git a/client/src/test/java/com/nesscomputing/httpclient/guice/TestGuiceModule.java b/client/src/test/java/com/nesscomputing/httpclient/guice/TestGuiceModule.java index 84a13fe..9d9fea7 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/guice/TestGuiceModule.java +++ b/client/src/test/java/com/nesscomputing/httpclient/guice/TestGuiceModule.java @@ -25,9 +25,6 @@ import com.google.inject.Stage; import com.google.inject.name.Names; -import org.junit.Assert; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.httpclient.HttpClient; @@ -35,6 +32,9 @@ import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; +import org.junit.Assert; +import org.junit.Test; + public class TestGuiceModule { private static final Module ENFORCEMENT_MODULE = new Module() { diff --git a/client/src/test/java/com/nesscomputing/httpclient/response/TestStreamedJsonContentConverter.java b/client/src/test/java/com/nesscomputing/httpclient/response/TestStreamedJsonContentConverter.java index a4a5493..0867d73 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/response/TestStreamedJsonContentConverter.java +++ b/client/src/test/java/com/nesscomputing/httpclient/response/TestStreamedJsonContentConverter.java @@ -27,14 +27,14 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.easymock.EasyMock; -import org.junit.Test; - import com.nesscomputing.callback.Callback; import com.nesscomputing.callback.CallbackCollector; import com.nesscomputing.callback.CallbackRefusedException; import com.nesscomputing.httpclient.HttpClientResponse; +import org.easymock.EasyMock; +import org.junit.Test; + public class TestStreamedJsonContentConverter { private static final TypeReference INT_TYPE_REF = new TypeReference() {}; diff --git a/client/src/test/java/com/nesscomputing/httpclient/response/TestStringContentConverter.java b/client/src/test/java/com/nesscomputing/httpclient/response/TestStringContentConverter.java index bc4be9b..4308829 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/response/TestStringContentConverter.java +++ b/client/src/test/java/com/nesscomputing/httpclient/response/TestStringContentConverter.java @@ -16,16 +16,14 @@ package com.nesscomputing.httpclient.response; -import org.junit.Assert; -import org.junit.Before; - import com.nesscomputing.httpclient.AbstractTestHttpClient; import com.nesscomputing.httpclient.HttpClient; import com.nesscomputing.httpclient.HttpClientRequest; -import com.nesscomputing.httpclient.response.ContentResponseHandler; -import com.nesscomputing.httpclient.response.StringContentConverter; import com.nesscomputing.httpclient.testsupport.LocalHttpService; +import org.junit.Assert; +import org.junit.Before; + public class TestStringContentConverter extends AbstractTestHttpClient { @Before diff --git a/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericReadingHandler.java b/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericReadingHandler.java index 4e14a88..3e0aca6 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericReadingHandler.java +++ b/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericReadingHandler.java @@ -25,11 +25,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.nesscomputing.httpclient.internal.HttpClientHeader; + import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; -import com.nesscomputing.httpclient.internal.HttpClientHeader; - public class GenericReadingHandler extends AbstractHandler { diff --git a/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericTestHandler.java b/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericTestHandler.java index 3f3576a..bab744e 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericTestHandler.java +++ b/client/src/test/java/com/nesscomputing/httpclient/testsupport/GenericTestHandler.java @@ -29,11 +29,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.nesscomputing.httpclient.internal.HttpClientHeader; + import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; -import com.nesscomputing.httpclient.internal.HttpClientHeader; - public class GenericTestHandler extends AbstractHandler { diff --git a/client/src/test/java/com/nesscomputing/httpclient/testsupport/LocalHttpService.java b/client/src/test/java/com/nesscomputing/httpclient/testsupport/LocalHttpService.java index 4d9b806..038b124 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/testsupport/LocalHttpService.java +++ b/client/src/test/java/com/nesscomputing/httpclient/testsupport/LocalHttpService.java @@ -21,6 +21,8 @@ import javax.security.auth.Subject; +import com.google.common.io.Resources; + import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.security.DefaultIdentityService; import org.eclipse.jetty.security.IdentityService; @@ -39,9 +41,7 @@ import org.eclipse.jetty.util.security.Credential; import org.eclipse.jetty.util.security.Password; import org.eclipse.jetty.util.ssl.SslContextFactory; - -import com.google.common.io.Resources; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports={0}) public class LocalHttpService diff --git a/client/src/test/java/com/nesscomputing/httpclient/testsupport/StringResponseConverter.java b/client/src/test/java/com/nesscomputing/httpclient/testsupport/StringResponseConverter.java index 579bced..01ea237 100644 --- a/client/src/test/java/com/nesscomputing/httpclient/testsupport/StringResponseConverter.java +++ b/client/src/test/java/com/nesscomputing/httpclient/testsupport/StringResponseConverter.java @@ -24,12 +24,12 @@ import javax.annotation.concurrent.Immutable; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.IOUtils; -import org.junit.Assert; - import com.nesscomputing.httpclient.HttpClientResponse; import com.nesscomputing.httpclient.response.ContentConverter; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; + @Immutable public class StringResponseConverter implements ContentConverter diff --git a/pom.xml b/pom.xml index 78d6825..b1a6948 100644 --- a/pom.xml +++ b/pom.xml @@ -5,148 +5,16 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 26 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-httpclient.git - scm:git:git@github.com:NessComputing/components-ness-httpclient.git - http://github.com/NessComputing/components-ness-httpclient - HEAD - - com.nesscomputing.components ness-httpclient-parent - 2.0.6-SNAPSHOT pom client testing - - - 2.1.2 - 1.16 - 8.1.3.v20120416 - - - - - - com.nesscomputing.components - ness-httpclient - ${project.version} - - - - com.nesscomputing.components - ness-httpclient-testing - ${project.version} - - - - com.nesscomputing.components - ness-core - 1.5.0 - - - - com.nesscomputing.components - ness-lifecycle - 1.2.2 - - - - com.nesscomputing.components - ness-logging - 1.1.1 - - - - com.nesscomputing.components - ness-config - 2.2.0 - - - - com.nesscomputing.testing - findbugs-annotations - 2.0.0 - - - - org.apache.httpcomponents - httpclient - 4.1.3 - - - - org.apache.httpcomponents - httpcore - 4.1.4 - - - - net.jpountz.lz4 - lz4 - 1.2.0 - - - - com.sun.jersey - jersey-core - ${dep.jersey.version} - - - - com.sun.jersey - jersey-server - ${dep.jersey.version} - - - - com.fasterxml.jackson.core - jackson-databind - ${dep.jackson.version} - - - - com.fasterxml.jackson.core - jackson-core - ${dep.jackson.version} - - - - org.eclipse.jetty - jetty-http - ${dep.jetty.version} - - - - org.eclipse.jetty - jetty-util - ${dep.jetty.version} - - - - org.eclipse.jetty - jetty-server - ${dep.jetty.version} - - - org.eclipse.jetty.orbit - javax.servlet - - - - - - org.eclipse.jetty - jetty-security - ${dep.jetty.version} - - - diff --git a/testing/pom.xml b/testing/pom.xml index 6e7b090..4e2246f 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -6,7 +6,7 @@ com.nesscomputing.components ness-httpclient-parent - 2.0.6-SNAPSHOT + 1.0-SNAPSHOT ness-httpclient-testing @@ -14,10 +14,6 @@ jar Ness HTTP client testing component. - - ${project.parent.basedir} - - com.nesscomputing.components @@ -41,7 +37,7 @@ com.google.code.findbugs - jsr305 + annotations diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/ExceptionResponseGenerator.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/ExceptionResponseGenerator.java index 826c14c..0898ac0 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/ExceptionResponseGenerator.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/ExceptionResponseGenerator.java @@ -35,6 +35,6 @@ public class ExceptionResponseGenerator implements ResponseGenerator { @Override public HttpClientResponse respondTo(HttpClientRequest request) throws IOException { - throw io; + throw io; } } diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/FixedResponseGenerator.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/FixedResponseGenerator.java index d87ed2c..9d50ab3 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/FixedResponseGenerator.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/FixedResponseGenerator.java @@ -26,6 +26,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import com.nesscomputing.httpclient.HttpClientRequest; import com.nesscomputing.httpclient.HttpClientResponse; diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/JaxRsResponseHttpResponseGenerator.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/JaxRsResponseHttpResponseGenerator.java index 6ad67d9..e2ea048 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/JaxRsResponseHttpResponseGenerator.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/JaxRsResponseHttpResponseGenerator.java @@ -39,11 +39,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.apache.commons.lang3.ObjectUtils; - import com.nesscomputing.httpclient.HttpClientRequest; import com.nesscomputing.httpclient.HttpClientResponse; +import org.apache.commons.lang3.ObjectUtils; + /** * An all-purpose {@link ResponseGenerator} which supports converting JAX-RS {@link Response} * objects into the actual {@link HttpClientResponse} that you might expect to see. diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/RegexPathMatcher.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/RegexPathMatcher.java index a6a75f9..d874cda 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/RegexPathMatcher.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/RegexPathMatcher.java @@ -17,13 +17,14 @@ import java.util.regex.Pattern; -import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.commons.lang3.builder.EqualsBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; import com.nesscomputing.httpclient.HttpClientRequest; import com.nesscomputing.httpclient.internal.HttpClientMethod; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; + /** * Matches a regex (or any regex if null) and a regexp for the path. */ diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/RequestMatcher.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/RequestMatcher.java index 6e3d38b..bb933ad 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/RequestMatcher.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/RequestMatcher.java @@ -17,6 +17,7 @@ import com.google.common.base.Predicate; + import com.nesscomputing.httpclient.HttpClientRequest; public interface RequestMatcher extends Predicate> { } diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilder.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilder.java index d9c2d96..47e34bd 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilder.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilder.java @@ -22,7 +22,6 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; -import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientFactory.java b/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientFactory.java index 786dd8d..117a851 100644 --- a/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientFactory.java +++ b/testing/src/main/java/com/nesscomputing/httpclient/testing/TestingHttpClientFactory.java @@ -25,15 +25,12 @@ import javax.annotation.concurrent.Immutable; -import org.apache.commons.lang3.ObjectUtils; - import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.nesscomputing.httpclient.HttpClient; import com.nesscomputing.httpclient.HttpClientConnectionContext; import com.nesscomputing.httpclient.HttpClientObserver; import com.nesscomputing.httpclient.HttpClientRequest; @@ -43,6 +40,8 @@ import com.nesscomputing.httpclient.internal.HttpClientHeader; import com.nesscomputing.logging.Log; +import org.apache.commons.lang3.ObjectUtils; + /** * The actual dispatch logic behind a test {@link HttpClient}. Implements request matching * and delegates to the matched {@link ResponseGenerator}. The clients returned never need to diff --git a/testing/src/test/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilderTest.java b/testing/src/test/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilderTest.java index ed7b9a1..7e3a42f 100644 --- a/testing/src/test/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilderTest.java +++ b/testing/src/test/java/com/nesscomputing/httpclient/testing/TestingHttpClientBuilderTest.java @@ -17,6 +17,7 @@ import static com.nesscomputing.httpclient.internal.HttpClientMethod.GET; import static com.nesscomputing.httpclient.internal.HttpClientMethod.PUT; + import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; @@ -39,16 +40,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; -import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.io.IOUtils; -import org.junit.Test; - import com.nesscomputing.httpclient.HttpClient; import com.nesscomputing.httpclient.HttpClientRequest; import com.nesscomputing.httpclient.HttpClientResponse; import com.nesscomputing.httpclient.internal.HttpClientBodySource; import com.nesscomputing.httpclient.internal.HttpClientMethod; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.IOUtils; +import org.junit.Test; + /** * This pretty well doubles as an example use case of the {@link TestingHttpClientBuilder}. */