Skip to content

Commit 66619bb

Browse files
philwebbphilwebb
committed
Formatting
1 parent 28dad44 commit 66619bb

File tree

5 files changed

+85
-80
lines changed

5 files changed

+85
-80
lines changed

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class ActiveMQConnectionFactoryConfiguration {
5050
public ActiveMQConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
5151
ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) {
5252
return new ActiveMQConnectionFactoryFactory(properties,
53-
factoryCustomizers.getIfAvailable()).createConnectionFactory(
54-
ActiveMQConnectionFactory.class);
53+
factoryCustomizers.getIfAvailable())
54+
.createConnectionFactory(ActiveMQConnectionFactory.class);
5555
}
5656

5757
@ConditionalOnClass(PooledConnectionFactory.class)
@@ -69,21 +69,21 @@ public PooledConnectionFactory pooledJmsConnectionFactory(
6969
ActiveMQConnectionFactory.class));
7070
ActiveMQProperties.Pool pool = properties.getPool();
7171
pooledConnectionFactory.setBlockIfSessionPoolIsFull(pool.isBlockIfFull());
72-
pooledConnectionFactory.setBlockIfSessionPoolIsFullTimeout(
73-
pool.getBlockIfFullTimeout());
74-
pooledConnectionFactory.setCreateConnectionOnStartup(
75-
pool.isCreateConnectionOnStartup());
72+
pooledConnectionFactory
73+
.setBlockIfSessionPoolIsFullTimeout(pool.getBlockIfFullTimeout());
74+
pooledConnectionFactory
75+
.setCreateConnectionOnStartup(pool.isCreateConnectionOnStartup());
7676
pooledConnectionFactory.setExpiryTimeout(pool.getExpiryTimeout());
7777
pooledConnectionFactory.setIdleTimeout(pool.getIdleTimeout());
7878
pooledConnectionFactory.setMaxConnections(pool.getMaxConnections());
7979
pooledConnectionFactory.setMaximumActiveSessionPerConnection(
8080
pool.getMaximumActiveSessionPerConnection());
81-
pooledConnectionFactory.setReconnectOnException(
82-
pool.isReconnectOnException());
81+
pooledConnectionFactory
82+
.setReconnectOnException(pool.isReconnectOnException());
8383
pooledConnectionFactory.setTimeBetweenExpirationCheckMillis(
8484
pool.getTimeBetweenExpirationCheck());
85-
pooledConnectionFactory.setUseAnonymousProducers(
86-
pool.isUseAnonymousProducers());
85+
pooledConnectionFactory
86+
.setUseAnonymousProducers(pool.isUseAnonymousProducers());
8787
return pooledConnectionFactory;
8888
}
8989

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ public static class Pool {
158158
private boolean blockIfFull = true;
159159

160160
/**
161-
* Blocking period, in milliseconds, before throwing an exception if the pool
162-
* is still full.
161+
* Blocking period, in milliseconds, before throwing an exception if the pool is
162+
* still full.
163163
*/
164164
private long blockIfFullTimeout = -1;
165165

@@ -265,7 +265,8 @@ public int getMaximumActiveSessionPerConnection() {
265265
return this.maximumActiveSessionPerConnection;
266266
}
267267

268-
public void setMaximumActiveSessionPerConnection(int maximumActiveSessionPerConnection) {
268+
public void setMaximumActiveSessionPerConnection(
269+
int maximumActiveSessionPerConnection) {
269270
this.maximumActiveSessionPerConnection = maximumActiveSessionPerConnection;
270271
}
271272

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public ConnectionFactory jmsConnectionFactory(ActiveMQProperties properties,
5454
XAConnectionFactoryWrapper wrapper) throws Exception {
5555
ActiveMQXAConnectionFactory connectionFactory = new ActiveMQConnectionFactoryFactory(
5656
properties, factoryCustomizers.getIfAvailable())
57-
.createConnectionFactory(ActiveMQXAConnectionFactory.class);
57+
.createConnectionFactory(ActiveMQXAConnectionFactory.class);
5858
return wrapper.wrapConnectionFactory(connectionFactory);
5959
}
6060

@@ -64,8 +64,8 @@ public ActiveMQConnectionFactory nonXaJmsConnectionFactory(
6464
ActiveMQProperties properties,
6565
ObjectProvider<List<ActiveMQConnectionFactoryCustomizer>> factoryCustomizers) {
6666
return new ActiveMQConnectionFactoryFactory(properties,
67-
factoryCustomizers.getIfAvailable()).createConnectionFactory(
68-
ActiveMQConnectionFactory.class);
67+
factoryCustomizers.getIfAvailable())
68+
.createConnectionFactory(ActiveMQConnectionFactory.class);
6969
}
7070

7171
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java

Lines changed: 55 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -64,78 +64,79 @@ public void configurationBacksOffWhenCustomConnectionFactoryExists() {
6464
@Test
6565
public void defaultsConnectionFactoryAreApplied() {
6666
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false");
67-
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1);
68-
ActiveMQConnectionFactory connectionFactory = this.context.getBean(
69-
ActiveMQConnectionFactory.class);
67+
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class))
68+
.hasSize(1);
69+
ActiveMQConnectionFactory connectionFactory = this.context
70+
.getBean(ActiveMQConnectionFactory.class);
7071
ActiveMQConnectionFactory defaultFactory = new ActiveMQConnectionFactory(
7172
"vm://localhost?broker.persistent=false");
72-
assertThat(connectionFactory.getUserName()).isEqualTo(
73-
defaultFactory.getUserName());
74-
assertThat(connectionFactory.getPassword()).isEqualTo(
75-
defaultFactory.getPassword());
76-
assertThat(connectionFactory.getCloseTimeout()).isEqualTo(
77-
defaultFactory.getCloseTimeout());
78-
assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo(
79-
defaultFactory.isNonBlockingRedelivery());
80-
assertThat(connectionFactory.getSendTimeout()).isEqualTo(
81-
defaultFactory.getSendTimeout());
82-
assertThat(connectionFactory.isTrustAllPackages()).isEqualTo(
83-
defaultFactory.isTrustAllPackages());
73+
assertThat(connectionFactory.getUserName())
74+
.isEqualTo(defaultFactory.getUserName());
75+
assertThat(connectionFactory.getPassword())
76+
.isEqualTo(defaultFactory.getPassword());
77+
assertThat(connectionFactory.getCloseTimeout())
78+
.isEqualTo(defaultFactory.getCloseTimeout());
79+
assertThat(connectionFactory.isNonBlockingRedelivery())
80+
.isEqualTo(defaultFactory.isNonBlockingRedelivery());
81+
assertThat(connectionFactory.getSendTimeout())
82+
.isEqualTo(defaultFactory.getSendTimeout());
83+
assertThat(connectionFactory.isTrustAllPackages())
84+
.isEqualTo(defaultFactory.isTrustAllPackages());
8485
assertThat(connectionFactory.getTrustedPackages()).containsExactly(
85-
defaultFactory.getTrustedPackages().toArray(new String[]{}));
86+
defaultFactory.getTrustedPackages().toArray(new String[] {}));
8687
}
8788

