From 473c278983a8617ab21581762be85e8d7039b81e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 28 Jun 2017 11:53:33 -0400 Subject: [PATCH] Fixing code formatting --- ...cheHttpClientConnectionManagerFactory.java | 4 +-- .../httpclient/ApacheHttpClientFactory.java | 6 ++-- ...cheHttpClientConnectionManagerFactory.java | 15 +++++----- .../DefaultApacheHttpClientFactory.java | 9 +++--- .../CustomHttpClientConfigurationTests.java | 26 ++++++++++------- ...tpClientConnectionManagerFactoryTests.java | 28 +++++++++++-------- .../DefaultApacheHttpClientFactoryTests.java | 12 ++++---- .../DefaultHttpClientConfigurationTests.java | 6 ++-- 8 files changed, 60 insertions(+), 46 deletions(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java index 55e1b167..5c97d8e6 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientConnectionManagerFactory.java @@ -42,6 +42,6 @@ public interface ApacheHttpClientConnectionManagerFactory { * @return A new {@link HttpClientConnectionManager} */ public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, - int maxTotalConnections, int maxConnectionsPerRoute, - long timeToLive, TimeUnit timeUnit, RegistryBuilder registryBuilder); + int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, + TimeUnit timeUnit, RegistryBuilder registryBuilder); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientFactory.java index 6dfa3a3c..cbd501b9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/ApacheHttpClientFactory.java @@ -31,8 +31,10 @@ public interface ApacheHttpClientFactory { /** * Creates a new {@link CloseableHttpClient}. * @param requestConfig Configuration to be used for all requests by default - * @param connectionManager The {@link HttpClientConnectionManager} to use for the client + * @param connectionManager The {@link HttpClientConnectionManager} to use for the + * client * @return A new {@link CloseableHttpClient} */ - public CloseableHttpClient createClient(RequestConfig requestConfig, HttpClientConnectionManager connectionManager); + public CloseableHttpClient createClient(RequestConfig requestConfig, + HttpClientConnectionManager connectionManager); } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java index 18939595..92f12166 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactory.java @@ -24,15 +24,16 @@ import org.apache.commons.logging.Log; * Default implementation of {@link ApacheHttpClientConnectionManagerFactory}. * @author Ryan Baxter */ -public class DefaultApacheHttpClientConnectionManagerFactory implements ApacheHttpClientConnectionManagerFactory{ +public class DefaultApacheHttpClientConnectionManagerFactory + implements ApacheHttpClientConnectionManagerFactory { - private static final Log LOG = LogFactory.getLog(DefaultApacheHttpClientConnectionManagerFactory.class); + private static final Log LOG = LogFactory + .getLog(DefaultApacheHttpClientConnectionManagerFactory.class); - public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, - int maxTotalConnections, - int maxConnectionsPerRoute) { - return newConnectionManager(disableSslValidation, maxTotalConnections, maxConnectionsPerRoute, - -1, TimeUnit.MILLISECONDS, null); + public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, + int maxTotalConnections, int maxConnectionsPerRoute) { + return newConnectionManager(disableSslValidation, maxTotalConnections, + maxConnectionsPerRoute, -1, TimeUnit.MILLISECONDS, null); } @Override diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java index c4e895d8..76d7a88c 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactory.java @@ -11,12 +11,11 @@ import org.apache.http.impl.client.HttpClientBuilder; */ public class DefaultApacheHttpClientFactory implements ApacheHttpClientFactory { - public CloseableHttpClient createClient(RequestConfig requestConfig, HttpClientConnectionManager connectionManager) { + public CloseableHttpClient createClient(RequestConfig requestConfig, + HttpClientConnectionManager connectionManager) { return HttpClientBuilder.create().disableContentCompression() .setDefaultRequestConfig(requestConfig) - .setConnectionManager(connectionManager) - .disableCookieManagement() - .useSystemProperties() - .build(); + .setConnectionManager(connectionManager).disableCookieManagement() + .useSystemProperties().build(); } } diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java index 4bd1167c..40729d41 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/CustomHttpClientConfigurationTests.java @@ -32,17 +32,19 @@ public class CustomHttpClientConfigurationTests { @Test public void connManFactory() throws Exception { - assertTrue(ApacheHttpClientConnectionManagerFactory.class.isInstance(connectionManagerFactory)); - assertTrue(CustomApplication.MyApacheHttpClientConnectionManagerFactory.class.isInstance(connectionManagerFactory)); + assertTrue(ApacheHttpClientConnectionManagerFactory.class + .isInstance(connectionManagerFactory)); + assertTrue(CustomApplication.MyApacheHttpClientConnectionManagerFactory.class + .isInstance(connectionManagerFactory)); } @Test public void apacheHttpClientFactory() throws Exception { assertTrue(ApacheHttpClientFactory.class.isInstance(httpClientFactory)); - assertTrue(CustomApplication.MyApacheHttpClientFactory.class.isInstance(httpClientFactory)); + assertTrue(CustomApplication.MyApacheHttpClientFactory.class + .isInstance(httpClientFactory)); } - } @Configuration @@ -61,7 +63,8 @@ class CustomApplication { return new MyApacheHttpClientFactory(); } - @Bean ApacheHttpClientConnectionManagerFactory connectionManagerFactory() { + @Bean + ApacheHttpClientConnectionManagerFactory connectionManagerFactory() { return new MyApacheHttpClientConnectionManagerFactory(); } @@ -70,18 +73,21 @@ class CustomApplication { static class MyApacheHttpClientFactory implements ApacheHttpClientFactory { @Override - public CloseableHttpClient createClient(RequestConfig requestConfig, HttpClientConnectionManager connectionManager) { + public CloseableHttpClient createClient(RequestConfig requestConfig, + HttpClientConnectionManager connectionManager) { return null; } } - static class MyApacheHttpClientConnectionManagerFactory implements ApacheHttpClientConnectionManagerFactory { + static class MyApacheHttpClientConnectionManagerFactory + implements ApacheHttpClientConnectionManagerFactory { @Override - public HttpClientConnectionManager newConnectionManager(boolean disableSslValidation, int maxTotalConnections, int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, RegistryBuilder registryBuilder) { + public HttpClientConnectionManager newConnectionManager( + boolean disableSslValidation, int maxTotalConnections, + int maxConnectionsPerRoute, long timeToLive, TimeUnit timeUnit, + RegistryBuilder registryBuilder) { return null; } } } - - diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java index a202438a..00355006 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientConnectionManagerFactoryTests.java @@ -15,11 +15,14 @@ import static org.junit.Assert.*; public class DefaultApacheHttpClientConnectionManagerFactoryTests { @Test public void newConnectionManager() throws Exception { - HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory().newConnectionManager( - false, 2, 6); - assertEquals(6, ((PoolingHttpClientConnectionManager)connectionManager).getDefaultMaxPerRoute()); - assertEquals(2,((PoolingHttpClientConnectionManager)connectionManager).getMaxTotal()); - Object pool = getField(((PoolingHttpClientConnectionManager)connectionManager), "pool"); + HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() + .newConnectionManager(false, 2, 6); + assertEquals(6, ((PoolingHttpClientConnectionManager) connectionManager) + .getDefaultMaxPerRoute()); + assertEquals(2, + ((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()); + Object pool = getField(((PoolingHttpClientConnectionManager) connectionManager), + "pool"); assertEquals(-1l, getField(pool, "timeToLive")); TimeUnit timeUnit = getField(pool, "tunit"); assertEquals(TimeUnit.MILLISECONDS, timeUnit); @@ -27,11 +30,14 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { @Test public void newConnectionManagerWithTTL() throws Exception { - HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory().newConnectionManager( - false, 2, 6, 56l, TimeUnit.DAYS, null); - assertEquals(6, ((PoolingHttpClientConnectionManager)connectionManager).getDefaultMaxPerRoute()); - assertEquals(2,((PoolingHttpClientConnectionManager)connectionManager).getMaxTotal()); - Object pool = getField(((PoolingHttpClientConnectionManager)connectionManager), "pool"); + HttpClientConnectionManager connectionManager = new DefaultApacheHttpClientConnectionManagerFactory() + .newConnectionManager(false, 2, 6, 56l, TimeUnit.DAYS, null); + assertEquals(6, ((PoolingHttpClientConnectionManager) connectionManager) + .getDefaultMaxPerRoute()); + assertEquals(2, + ((PoolingHttpClientConnectionManager) connectionManager).getMaxTotal()); + Object pool = getField(((PoolingHttpClientConnectionManager) connectionManager), + "pool"); assertEquals(56l, getField(pool, "timeToLive")); TimeUnit timeUnit = getField(pool, "tunit"); assertEquals(TimeUnit.DAYS, timeUnit); @@ -41,6 +47,6 @@ public class DefaultApacheHttpClientConnectionManagerFactoryTests { Field field = ReflectionUtils.findField(target.getClass(), name); ReflectionUtils.makeAccessible(field); Object value = ReflectionUtils.getField(field, target); - return (T)value; + return (T) value; } } \ No newline at end of file diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java index dd7d2398..1f31d632 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultApacheHttpClientFactoryTests.java @@ -19,12 +19,10 @@ import static org.mockito.Mockito.mock; public class DefaultApacheHttpClientFactoryTests { @Test public void createClient() throws Exception { - final RequestConfig requestConfig = RequestConfig.custom() - .setSocketTimeout(100) - .setConnectTimeout(200) - .setCookieSpec(CookieSpecs.IGNORE_COOKIES).build(); - CloseableHttpClient httpClient = new DefaultApacheHttpClientFactory().createClient(requestConfig, - mock(HttpClientConnectionManager.class)); + final RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(100) + .setConnectTimeout(200).setCookieSpec(CookieSpecs.IGNORE_COOKIES).build(); + CloseableHttpClient httpClient = new DefaultApacheHttpClientFactory() + .createClient(requestConfig, mock(HttpClientConnectionManager.class)); Assertions.assertThat(httpClient).isInstanceOf(Configurable.class); RequestConfig config = ((Configurable) httpClient).getConfig(); assertEquals(100, config.getSocketTimeout()); @@ -36,7 +34,7 @@ public class DefaultApacheHttpClientFactoryTests { Field field = ReflectionUtils.findField(target.getClass(), name); ReflectionUtils.makeAccessible(field); Object value = ReflectionUtils.getField(field, target); - return (T)value; + return (T) value; } } \ No newline at end of file diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java index b4cfe27a..f07c51fd 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/commons/httpclient/DefaultHttpClientConfigurationTests.java @@ -25,8 +25,10 @@ public class DefaultHttpClientConfigurationTests { @Test public void connManFactory() throws Exception { - assertTrue(ApacheHttpClientConnectionManagerFactory.class.isInstance(connectionManagerFactory)); - assertTrue(DefaultApacheHttpClientConnectionManagerFactory.class.isInstance(connectionManagerFactory)); + assertTrue(ApacheHttpClientConnectionManagerFactory.class + .isInstance(connectionManagerFactory)); + assertTrue(DefaultApacheHttpClientConnectionManagerFactory.class + .isInstance(connectionManagerFactory)); } @Test