From 2d992c13245f0854f493846ee77e96fd07da48bc Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 11 Apr 2016 09:59:16 -0700
Subject: [PATCH] Polish

---
 .../couchbase/CouchbaseAutoConfiguration.java        |  7 ++++---
 .../couchbase/CouchbaseAutoConfigurationTests.java   | 12 +++++++-----
 .../boot/jta/narayana/NarayanaProperties.java        |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
index 47c0bbf8a34..4eb6a72c32c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
@@ -50,7 +50,7 @@ import org.springframework.data.couchbase.config.CouchbaseConfigurer;
 public class CouchbaseAutoConfiguration {
 
 	@Configuration
-	@ConditionalOnMissingBean({CouchbaseConfigurer.class, CouchbaseConfiguration.class})
+	@ConditionalOnMissingBean({ CouchbaseConfigurer.class, CouchbaseConfiguration.class })
 	public static class CouchbaseConfiguration {
 
 		private final CouchbaseProperties properties;
@@ -91,9 +91,10 @@ public class CouchbaseAutoConfiguration {
 		/**
 		 * Initialize an environment builder based on the specified settings.
 		 * @param properties the couchbase properties to use
-		 * @return a {@link DefaultCouchbaseEnvironment.Builder}
+		 * @return the {@link DefaultCouchbaseEnvironment} builder.
 		 */
-		protected DefaultCouchbaseEnvironment.Builder initializeEnvironmentBuilder(CouchbaseProperties properties) {
+		protected DefaultCouchbaseEnvironment.Builder initializeEnvironmentBuilder(
+				CouchbaseProperties properties) {
 			CouchbaseProperties.Endpoints endpoints = properties.getEnv().getEndpoints();
 			CouchbaseProperties.Timeouts timeouts = properties.getEnv().getTimeouts();
 			DefaultCouchbaseEnvironment.Builder builder = DefaultCouchbaseEnvironment
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
index 34a68a22a45..aed46d1dd86 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
@@ -124,10 +124,12 @@ public class CouchbaseAutoConfigurationTests
 
 	@Test
 	public void customizeEnvWithCustomCouchbaseConfiguration() {
-		load(CustomCouchbaseConfiguration.class, "spring.couchbase.bootstrap-hosts=localhost",
+		load(CustomCouchbaseConfiguration.class,
+				"spring.couchbase.bootstrap-hosts=localhost",
 				"spring.couchbase.env.timeouts.connect=100");
 		assertThat(this.context.getBeansOfType(CouchbaseConfiguration.class)).hasSize(1);
-		DefaultCouchbaseEnvironment env = this.context.getBean(DefaultCouchbaseEnvironment.class);
+		DefaultCouchbaseEnvironment env = this.context
+				.getBean(DefaultCouchbaseEnvironment.class);
 		assertThat(env.socketConnectTimeout()).isEqualTo(5000);
 		assertThat(env.connectTimeout()).isEqualTo(2000);
 	}
@@ -136,8 +138,7 @@ public class CouchbaseAutoConfigurationTests
 			throws Exception {
 		load(CouchbaseTestConfigurer.class, environment);
 		CouchbaseProperties properties = this.context.getBean(CouchbaseProperties.class);
-		return new CouchbaseConfiguration(
-				properties).couchbaseEnvironment();
+		return new CouchbaseConfiguration(properties).couchbaseEnvironment();
 	}
 
 	@Configuration
@@ -149,7 +150,8 @@ public class CouchbaseAutoConfigurationTests
 		}
 
 		@Override
-		protected DefaultCouchbaseEnvironment.Builder initializeEnvironmentBuilder(CouchbaseProperties properties) {
+		protected DefaultCouchbaseEnvironment.Builder initializeEnvironmentBuilder(
+				CouchbaseProperties properties) {
 			return super.initializeEnvironmentBuilder(properties)
 					.socketConnectTimeout(5000).connectTimeout(2000);
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java
index b42d29d96db..8136787cff5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java
@@ -48,7 +48,7 @@ public class NarayanaProperties {
 	private String transactionManagerId = "1";
 
 	/**
-	 * Enable one phase commit optimisation.
+	 * Enable one phase commit optimization.
 	 */
 	private boolean onePhaseCommit = true;