8889
@Test
8990
public void customConnectionFactoryAreApplied() {
9091
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=false",
9192
"spring.activemq.brokerUrl=vm://localhost?useJmx=false&broker.persistent=false",
92-
"spring.activemq.user=foo",
93-
"spring.activemq.password=bar",
93+
"spring.activemq.user=foo", "spring.activemq.password=bar",
9494
"spring.activemq.closeTimeout=500",
9595
"spring.activemq.nonBlockingRedelivery=true",
9696
"spring.activemq.sendTimeout=1000",
9797
"spring.activemq.packages.trust-all=false",
9898
"spring.activemq.packages.trusted=com.example.acme");
99-
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class)).hasSize(1);
100-
ActiveMQConnectionFactory connectionFactory = this.context.getBean(
101-
ActiveMQConnectionFactory.class);
99+
assertThat(this.context.getBeansOfType(ActiveMQConnectionFactory.class))
100+
.hasSize(1);
101+
ActiveMQConnectionFactory connectionFactory = this.context
102+
.getBean(ActiveMQConnectionFactory.class);
102103
assertThat(connectionFactory.getUserName()).isEqualTo("foo");
103104
assertThat(connectionFactory.getPassword()).isEqualTo("bar");
104105
assertThat(connectionFactory.getCloseTimeout()).isEqualTo(500);
105106
assertThat(connectionFactory.isNonBlockingRedelivery()).isEqualTo(true);
106107
assertThat(connectionFactory.getSendTimeout()).isEqualTo(1000);
107108
assertThat(connectionFactory.isTrustAllPackages()).isFalse();
108-
assertThat(connectionFactory.getTrustedPackages()).containsExactly(
109-
"com.example.acme");
109+
assertThat(connectionFactory.getTrustedPackages())
110+
.containsExactly("com.example.acme");
110111
}
111112

