Commit c56f30fd authored by Phillip Webb's avatar Phillip Webb

Formatting

parent c6629866
...@@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests { ...@@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests {
given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider"); given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider");
Connection connection = mock(Connection.class); Connection connection = mock(Connection.class);
given(connection.getMetaData()).willReturn(connectionMetaData); given(connection.getMetaData()).willReturn(connectionMetaData);
willThrow(new JMSException("Could not start", "123")) willThrow(new JMSException("Could not start", "123")).given(connection).start();
.given(connection).start(); given(connectionFactory.createConnection()).willReturn(connection);
given(connectionFactory.createConnection())
.willReturn(connection);
JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory); JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory);
Health health = indicator.health(); Health health = indicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN); assertThat(health.getStatus()).isEqualTo(Status.DOWN);
......
...@@ -73,9 +73,8 @@ public class BatchProperties { ...@@ -73,9 +73,8 @@ public class BatchProperties {
public class Initializer { public class Initializer {
/** /**
* Create the required batch tables on startup if necessary. Enabled * Create the required batch tables on startup if necessary. Enabled automatically
* automatically if no custom table prefix is set or if a custom schema is * if no custom table prefix is set or if a custom schema is configured.
* configured.
*/ */
private Boolean enabled; private Boolean enabled;
...@@ -84,8 +83,8 @@ public class BatchProperties { ...@@ -84,8 +83,8 @@ public class BatchProperties {
return this.enabled; return this.enabled;
} }
boolean defaultTablePrefix = BatchProperties.this.getTablePrefix() == null; boolean defaultTablePrefix = BatchProperties.this.getTablePrefix() == null;
boolean customSchema = !DEFAULT_SCHEMA_LOCATION.equals( boolean customSchema = !DEFAULT_SCHEMA_LOCATION
BatchProperties.this.getSchema()); .equals(BatchProperties.this.getSchema());
return (defaultTablePrefix || customSchema); return (defaultTablePrefix || customSchema);
} }
......
...@@ -154,10 +154,10 @@ public class SessionProperties { ...@@ -154,10 +154,10 @@ public class SessionProperties {
if (this.enabled != null) { if (this.enabled != null) {
return this.enabled; return this.enabled;
} }
boolean defaultTableName = DEFAULT_TABLE_NAME.equals( boolean defaultTableName = DEFAULT_TABLE_NAME
Jdbc.this.getTableName()); .equals(Jdbc.this.getTableName());
boolean customSchema = !DEFAULT_SCHEMA_LOCATION.equals( boolean customSchema = !DEFAULT_SCHEMA_LOCATION
Jdbc.this.getSchema()); .equals(Jdbc.this.getSchema());
return (defaultTableName || customSchema); return (defaultTableName || customSchema);
} }
......
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