From 66619bbe2ba298edd97c0a9f751e12966dfec56e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 24 Jul 2017 12:50:49 -0700 Subject: [PATCH] Formatting --- ...ctiveMQConnectionFactoryConfiguration.java | 20 ++-- .../jms/activemq/ActiveMQProperties.java | 7 +- ...iveMQXAConnectionFactoryConfiguration.java | 6 +- .../ActiveMQAutoConfigurationTests.java | 108 +++++++++--------- .../jms/activemq/ActiveMQPropertiesTests.java | 24 ++-- 5 files changed, 85 insertions(+), 80 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index dfc5710a743..1b7a9418143 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -50,8 +50,8 @@ class ActiveMQConnectionFactoryConfiguration { public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties, ObjectProvider> factoryCustomizers) { return new ActiveMQConnectionFactoryFactory(properties, - factoryCustomizers.getIfAvailable()).createConnectionFactory( - ActiveMQConnectionFactory.class); + factoryCustomizers.getIfAvailable()) + .createConnectionFactory(ActiveMQConnectionFactory.class); } @ConditionalOnClass(PooledConnectionFactory.class) @@ -69,21 +69,21 @@ class ActiveMQConnectionFactoryConfiguration { ActiveMQConnectionFactory.class)); ActiveMQProperties.Pool pool = properties.getPool(); pooledConnectionFactory.setBlockIfSessionPoolIsFull(pool.isBlockIfFull()); - pooledConnectionFactory.setBlockIfSessionPoolIsFullTimeout( - pool.getBlockIfFullTimeout()); - pooledConnectionFactory.setCreateConnectionOnStartup( - pool.isCreateConnectionOnStartup()); + pooledConnectionFactory + .setBlockIfSessionPoolIsFullTimeout(pool.getBlockIfFullTimeout()); + pooledConnectionFactory + .setCreateConnectionOnStartup(pool.isCreateConnectionOnStartup()); pooledConnectionFactory.setExpiryTimeout(pool.getExpiryTimeout()); pooledConnectionFactory.setIdleTimeout(pool.getIdleTimeout()); pooledConnectionFactory.setMaxConnections(pool.getMaxConnections()); pooledConnectionFactory.setMaximumActiveSessionPerConnection( pool.getMaximumActiveSessionPerConnection()); - pooledConnectionFactory.setReconnectOnException( - pool.isReconnectOnException()); + pooledConnectionFactory + .setReconnectOnException(pool.isReconnectOnException()); pooledConnectionFactory.setTimeBetweenExpirationCheckMillis( pool.getTimeBetweenExpirationCheck()); - pooledConnectionFactory.setUseAnonymousProducers( - pool.isUseAnonymousProducers()); + pooledConnectionFactory + .setUseAnonymousProducers(pool.isUseAnonymousProducers()); return pooledConnectionFactory; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java index 664ff12d1b7..5ea0df18cde 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java @@ -158,8 +158,8 @@ public class ActiveMQProperties { private boolean blockIfFull = true; /** - * Blocking period, in milliseconds, before throwing an exception if the pool - * is still full. + * Blocking period, in milliseconds, before throwing an exception if the pool is + * still full. */ private long blockIfFullTimeout = -1; @@ -265,7 +265,8 @@ public class ActiveMQProperties { return this.maximumActiveSessionPerConnection; } - public void setMaximumActiveSessionPerConnection(int maximumActiveSessionPerConnection) { + public void setMaximumActiveSessionPerConnection( + int maximumActiveSessionPerConnection) { this.maximumActiveSessionPerConnection = maximumActiveSessionPerConnection; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java index e12a51a554a..84f65f44ef3 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java @@ -54,7 +54,7 @@ class ActiveMQXAConnectionFactoryConfiguration { XAConnectionFactoryWrapper wrapper) throws Exception { ActiveMQXAConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory( properties, factoryCustomizers.getIfAvailable()) - .createConnectionFactory(ActiveMQXAConnectionFactory.class); + .createConnectionFactory(ActiveMQXAConnectionFactory.class); return wrapper.wrapConnectionFactory(connectionFactory); } @@ -64,8 +64,8 @@ class ActiveMQXAConnectionFactoryConfiguration { ActiveMQProperties properties, ObjectProvider> factoryCustomizers) { return new ActiveMQConnectionFactoryFactory(properties, - factoryCustomizers.getIfAvailable()).createConnectionFactory( - ActiveMQConnectionFactory.class); + factoryCustomizers.getIfAvailable()) + .createConnectionFactory(ActiveMQConnectionFactory.class); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index 1ff93f0240a..3a585d011c3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java @@ -64,78 +64,79 @@ public class ActiveMQAutoConfigurationTests { @Test public void defaultsConnectionFactoryAreApplied() { load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false"); - assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1); - ActiveMQConnectionFactory connectionFactory = this.context.getBean( - ActiveMQConnectionFactory.class); + assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)) + .hasSize(1); + ActiveMQConnectionFactory connectionFactory = this.context + .getBean(ActiveMQConnectionFactory.class); ActiveMQConnectionFactory defaultFactory = new ActiveMQConnectionFactory( "vm://localhost?broker.persistent=false"); - assertThat(connectionFactory.getUserName()).isEqualTo( - defaultFactory.getUserName()); - assertThat(connectionFactory.getPassword()).isEqualTo( - defaultFactory.getPassword()); - assertThat(connectionFactory.getCloseTimeout()).isEqualTo( - defaultFactory.getCloseTimeout()); - assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo( - defaultFactory.isNonBlockingRedelivery()); - assertThat(connectionFactory.getSendTimeout()).isEqualTo( - defaultFactory.getSendTimeout()); - assertThat(connectionFactory.isTrustAllPackages()).isEqualTo( - defaultFactory.isTrustAllPackages()); + assertThat(connectionFactory.getUserName()) + .isEqualTo(defaultFactory.getUserName()); + assertThat(connectionFactory.getPassword()) + .isEqualTo(defaultFactory.getPassword()); + assertThat(connectionFactory.getCloseTimeout()) + .isEqualTo(defaultFactory.getCloseTimeout()); + assertThat(connectionFactory.isNonBlockingRedelivery()) + .isEqualTo(defaultFactory.isNonBlockingRedelivery()); + assertThat(connectionFactory.getSendTimeout()) + .isEqualTo(defaultFactory.getSendTimeout()); + assertThat(connectionFactory.isTrustAllPackages()) + .isEqualTo(defaultFactory.isTrustAllPackages()); assertThat(connectionFactory.getTrustedPackages()).containsExactly( - defaultFactory.getTrustedPackages().toArray(new String[]{})); + defaultFactory.getTrustedPackages().toArray(new String[] {})); } @Test public void customConnectionFactoryAreApplied() { load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false", "spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false", - "spring.activemq.user=foo", - "spring.activemq.password=bar", + "spring.activemq.user=foo", "spring.activemq.password=bar", "spring.activemq.closeTimeout=500", "spring.activemq.nonBlockingRedelivery=true", "spring.activemq.sendTimeout=1000", "spring.activemq.packages.trust-all=false", "spring.activemq.packages.trusted=com.example.acme"); - assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1); - ActiveMQConnectionFactory connectionFactory = this.context.getBean( - ActiveMQConnectionFactory.class); + assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)) + .hasSize(1); + ActiveMQConnectionFactory connectionFactory = this.context + .getBean(ActiveMQConnectionFactory.class); assertThat(connectionFactory.getUserName()).isEqualTo("foo"); assertThat(connectionFactory.getPassword()).isEqualTo("bar"); assertThat(connectionFactory.getCloseTimeout()).isEqualTo(500); assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo(true); assertThat(connectionFactory.getSendTimeout()).isEqualTo(1000); assertThat(connectionFactory.isTrustAllPackages()).isFalse(); - assertThat(connectionFactory.getTrustedPackages()).containsExactly( - "com.example.acme"); + assertThat(connectionFactory.getTrustedPackages()) + .containsExactly("com.example.acme"); } @Test public void defaultsPooledConnectionFactoryAreApplied() { load(EmptyConfiguration.class, "spring.activemq.pool.enabled=true"); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); - PooledConnectionFactory connectionFactory = this.context.getBean( - PooledConnectionFactory.class); + PooledConnectionFactory connectionFactory = this.context + .getBean(PooledConnectionFactory.class); PooledConnectionFactory defaultFactory = new PooledConnectionFactory(); - assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo( - defaultFactory.isBlockIfSessionPoolIsFull()); - assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo( - defaultFactory.getBlockIfSessionPoolIsFullTimeout()); - assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo( - defaultFactory.isCreateConnectionOnStartup()); - assertThat(connectionFactory.getExpiryTimeout()).isEqualTo( - defaultFactory.getExpiryTimeout()); - assertThat(connectionFactory.getIdleTimeout()).isEqualTo( - defaultFactory.getIdleTimeout()); - assertThat(connectionFactory.getMaxConnections()).isEqualTo( - defaultFactory.getMaxConnections()); - assertThat(connectionFactory.getMaximumActiveSessionPerConnection()).isEqualTo( - defaultFactory.getMaximumActiveSessionPerConnection()); - assertThat(connectionFactory.isReconnectOnException()).isEqualTo( - defaultFactory.isReconnectOnException()); - assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis()).isEqualTo( - defaultFactory.getTimeBetweenExpirationCheckMillis()); - assertThat(connectionFactory.isUseAnonymousProducers()).isEqualTo( - defaultFactory.isUseAnonymousProducers()); + assertThat(connectionFactory.isBlockIfSessionPoolIsFull()) + .isEqualTo(defaultFactory.isBlockIfSessionPoolIsFull()); + assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()) + .isEqualTo(defaultFactory.getBlockIfSessionPoolIsFullTimeout()); + assertThat(connectionFactory.isCreateConnectionOnStartup()) + .isEqualTo(defaultFactory.isCreateConnectionOnStartup()); + assertThat(connectionFactory.getExpiryTimeout()) + .isEqualTo(defaultFactory.getExpiryTimeout()); + assertThat(connectionFactory.getIdleTimeout()) + .isEqualTo(defaultFactory.getIdleTimeout()); + assertThat(connectionFactory.getMaxConnections()) + .isEqualTo(defaultFactory.getMaxConnections()); + assertThat(connectionFactory.getMaximumActiveSessionPerConnection()) + .isEqualTo(defaultFactory.getMaximumActiveSessionPerConnection()); + assertThat(connectionFactory.isReconnectOnException()) + .isEqualTo(defaultFactory.isReconnectOnException()); + assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis()) + .isEqualTo(defaultFactory.getTimeBetweenExpirationCheckMillis()); + assertThat(connectionFactory.isUseAnonymousProducers()) + .isEqualTo(defaultFactory.isUseAnonymousProducers()); } @Test @@ -152,8 +153,8 @@ public class ActiveMQAutoConfigurationTests { "spring.activemq.pool.timeBetweenExpirationCheck=2048", "spring.activemq.pool.useAnonymousProducers=false"); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); - PooledConnectionFactory connectionFactory = this.context.getBean( - PooledConnectionFactory.class); + PooledConnectionFactory connectionFactory = this.context + .getBean(PooledConnectionFactory.class); assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false); assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64); assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false); @@ -183,8 +184,8 @@ public class ActiveMQAutoConfigurationTests { "spring.activemq.pool.configuration.timeBetweenExpirationCheckMillis=2048", "spring.activemq.pool.configuration.useAnonymousProducers=false"); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); - PooledConnectionFactory connectionFactory = this.context.getBean( - PooledConnectionFactory.class); + PooledConnectionFactory connectionFactory = this.context + .getBean(PooledConnectionFactory.class); assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false); assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64); assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false); @@ -212,10 +213,10 @@ public class ActiveMQAutoConfigurationTests { @Test public void customizerOverridesAutConfig() { load(CustomizerConfiguration.class); - ActiveMQConnectionFactory connectionFactory = this.context.getBean( - ActiveMQConnectionFactory.class); - assertThat(connectionFactory.getBrokerURL()).isEqualTo( - "vm://localhost?useJmx=false&broker.persistent=false"); + ActiveMQConnectionFactory connectionFactory = this.context + .getBean(ActiveMQConnectionFactory.class); + assertThat(connectionFactory.getBrokerURL()) + .isEqualTo("vm://localhost?useJmx=false&broker.persistent=false"); assertThat(connectionFactory.getUserName()).isEqualTo("foobar"); } @@ -263,6 +264,7 @@ public class ActiveMQAutoConfigurationTests { } }; } + } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java index 90280f5f708..fb3bb861ccc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java @@ -40,37 +40,38 @@ public class ActiveMQPropertiesTests { @Test public void getBrokerUrlIsInMemoryByDefault() { - assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( - DEFAULT_EMBEDDED_BROKER_URL); + assertThat(createFactory(this.properties).determineBrokerUrl()) + .isEqualTo(DEFAULT_EMBEDDED_BROKER_URL); } @Test public void getBrokerUrlUseExplicitBrokerUrl() { this.properties.setBrokerUrl("vm://foo-bar"); - assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( - "vm://foo-bar"); + assertThat(createFactory(this.properties).determineBrokerUrl()) + .isEqualTo("vm://foo-bar"); } @Test public void getBrokerUrlWithInMemorySetToFalse() { this.properties.setInMemory(false); - assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( - DEFAULT_NETWORK_BROKER_URL); + assertThat(createFactory(this.properties).determineBrokerUrl()) + .isEqualTo(DEFAULT_NETWORK_BROKER_URL); } @Test public void getExplicitBrokerUrlAlwaysWins() { this.properties.setBrokerUrl("vm://foo-bar"); this.properties.setInMemory(false); - assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( - "vm://foo-bar"); + assertThat(createFactory(this.properties).determineBrokerUrl()) + .isEqualTo("vm://foo-bar"); } @Test public void setTrustAllPackages() { this.properties.getPackages().setTrustAll(true); - assertThat(createFactory(this.properties).createConnectionFactory( - ActiveMQConnectionFactory.class).isTrustAllPackages()).isEqualTo(true); + assertThat(createFactory(this.properties) + .createConnectionFactory(ActiveMQConnectionFactory.class) + .isTrustAllPackages()).isEqualTo(true); } @Test @@ -84,7 +85,8 @@ public class ActiveMQPropertiesTests { assertThat(factory.getTrustedPackages().get(0)).isEqualTo("trusted.package"); } - private ActiveMQConnectionFactoryFactory createFactory(ActiveMQProperties properties) { + private ActiveMQConnectionFactoryFactory createFactory( + ActiveMQProperties properties) { return new ActiveMQConnectionFactoryFactory(properties, Collections.emptyList()); }