Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Phillip Webb
2016-04-11 09:59:16 -07:00
parent f87defe15a
commit 2d992c1324
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java
View File

@@ -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

12
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java
View File

@@ -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);
}

2
spring-boot/src/main/java/org/springframework/boot/jta/narayana/NarayanaProperties.java
View File

@@ -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;