Skip to content

S
spring-boot
Commit 66619bbe authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Formatting

parent 28dad44e
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 80 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java
View file @ 66619bbe
...@@ -50,8 +50,8 @@ class ActiveMQConnectionFactoryConfiguration { ...@@ -50,8 +50,8 @@ class ActiveMQConnectionFactoryConfiguration {
public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties, public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) { ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) {
return new ActiveMQConnectionFactoryFactory(properties, return new ActiveMQConnectionFactoryFactory(properties,
factoryCustomizers.getIfAvailable()).createConnectionFactory( factoryCustomizers.getIfAvailable())
ActiveMQConnectionFactory.class); .createConnectionFactory(ActiveMQConnectionFactory.class);
} }
@ConditionalOnClass(PooledConnectionFactory.class) @ConditionalOnClass(PooledConnectionFactory.class)
...@@ -69,21 +69,21 @@ class ActiveMQConnectionFactoryConfiguration { ...@@ -69,21 +69,21 @@ class ActiveMQConnectionFactoryConfiguration {
ActiveMQConnectionFactory.class)); ActiveMQConnectionFactory.class));
ActiveMQProperties.Pool pool = properties.getPool(); ActiveMQProperties.Pool pool = properties.getPool();
pooledConnectionFactory.setBlockIfSessionPoolIsFull(pool.isBlockIfFull()); pooledConnectionFactory.setBlockIfSessionPoolIsFull(pool.isBlockIfFull());
pooledConnectionFactory.setBlockIfSessionPoolIsFullTimeout( pooledConnectionFactory
pool.getBlockIfFullTimeout()); .setBlockIfSessionPoolIsFullTimeout(pool.getBlockIfFullTimeout());
pooledConnectionFactory.setCreateConnectionOnStartup( pooledConnectionFactory
pool.isCreateConnectionOnStartup()); .setCreateConnectionOnStartup(pool.isCreateConnectionOnStartup());
pooledConnectionFactory.setExpiryTimeout(pool.getExpiryTimeout()); pooledConnectionFactory.setExpiryTimeout(pool.getExpiryTimeout());
pooledConnectionFactory.setIdleTimeout(pool.getIdleTimeout()); pooledConnectionFactory.setIdleTimeout(pool.getIdleTimeout());
pooledConnectionFactory.setMaxConnections(pool.getMaxConnections()); pooledConnectionFactory.setMaxConnections(pool.getMaxConnections());
pooledConnectionFactory.setMaximumActiveSessionPerConnection( pooledConnectionFactory.setMaximumActiveSessionPerConnection(
pool.getMaximumActiveSessionPerConnection()); pool.getMaximumActiveSessionPerConnection());
pooledConnectionFactory.setReconnectOnException( pooledConnectionFactory
pool.isReconnectOnException()); .setReconnectOnException(pool.isReconnectOnException());
pooledConnectionFactory.setTimeBetweenExpirationCheckMillis( pooledConnectionFactory.setTimeBetweenExpirationCheckMillis(
pool.getTimeBetweenExpirationCheck()); pool.getTimeBetweenExpirationCheck());
pooledConnectionFactory.setUseAnonymousProducers( pooledConnectionFactory
pool.isUseAnonymousProducers()); .setUseAnonymousProducers(pool.isUseAnonymousProducers());
return pooledConnectionFactory; return pooledConnectionFactory;
} }
......
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java
View file @ 66619bbe
...@@ -158,8 +158,8 @@ public class ActiveMQProperties { ...@@ -158,8 +158,8 @@ public class ActiveMQProperties {
private boolean blockIfFull = true; private boolean blockIfFull = true;
/** /**
* Blocking period, in milliseconds, before throwing an exception if the pool * Blocking period, in milliseconds, before throwing an exception if the pool is
* is still full. * still full.
*/ */
private long blockIfFullTimeout = -1; private long blockIfFullTimeout = -1;
...@@ -265,7 +265,8 @@ public class ActiveMQProperties { ...@@ -265,7 +265,8 @@ public class ActiveMQProperties {
return this.maximumActiveSessionPerConnection; return this.maximumActiveSessionPerConnection;
} }
public void setMaximumActiveSessionPerConnection(int maximumActiveSessionPerConnection) { public void setMaximumActiveSessionPerConnection(
int maximumActiveSessionPerConnection) {
this.maximumActiveSessionPerConnection = maximumActiveSessionPerConnection; this.maximumActiveSessionPerConnection = maximumActiveSessionPerConnection;
} }
......
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java
View file @ 66619bbe
...@@ -64,8 +64,8 @@ class ActiveMQXAConnectionFactoryConfiguration { ...@@ -64,8 +64,8 @@ class ActiveMQXAConnectionFactoryConfiguration {
ActiveMQProperties properties, ActiveMQProperties properties,
ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) { ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) {
return new ActiveMQConnectionFactoryFactory(properties, return new ActiveMQConnectionFactoryFactory(properties,
factoryCustomizers.getIfAvailable()).createConnectionFactory( factoryCustomizers.getIfAvailable())
ActiveMQConnectionFactory.class); .createConnectionFactory(ActiveMQConnectionFactory.class);
} }
} }
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java
View file @ 66619bbe
...@@ -64,78 +64,79 @@ public class ActiveMQAutoConfigurationTests { ...@@ -64,78 +64,79 @@ public class ActiveMQAutoConfigurationTests {
@Test @Test
public void defaultsConnectionFactoryAreApplied() { public void defaultsConnectionFactoryAreApplied() {
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false"); load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false");
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1); assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class))
ActiveMQConnectionFactory connectionFactory = this.context.getBean( .hasSize(1);
ActiveMQConnectionFactory.class); ActiveMQConnectionFactory connectionFactory = this.context
.getBean(ActiveMQConnectionFactory.class);
ActiveMQConnectionFactory defaultFactory = new ActiveMQConnectionFactory( ActiveMQConnectionFactory defaultFactory = new ActiveMQConnectionFactory(
"vm://localhost?broker.persistent=false"); "vm://localhost?broker.persistent=false");
assertThat(connectionFactory.getUserName()).isEqualTo( assertThat(connectionFactory.getUserName())
defaultFactory.getUserName()); .isEqualTo(defaultFactory.getUserName());
assertThat(connectionFactory.getPassword()).isEqualTo( assertThat(connectionFactory.getPassword())
defaultFactory.getPassword()); .isEqualTo(defaultFactory.getPassword());
assertThat(connectionFactory.getCloseTimeout()).isEqualTo( assertThat(connectionFactory.getCloseTimeout())
defaultFactory.getCloseTimeout()); .isEqualTo(defaultFactory.getCloseTimeout());
assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo( assertThat(connectionFactory.isNonBlockingRedelivery())
defaultFactory.isNonBlockingRedelivery()); .isEqualTo(defaultFactory.isNonBlockingRedelivery());
assertThat(connectionFactory.getSendTimeout()).isEqualTo( assertThat(connectionFactory.getSendTimeout())
defaultFactory.getSendTimeout()); .isEqualTo(defaultFactory.getSendTimeout());
assertThat(connectionFactory.isTrustAllPackages()).isEqualTo( assertThat(connectionFactory.isTrustAllPackages())
defaultFactory.isTrustAllPackages()); .isEqualTo(defaultFactory.isTrustAllPackages());
assertThat(connectionFactory.getTrustedPackages()).containsExactly( assertThat(connectionFactory.getTrustedPackages()).containsExactly(
defaultFactory.getTrustedPackages().toArray(new String[]{})); defaultFactory.getTrustedPackages().toArray(new String[] {}));
} }
@Test @Test
public void customConnectionFactoryAreApplied() { public void customConnectionFactoryAreApplied() {
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false", load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false",
"spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false", "spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false",
"spring.activemq.user=foo", "spring.activemq.user=foo", "spring.activemq.password=bar",
"spring.activemq.password=bar",
"spring.activemq.closeTimeout=500", "spring.activemq.closeTimeout=500",
"spring.activemq.nonBlockingRedelivery=true", "spring.activemq.nonBlockingRedelivery=true",
"spring.activemq.sendTimeout=1000", "spring.activemq.sendTimeout=1000",
"spring.activemq.packages.trust-all=false", "spring.activemq.packages.trust-all=false",
"spring.activemq.packages.trusted=com.example.acme"); "spring.activemq.packages.trusted=com.example.acme");
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1); assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class))
ActiveMQConnectionFactory connectionFactory = this.context.getBean( .hasSize(1);
ActiveMQConnectionFactory.class); ActiveMQConnectionFactory connectionFactory = this.context
.getBean(ActiveMQConnectionFactory.class);
assertThat(connectionFactory.getUserName()).isEqualTo("foo"); assertThat(connectionFactory.getUserName()).isEqualTo("foo");
assertThat(connectionFactory.getPassword()).isEqualTo("bar"); assertThat(connectionFactory.getPassword()).isEqualTo("bar");
assertThat(connectionFactory.getCloseTimeout()).isEqualTo(500); assertThat(connectionFactory.getCloseTimeout()).isEqualTo(500);
assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo(true); assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo(true);
assertThat(connectionFactory.getSendTimeout()).isEqualTo(1000); assertThat(connectionFactory.getSendTimeout()).isEqualTo(1000);
assertThat(connectionFactory.isTrustAllPackages()).isFalse(); assertThat(connectionFactory.isTrustAllPackages()).isFalse();
assertThat(connectionFactory.getTrustedPackages()).containsExactly( assertThat(connectionFactory.getTrustedPackages())
"com.example.acme"); .containsExactly("com.example.acme");
} }
@Test @Test
public void defaultsPooledConnectionFactoryAreApplied() { public void defaultsPooledConnectionFactoryAreApplied() {
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=true"); load(EmptyConfiguration.class, "spring.activemq.pool.enabled=true");
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
PooledConnectionFactory connectionFactory = this.context.getBean( PooledConnectionFactory connectionFactory = this.context
PooledConnectionFactory.class); .getBean(PooledConnectionFactory.class);
PooledConnectionFactory defaultFactory = new PooledConnectionFactory(); PooledConnectionFactory defaultFactory = new PooledConnectionFactory();
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo( assertThat(connectionFactory.isBlockIfSessionPoolIsFull())
defaultFactory.isBlockIfSessionPoolIsFull()); .isEqualTo(defaultFactory.isBlockIfSessionPoolIsFull());
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo( assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout())
defaultFactory.getBlockIfSessionPoolIsFullTimeout()); .isEqualTo(defaultFactory.getBlockIfSessionPoolIsFullTimeout());
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo( assertThat(connectionFactory.isCreateConnectionOnStartup())
defaultFactory.isCreateConnectionOnStartup()); .isEqualTo(defaultFactory.isCreateConnectionOnStartup());
assertThat(connectionFactory.getExpiryTimeout()).isEqualTo( assertThat(connectionFactory.getExpiryTimeout())
defaultFactory.getExpiryTimeout()); .isEqualTo(defaultFactory.getExpiryTimeout());
assertThat(connectionFactory.getIdleTimeout()).isEqualTo( assertThat(connectionFactory.getIdleTimeout())
defaultFactory.getIdleTimeout()); .isEqualTo(defaultFactory.getIdleTimeout());
assertThat(connectionFactory.getMaxConnections()).isEqualTo( assertThat(connectionFactory.getMaxConnections())
defaultFactory.getMaxConnections()); .isEqualTo(defaultFactory.getMaxConnections());
assertThat(connectionFactory.getMaximumActiveSessionPerConnection()).isEqualTo( assertThat(connectionFactory.getMaximumActiveSessionPerConnection())
defaultFactory.getMaximumActiveSessionPerConnection()); .isEqualTo(defaultFactory.getMaximumActiveSessionPerConnection());
assertThat(connectionFactory.isReconnectOnException()).isEqualTo( assertThat(connectionFactory.isReconnectOnException())
defaultFactory.isReconnectOnException()); .isEqualTo(defaultFactory.isReconnectOnException());
assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis()).isEqualTo( assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis())
defaultFactory.getTimeBetweenExpirationCheckMillis()); .isEqualTo(defaultFactory.getTimeBetweenExpirationCheckMillis());
assertThat(connectionFactory.isUseAnonymousProducers()).isEqualTo( assertThat(connectionFactory.isUseAnonymousProducers())
defaultFactory.isUseAnonymousProducers()); .isEqualTo(defaultFactory.isUseAnonymousProducers());
} }
@Test @Test
...@@ -152,8 +153,8 @@ public class ActiveMQAutoConfigurationTests { ...@@ -152,8 +153,8 @@ public class ActiveMQAutoConfigurationTests {
"spring.activemq.pool.timeBetweenExpirationCheck=2048", "spring.activemq.pool.timeBetweenExpirationCheck=2048",
"spring.activemq.pool.useAnonymousProducers=false"); "spring.activemq.pool.useAnonymousProducers=false");
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
PooledConnectionFactory connectionFactory = this.context.getBean( PooledConnectionFactory connectionFactory = this.context
PooledConnectionFactory.class); .getBean(PooledConnectionFactory.class);
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false); assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false);
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64); assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64);
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false); assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false);
...@@ -183,8 +184,8 @@ public class ActiveMQAutoConfigurationTests { ...@@ -183,8 +184,8 @@ public class ActiveMQAutoConfigurationTests {
"spring.activemq.pool.configuration.timeBetweenExpirationCheckMillis=2048", "spring.activemq.pool.configuration.timeBetweenExpirationCheckMillis=2048",
"spring.activemq.pool.configuration.useAnonymousProducers=false"); "spring.activemq.pool.configuration.useAnonymousProducers=false");
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1); assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
PooledConnectionFactory connectionFactory = this.context.getBean( PooledConnectionFactory connectionFactory = this.context
PooledConnectionFactory.class); .getBean(PooledConnectionFactory.class);
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false); assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false);
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64); assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64);
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false); assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false);
...@@ -212,10 +213,10 @@ public class ActiveMQAutoConfigurationTests { ...@@ -212,10 +213,10 @@ public class ActiveMQAutoConfigurationTests {
@Test @Test
public void customizerOverridesAutConfig() { public void customizerOverridesAutConfig() {
load(CustomizerConfiguration.class); load(CustomizerConfiguration.class);
ActiveMQConnectionFactory connectionFactory = this.context.getBean( ActiveMQConnectionFactory connectionFactory = this.context
ActiveMQConnectionFactory.class); .getBean(ActiveMQConnectionFactory.class);
assertThat(connectionFactory.getBrokerURL()).isEqualTo( assertThat(connectionFactory.getBrokerURL())
"vm://localhost?useJmx=false&broker.persistent=false"); .isEqualTo("vm://localhost?useJmx=false&broker.persistent=false");
assertThat(connectionFactory.getUserName()).isEqualTo("foobar"); assertThat(connectionFactory.getUserName()).isEqualTo("foobar");
} }
...@@ -263,6 +264,7 @@ public class ActiveMQAutoConfigurationTests { ...@@ -263,6 +264,7 @@ public class ActiveMQAutoConfigurationTests {
} }
}; };
} }
} }
} }
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java
View file @ 66619bbe
...@@ -40,37 +40,38 @@ public class ActiveMQPropertiesTests { ...@@ -40,37 +40,38 @@ public class ActiveMQPropertiesTests {
@Test @Test
public void getBrokerUrlIsInMemoryByDefault() { public void getBrokerUrlIsInMemoryByDefault() {
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( assertThat(createFactory(this.properties).determineBrokerUrl())
DEFAULT_EMBEDDED_BROKER_URL); .isEqualTo(DEFAULT_EMBEDDED_BROKER_URL);
} }
@Test @Test
public void getBrokerUrlUseExplicitBrokerUrl() { public void getBrokerUrlUseExplicitBrokerUrl() {
this.properties.setBrokerUrl("vm://foo-bar"); this.properties.setBrokerUrl("vm://foo-bar");
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( assertThat(createFactory(this.properties).determineBrokerUrl())
"vm://foo-bar"); .isEqualTo("vm://foo-bar");
} }
@Test @Test
public void getBrokerUrlWithInMemorySetToFalse() { public void getBrokerUrlWithInMemorySetToFalse() {
this.properties.setInMemory(false); this.properties.setInMemory(false);
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( assertThat(createFactory(this.properties).determineBrokerUrl())
DEFAULT_NETWORK_BROKER_URL); .isEqualTo(DEFAULT_NETWORK_BROKER_URL);
} }
@Test @Test
public void getExplicitBrokerUrlAlwaysWins() { public void getExplicitBrokerUrlAlwaysWins() {
this.properties.setBrokerUrl("vm://foo-bar"); this.properties.setBrokerUrl("vm://foo-bar");
this.properties.setInMemory(false); this.properties.setInMemory(false);
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo( assertThat(createFactory(this.properties).determineBrokerUrl())
"vm://foo-bar"); .isEqualTo("vm://foo-bar");
} }
@Test @Test
public void setTrustAllPackages() { public void setTrustAllPackages() {
this.properties.getPackages().setTrustAll(true); this.properties.getPackages().setTrustAll(true);
assertThat(createFactory(this.properties).createConnectionFactory( assertThat(createFactory(this.properties)
ActiveMQConnectionFactory.class).isTrustAllPackages()).isEqualTo(true); .createConnectionFactory(ActiveMQConnectionFactory.class)
.isTrustAllPackages()).isEqualTo(true);
} }
@Test @Test
...@@ -84,7 +85,8 @@ public class ActiveMQPropertiesTests { ...@@ -84,7 +85,8 @@ public class ActiveMQPropertiesTests {
assertThat(factory.getTrustedPackages().get(0)).isEqualTo("trusted.package"); assertThat(factory.getTrustedPackages().get(0)).isEqualTo("trusted.package");
} }
private ActiveMQConnectionFactoryFactory createFactory(ActiveMQProperties properties) { private ActiveMQConnectionFactoryFactory createFactory(
ActiveMQProperties properties) {
return new ActiveMQConnectionFactoryFactory(properties, return new ActiveMQConnectionFactoryFactory(properties,
Collections.<ActiveMQConnectionFactoryCustomizer>emptyList()); Collections.<ActiveMQConnectionFactoryCustomizer>emptyList());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment