diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
index 49fa855197..629b69e400 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/JmsHealthIndicatorTests.java
@@ -86,10 +86,8 @@ public class JmsHealthIndicatorTests {
 		given(connectionMetaData.getJMSProviderName()).willReturn("JMS test provider");
 		Connection connection = mock(Connection.class);
 		given(connection.getMetaData()).willReturn(connectionMetaData);
-		willThrow(new JMSException("Could not start", "123"))
-				.given(connection).start();
-		given(connectionFactory.createConnection())
-				.willReturn(connection);
+		willThrow(new JMSException("Could not start", "123")).given(connection).start();
+		given(connectionFactory.createConnection()).willReturn(connection);
 		JmsHealthIndicator indicator = new JmsHealthIndicator(connectionFactory);
 		Health health = indicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
index ae32dec5a6..bf92b24e35 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
@@ -73,9 +73,8 @@ public class BatchProperties {
 	public class Initializer {
 
 		/**
-		 * Create the required batch tables on startup if necessary. Enabled
-		 * automatically if no custom table prefix is set or if a custom schema is
-		 * configured.
+		 * Create the required batch tables on startup if necessary. Enabled automatically
+		 * if no custom table prefix is set or if a custom schema is configured.
 		 */
 		private Boolean enabled;
 
@@ -84,8 +83,8 @@ public class BatchProperties {
 				return this.enabled;
 			}
 			boolean defaultTablePrefix = BatchProperties.this.getTablePrefix() == null;
-			boolean customSchema = !DEFAULT_SCHEMA_LOCATION.equals(
-					BatchProperties.this.getSchema());
+			boolean customSchema = !DEFAULT_SCHEMA_LOCATION
+					.equals(BatchProperties.this.getSchema());
 			return (defaultTablePrefix || customSchema);
 		}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java
index e8ffbf67f6..0bee9e635a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java
@@ -154,10 +154,10 @@ public class SessionProperties {
 				if (this.enabled != null) {
 					return this.enabled;
 				}
-				boolean defaultTableName = DEFAULT_TABLE_NAME.equals(
-						Jdbc.this.getTableName());
-				boolean customSchema = !DEFAULT_SCHEMA_LOCATION.equals(
-						Jdbc.this.getSchema());
+				boolean defaultTableName = DEFAULT_TABLE_NAME
+						.equals(Jdbc.this.getTableName());
+				boolean customSchema = !DEFAULT_SCHEMA_LOCATION
+						.equals(Jdbc.this.getSchema());
 				return (defaultTableName || customSchema);
 			}