112113
@Test
113114
public void defaultsPooledConnectionFactoryAreApplied() {
114115
load(EmptyConfiguration.class, "spring.activemq.pool.enabled=true");
115116
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
116-
PooledConnectionFactory connectionFactory = this.context.getBean(
117-
PooledConnectionFactory.class);
117+
PooledConnectionFactory connectionFactory = this.context
118+
.getBean(PooledConnectionFactory.class);
118119
PooledConnectionFactory defaultFactory = new PooledConnectionFactory();
119-
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(
120-
defaultFactory.isBlockIfSessionPoolIsFull());
121-
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(
122-
defaultFactory.getBlockIfSessionPoolIsFullTimeout());
123-
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(
124-
defaultFactory.isCreateConnectionOnStartup());
125-
assertThat(connectionFactory.getExpiryTimeout()).isEqualTo(
126-
defaultFactory.getExpiryTimeout());
127-
assertThat(connectionFactory.getIdleTimeout()).isEqualTo(
128-
defaultFactory.getIdleTimeout());
129-
assertThat(connectionFactory.getMaxConnections()).isEqualTo(
130-
defaultFactory.getMaxConnections());
131-
assertThat(connectionFactory.getMaximumActiveSessionPerConnection()).isEqualTo(
132-
defaultFactory.getMaximumActiveSessionPerConnection());
133-
assertThat(connectionFactory.isReconnectOnException()).isEqualTo(
134-
defaultFactory.isReconnectOnException());
135-
assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis()).isEqualTo(
136-
defaultFactory.getTimeBetweenExpirationCheckMillis());
137-
assertThat(connectionFactory.isUseAnonymousProducers()).isEqualTo(
138-
defaultFactory.isUseAnonymousProducers());
120+
assertThat(connectionFactory.isBlockIfSessionPoolIsFull())
121+
.isEqualTo(defaultFactory.isBlockIfSessionPoolIsFull());
122+
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout())
123+
.isEqualTo(defaultFactory.getBlockIfSessionPoolIsFullTimeout());
124+
assertThat(connectionFactory.isCreateConnectionOnStartup())
125+
.isEqualTo(defaultFactory.isCreateConnectionOnStartup());
126+
assertThat(connectionFactory.getExpiryTimeout())
127+
.isEqualTo(defaultFactory.getExpiryTimeout());
128+
assertThat(connectionFactory.getIdleTimeout())
129+
.isEqualTo(defaultFactory.getIdleTimeout());
130+
assertThat(connectionFactory.getMaxConnections())
131+
.isEqualTo(defaultFactory.getMaxConnections());
132+
assertThat(connectionFactory.getMaximumActiveSessionPerConnection())
133+
.isEqualTo(defaultFactory.getMaximumActiveSessionPerConnection());
134+
assertThat(connectionFactory.isReconnectOnException())
135+
.isEqualTo(defaultFactory.isReconnectOnException());
136+
assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis())
137+
.isEqualTo(defaultFactory.getTimeBetweenExpirationCheckMillis());
138+
assertThat(connectionFactory.isUseAnonymousProducers())
139+
.isEqualTo(defaultFactory.isUseAnonymousProducers());
139140
}
140141

141142
@Test
@@ -152,8 +153,8 @@ public void customPooledConnectionFactoryAreApplied() {
152153
"spring.activemq.pool.timeBetweenExpirationCheck=2048",
153154
"spring.activemq.pool.useAnonymousProducers=false");
154155
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
155-
PooledConnectionFactory connectionFactory = this.context.getBean(
156-
PooledConnectionFactory.class);
156+
PooledConnectionFactory connectionFactory = this.context
157+
.getBean(PooledConnectionFactory.class);
157158
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false);
158159
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64);
159160
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false);
@@ -183,8 +184,8 @@ public void customPooledConnectionFactoryOnTargetInstanceAreApplied() {
183184
"spring.activemq.pool.configuration.timeBetweenExpirationCheckMillis=2048",
184185
"spring.activemq.pool.configuration.useAnonymousProducers=false");
185186
assertThat(this.context.getBeansOfType(PooledConnectionFactory.class)).hasSize(1);
186-
PooledConnectionFactory connectionFactory = this.context.getBean(
187-
PooledConnectionFactory.class);
187+
PooledConnectionFactory connectionFactory = this.context
188+
.getBean(PooledConnectionFactory.class);
188189
assertThat(connectionFactory.isBlockIfSessionPoolIsFull()).isEqualTo(false);
189190
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout()).isEqualTo(64);
190191
assertThat(connectionFactory.isCreateConnectionOnStartup()).isEqualTo(false);
@@ -212,10 +213,10 @@ public void pooledConnectionFactoryConfiguration() throws JMSException {
212213
@Test
213214
public void customizerOverridesAutConfig() {
214215
load(CustomizerConfiguration.class);
215-
ActiveMQConnectionFactory connectionFactory = this.context.getBean(
216-
ActiveMQConnectionFactory.class);
217-
assertThat(connectionFactory.getBrokerURL()).isEqualTo(
218-
"vm://localhost?useJmx=false&broker.persistent=false");
216+
ActiveMQConnectionFactory connectionFactory = this.context
217+
.getBean(ActiveMQConnectionFactory.class);
218+
assertThat(connectionFactory.getBrokerURL())
219+
.isEqualTo("vm://localhost?useJmx=false&broker.persistent=false");
219220
assertThat(connectionFactory.getUserName()).isEqualTo("foobar");
220221
}
221222

@@ -263,6 +264,7 @@ public void customize(ActiveMQConnectionFactory factory) {
263264
}
264265
};
265266
}
267+
266268
}
267269

268270
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,37 +40,38 @@ public class ActiveMQPropertiesTests {
4040

4141
@Test
4242
public void getBrokerUrlIsInMemoryByDefault() {
43-
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo(
44-
DEFAULT_EMBEDDED_BROKER_URL);
43+
assertThat(createFactory(this.properties).determineBrokerUrl())
44+
.isEqualTo(DEFAULT_EMBEDDED_BROKER_URL);
4545
}
4646

4747
@Test
4848
public void getBrokerUrlUseExplicitBrokerUrl() {
4949
this.properties.setBrokerUrl("vm://foo-bar");
50-
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo(
51-
"vm://foo-bar");
50+
assertThat(createFactory(this.properties).determineBrokerUrl())
51+
.isEqualTo("vm://foo-bar");
5252
}
5353

5454
@Test
5555
public void getBrokerUrlWithInMemorySetToFalse() {
5656
this.properties.setInMemory(false);
57-
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo(
58-
DEFAULT_NETWORK_BROKER_URL);
57+
assertThat(createFactory(this.properties).determineBrokerUrl())
58+
.isEqualTo(DEFAULT_NETWORK_BROKER_URL);
5959
}
6060

6161
@Test
6262
public void getExplicitBrokerUrlAlwaysWins() {
6363
this.properties.setBrokerUrl("vm://foo-bar");
6464
this.properties.setInMemory(false);
65-
assertThat(createFactory(this.properties).determineBrokerUrl()).isEqualTo(
66-
"vm://foo-bar");
65+
assertThat(createFactory(this.properties).determineBrokerUrl())
66+
.isEqualTo("vm://foo-bar");
6767
}
6868

6969
@Test
7070
public void setTrustAllPackages() {
7171
this.properties.getPackages().setTrustAll(true);
72-
assertThat(createFactory(this.properties).createConnectionFactory(
73-
ActiveMQConnectionFactory.class).isTrustAllPackages()).isEqualTo(true);
72+
assertThat(createFactory(this.properties)
73+
.createConnectionFactory(ActiveMQConnectionFactory.class)
74+
.isTrustAllPackages()).isEqualTo(true);
7475
}
7576

7677
@Test
@@ -84,7 +85,8 @@ public void setTrustedPackages() {
8485
assertThat(factory.getTrustedPackages().get(0)).isEqualTo("trusted.package");
8586
}
8687

87-
private ActiveMQConnectionFactoryFactory createFactory(ActiveMQProperties properties) {
88+
private ActiveMQConnectionFactoryFactory createFactory(
89+
ActiveMQProperties properties) {
8890
return new ActiveMQConnectionFactoryFactory(properties,
8991
Collections.<ActiveMQConnectionFactoryCustomizer>emptyList());
9092
}

0 commit comments

Comments
 (0)