Skip to content

Commit 4b55144

Browse files
philwebbphilwebb
committed
Polish
1 parent 03dad33 commit 4b55144

File tree

32 files changed

+158
-105
lines changed

32 files changed

+158
-105
lines changed

Diff for: ‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public HealthIndicator cassandraHealthIndicator() {
183183
}
184184

185185
@Configuration
186-
@ConditionalOnClass({ CouchbaseOperations.class, Bucket.class})
186+
@ConditionalOnClass({ CouchbaseOperations.class, Bucket.class })
187187
@ConditionalOnBean(CouchbaseOperations.class)
188188
@ConditionalOnEnabledHealthIndicator("couchbase")
189189
public static class CouchbaseHealthIndicatorConfiguration extends

Diff for: ‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CouchbaseHealthIndicator.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ public CouchbaseHealthIndicator(CouchbaseOperations couchbaseOperations) {
4141

4242
@Override
4343
protected void doHealthCheck(Health.Builder builder) throws Exception {
44-
List<Version> versions = this.couchbaseOperations.getCouchbaseClusterInfo().getAllVersions();
45-
builder.up().withDetail("versions", StringUtils.collectionToCommaDelimitedString(versions));
44+
List<Version> versions = this.couchbaseOperations.getCouchbaseClusterInfo()
45+
.getAllVersions();
46+
builder.up().withDetail("versions",
47+
StringUtils.collectionToCommaDelimitedString(versions));
4648
}
4749

4850
}

Diff for: ‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,8 @@ public void couchbaseHealthIndicator() throws Exception {
449449
Map<String, HealthIndicator> beans = this.context
450450
.getBeansOfType(HealthIndicator.class);
451451
assertThat(beans.size()).isEqualTo(1);
452-
assertThat(beans.values().iterator().next().getClass()).isEqualTo(CouchbaseHealthIndicator.class);
452+
assertThat(beans.values().iterator().next().getClass())
453+
.isEqualTo(CouchbaseHealthIndicator.class);
453454
}
454455

455456
@Configuration

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.couchbase.client.java.CouchbaseBucket;
2424

2525
import org.springframework.beans.factory.annotation.Autowired;
26+
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2627
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2829
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -39,15 +40,14 @@
3940
import org.springframework.data.couchbase.repository.support.IndexManager;
4041

4142
/**
42-
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
43-
* Auto-Configuration} for Couchbase.
43+
* {@link EnableAutoConfiguration Auto-Configuration} for Couchbase.
4444
*
4545
* @author Eddú Meléndez
4646
* @author Stephane Nicoll
4747
* @since 1.4.0
4848
*/
4949
@Configuration
50-
@ConditionalOnClass({CouchbaseBucket.class, AbstractCouchbaseConfiguration.class})
50+
@ConditionalOnClass({ CouchbaseBucket.class, AbstractCouchbaseConfiguration.class })
5151
@Conditional(CouchbaseAutoConfiguration.CouchbaseCondition.class)
5252
@EnableConfigurationProperties(CouchbaseProperties.class)
5353
public class CouchbaseAutoConfiguration {
@@ -107,8 +107,9 @@ public IndexManager indexManager() {
107107
}
108108

109109
/**
110-
* Determine if Couchbase should be configured. This happens if either the user-configuration
111-
* defines a couchbase configuration or if at least the bucket name is specified.
110+
* Determine if Couchbase should be configured. This happens if either the
111+
* user-configuration defines a couchbase configuration or if at least the bucket name
112+
* is specified.
112113
*/
113114
static class CouchbaseCondition extends AnyNestedCondition {
114115

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@
3434
public class CouchbaseProperties {
3535

3636
/**
37-
* Automatically create views and indexes. Use the meta-data provided by "@ViewIndexed",
38-
* "@N1qlPrimaryIndexed" and "@N1qlSecondaryIndexed".
37+
* Automatically create views and indexes. Use the meta-data provided by
38+
* "@ViewIndexed", "@N1qlPrimaryIndexed" and "@N1qlSecondaryIndexed".
3939
*/
4040
private boolean autoIndex;
4141

4242
/**
4343
* Couchbase nodes (host or IP address) to bootstrap from.
4444
*/
45-
private List<String> bootstrapHosts = new ArrayList<String>(Collections.singletonList("localhost"));
45+
private List<String> bootstrapHosts = new ArrayList<String>(
46+
Collections.singletonList("localhost"));
4647

4748
private final Bucket bucket = new Bucket();
4849

@@ -106,6 +107,7 @@ public String getPassword() {
106107
public void setPassword(String password) {
107108
this.password = password;
108109
}
110+
109111
}
110112

111113
}

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesRegistrar.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
* @author Eddú Meléndez
3232
* @since 1.4.0
3333
*/
34-
public class CouchbaseRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
34+
public class CouchbaseRepositoriesRegistrar
35+
extends AbstractRepositoryConfigurationSourceSupport {
3536

3637
@Override
3738
protected Class<? extends Annotation> getAnnotation() {

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ protected final RedisClusterConfiguration getClusterConfiguration() {
132132

133133
private List<RedisNode> createSentinels(Sentinel sentinel) {
134134
List<RedisNode> nodes = new ArrayList<RedisNode>();
135-
for (String node : StringUtils.commaDelimitedListToStringArray(sentinel.getNodes())) {
135+
for (String node : StringUtils
136+
.commaDelimitedListToStringArray(sentinel.getNodes())) {
136137
try {
137138
String[] parts = StringUtils.split(node, ":");
138139
Assert.state(parts.length == 2, "Must be defined as 'host:port'");
@@ -190,8 +191,8 @@ public JedisConnectionFactory redisConnectionFactory()
190191
}
191192

192193
private JedisConnectionFactory createJedisConnectionFactory() {
193-
JedisPoolConfig poolConfig = this.properties.getPool() != null ? jedisPoolConfig()
194-
: new JedisPoolConfig();
194+
JedisPoolConfig poolConfig = this.properties.getPool() != null
195+
? jedisPoolConfig() : new JedisPoolConfig();
195196

196197
if (getSentinelConfig() != null) {
197198
return new JedisConnectionFactory(getSentinelConfig(), poolConfig);

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisProperties.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ public void setMaxWait(int maxWait) {
195195
public static class Cluster {
196196

197197
/**
198-
* Comma-separated list of "host:port" pairs to bootstrap from. This represents
199-
* an "initial" list of cluster nodes and is required to have at least one entry.
198+
* Comma-separated list of "host:port" pairs to bootstrap from. This represents an
199+
* "initial" list of cluster nodes and is required to have at least one entry.
200200
*/
201201
private List<String> nodes;
202202

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ static class Tomcat extends DataSourceConfiguration {
5252
@ConfigurationProperties("spring.datasource.tomcat")
5353
public org.apache.tomcat.jdbc.pool.DataSource dataSource(
5454
DataSourceProperties properties) {
55-
org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource(properties,
56-
org.apache.tomcat.jdbc.pool.DataSource.class);
57-
DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(properties.determineUrl());
55+
org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource(
56+
properties, org.apache.tomcat.jdbc.pool.DataSource.class);
57+
DatabaseDriver databaseDriver = DatabaseDriver
58+
.fromJdbcUrl(properties.determineUrl());
5859
String validationQuery = databaseDriver.getValidationQuery();
5960
if (validationQuery != null) {
6061
dataSource.setTestOnBorrow(true);
@@ -84,9 +85,10 @@ static class Dbcp extends DataSourceConfiguration {
8485
@ConfigurationProperties("spring.datasource.dbcp")
8586
public org.apache.commons.dbcp.BasicDataSource dataSource(
8687
DataSourceProperties properties) {
87-
org.apache.commons.dbcp.BasicDataSource dataSource = createDataSource(properties,
88-
org.apache.commons.dbcp.BasicDataSource.class);
89-
DatabaseDriver databaseDriver = DatabaseDriver.fromJdbcUrl(properties.determineUrl());
88+
org.apache.commons.dbcp.BasicDataSource dataSource = createDataSource(
89+
properties, org.apache.commons.dbcp.BasicDataSource.class);
90+
DatabaseDriver databaseDriver = DatabaseDriver
91+
.fromJdbcUrl(properties.determineUrl());
9092
String validationQuery = databaseDriver.getValidationQuery();
9193
if (validationQuery != null) {
9294
dataSource.setTestOnBorrow(true);

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/solr/SolrAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @since 1.1.0
4141
*/
4242
@Configuration
43-
@ConditionalOnClass({HttpSolrClient.class, CloudSolrClient.class})
43+
@ConditionalOnClass({ HttpSolrClient.class, CloudSolrClient.class })
4444
@EnableConfigurationProperties(SolrProperties.class)
4545
public class SolrAutoConfiguration {
4646

Diff for: ‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ public static class Chain {
170170
private boolean htmlApplicationCache = false;
171171

172172
/**
173-
* Enable resolution of already gzipped resources. Checks for a resource
174-
* name variant with the *.gz extension.
173+
* Enable resolution of already gzipped resources. Checks for a resource name
174+
* variant with the {@code *.gz} extension.
175175
*/
176176
private boolean gzipped = false;
177177

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationTests.java

+28-16
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,24 @@ public void bucketNameIsRequired() {
6565
load(null);
6666
assertThat(this.context.getBeansOfType(CouchbaseTemplate.class)).isEmpty();
6767
assertThat(this.context.getBeansOfType(Bucket.class)).isEmpty();
68-
assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class)).isEmpty();
68+
assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class))
69+
.isEmpty();
6970
}
7071

7172
@Test
72-
public void bucketNameIsNotRequiredIfCustomConfigurationIsSpecified() throws Exception {
73+
public void bucketNameIsNotRequiredIfCustomConfigurationIsSpecified()
74+
throws Exception {
7375
load(CouchbaseTestConfiguration.class);
74-
75-
assertThat(this.context.getBeansOfType(AbstractCouchbaseConfiguration.class)).hasSize(1);
76-
CouchbaseTestConfiguration configuration = this.context.getBean(CouchbaseTestConfiguration.class);
77-
assertThat(this.context.getBean(CouchbaseTemplate.class)).isSameAs(configuration.couchbaseTemplate());
78-
assertThat(this.context.getBean(Bucket.class)).isSameAs(configuration.couchbaseClient());
79-
assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class)).isEmpty();
76+
assertThat(this.context.getBeansOfType(AbstractCouchbaseConfiguration.class))
77+
.hasSize(1);
78+
CouchbaseTestConfiguration configuration = this.context
79+
.getBean(CouchbaseTestConfiguration.class);
80+
assertThat(this.context.getBean(CouchbaseTemplate.class))
81+
.isSameAs(configuration.couchbaseTemplate());
82+
assertThat(this.context.getBean(Bucket.class))
83+
.isSameAs(configuration.couchbaseClient());
84+
assertThat(this.context.getBeansOfType(ValidatingCouchbaseEventListener.class))
85+
.isEmpty();
8086
}
8187

8288
@Test
@@ -92,7 +98,8 @@ public void validatorIsPresent() {
9298
@Test
9399
public void autoIndexIsDisabledByDefault() {
94100
load(CouchbaseTestConfiguration.class);
95-
CouchbaseTestConfiguration configuration = this.context.getBean(CouchbaseTestConfiguration.class);
101+
CouchbaseTestConfiguration configuration = this.context
102+
.getBean(CouchbaseTestConfiguration.class);
96103
IndexManager indexManager = configuration.indexManager();
97104
assertThat(indexManager.isIgnoreViews()).isTrue();
98105
assertThat(indexManager.isIgnoreN1qlPrimary()).isTrue();
@@ -102,7 +109,8 @@ public void autoIndexIsDisabledByDefault() {
102109
@Test
103110
public void enableAutoIndex() {
104111
load(CouchbaseTestConfiguration.class, "spring.data.couchbase.auto-index=true");
105-
CouchbaseTestConfiguration configuration = this.context.getBean(CouchbaseTestConfiguration.class);
112+
CouchbaseTestConfiguration configuration = this.context
113+
.getBean(CouchbaseTestConfiguration.class);
106114
IndexManager indexManager = configuration.indexManager();
107115
assertThat(indexManager.isIgnoreViews()).isFalse();
108116
assertThat(indexManager.isIgnoreN1qlPrimary()).isFalse();
@@ -111,16 +119,21 @@ public void enableAutoIndex() {
111119

112120
@Test
113121
public void changeConsistency() {
114-
load(CouchbaseTestConfiguration.class, "spring.data.couchbase.consistency=eventually-consistent");
115-
CouchbaseTestConfiguration configuration = this.context.getBean(CouchbaseTestConfiguration.class);
116-
assertThat(configuration.getDefaultConsistency()).isEqualTo(Consistency.EVENTUALLY_CONSISTENT);
122+
load(CouchbaseTestConfiguration.class,
123+
"spring.data.couchbase.consistency=eventually-consistent");
124+
CouchbaseTestConfiguration configuration = this.context
125+
.getBean(CouchbaseTestConfiguration.class);
126+
assertThat(configuration.getDefaultConsistency())
127+
.isEqualTo(Consistency.EVENTUALLY_CONSISTENT);
117128
}
118129

119130
@Test
120131
public void overrideCouchbaseOperations() {
121132
load(CouchbaseTemplateConfiguration.class);
122-
CouchbaseTemplateConfiguration configuration = this.context.getBean(CouchbaseTemplateConfiguration.class);
123-
assertThat(this.context.getBean(CouchbaseTemplate.class)).isSameAs(configuration.myCouchbaseTemplate());
133+
CouchbaseTemplateConfiguration configuration = this.context
134+
.getBean(CouchbaseTemplateConfiguration.class);
135+
assertThat(this.context.getBean(CouchbaseTemplate.class))
136+
.isSameAs(configuration.myCouchbaseTemplate());
124137
}
125138

126139
private void load(Class<?> config, String... environment) {
@@ -146,7 +159,6 @@ public Validator myValidator() {
146159

147160
}
148161

149-
150162
@Configuration
151163
@Import(CouchbaseTestConfiguration.class)
152164
static class CouchbaseTemplateConfiguration {

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseTestConfiguration.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
* @author Stephane Nicoll
3434
*/
3535
@Configuration
36-
public class CouchbaseTestConfiguration extends CouchbaseAutoConfiguration.CouchbaseConfiguration {
36+
public class CouchbaseTestConfiguration
37+
extends CouchbaseAutoConfiguration.CouchbaseConfiguration {
3738

3839
@Override
3940
public Cluster couchbaseCluster() throws Exception {
4041
return mock(CouchbaseCluster.class);
4142
}
4243

44+
@Override
4345
@Bean
4446
public ClusterInfo couchbaseClusterInfo() {
4547
return mock(ClusterInfo.class);

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java

+2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import static org.assertj.core.api.Assertions.assertThat;
3636

3737
/**
38+
* Tests for {@link CouchbaseRepositoriesAutoConfiguration}.
39+
*
3840
* @author Eddú Meléndez
3941
*/
4042
public class CouchbaseRepositoriesAutoConfigurationTests {

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ public void testRedisConfigurationWithCluster() throws Exception {
110110
if (isAtLeastOneNodeAvailable(clusterNodes)) {
111111
load("spring.redis.cluster.nodes[0]:" + clusterNodes.get(0),
112112
"spring.redis.cluster.nodes[1]:" + clusterNodes.get(1));
113-
assertThat(
114-
this.context.getBean(JedisConnectionFactory.class)
115-
.getClusterConnection()).isNotNull();
113+
assertThat(this.context.getBean(JedisConnectionFactory.class)
114+
.getClusterConnection()).isNotNull();
116115
}
117116
}
118117

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ public void hikariIsFallback() throws Exception {
134134
public void hikariValidatesConnectionByDefault() throws Exception {
135135
HikariDataSource dataSource = autoConfigureDataSource(HikariDataSource.class,
136136
"org.apache.tomcat");
137-
assertThat(dataSource.getConnectionTestQuery()).isNull(); // Use Connection#isValid()
137+
assertThat(dataSource.getConnectionTestQuery()).isNull(); // Use
138+
// Connection#isValid()
138139
}
139140

140141
@Test
@@ -161,7 +162,6 @@ public void commonsDbcp2IsFallback() throws Exception {
161162
assertThat(dataSource.getUrl()).isEqualTo("jdbc:hsqldb:mem:testdb");
162163
}
163164

164-
165165
@Test
166166
public void commonsDbcp2ValidatesConnectionByDefault() throws Exception {
167167
org.apache.commons.dbcp2.BasicDataSource dataSource = autoConfigureDataSource(

Diff for: ‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ static class LayoutDialectConfiguration {
254254
public LayoutDialect layoutDialect() {
255255
return new LayoutDialect(new GroupingStrategy());
256256
}
257+
257258
}
258259

259260
}

Diff for: ‎spring-boot-docs/src/main/asciidoc/appendix-configuration-metadata.adoc

+1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ methods can be removed from your public API, the automatic deprecation hint in t
257257
meta-data will go away as well.
258258

259259

260+
260261
[[configuration-metadata-hints-attributes]]
261262
==== Hint Attributes
262263
The JSON object contained in the `hints` array can contain the following attributes:

Diff for: ‎spring-boot-samples/spring-boot-sample-data-couchbase/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,4 @@
5050
</plugin>
5151
</plugins>
5252
</build>
53-
5453
</project>

Diff for: ‎spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/SampleCouchbaseApplication.java

-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public static void main(String[] args) {
3737
public void run(String... args) throws Exception {
3838
this.userRepository.deleteAll();
3939
User user = saveUser();
40-
4140
System.out.println(this.userRepository.findOne(user.getId()));
4241
}
4342

@@ -46,7 +45,6 @@ private User saveUser() {
4645
user.setId(UUID.randomUUID().toString());
4746
user.setFirstName("Alice");
4847
user.setLastName("Smith");
49-
5048
return this.userRepository.save(user);
5149
}
5250

Diff for: ‎spring-boot-samples/spring-boot-sample-data-couchbase/src/main/java/sample/data/couchbase/User.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package sample.data.couchbase;
1818

19-
2019
import com.couchbase.client.java.repository.annotation.Field;
2120
import com.couchbase.client.java.repository.annotation.Id;
21+
2222
import org.springframework.data.couchbase.core.mapping.Document;
2323

2424
@Document
@@ -59,10 +59,8 @@ public void setLastName(String lastName) {
5959

6060
@Override
6161
public String toString() {
62-
return "User{" +
63-
"id='" + this.id + '\'' +
64-
", firstName='" + this.firstName + '\'' +
65-
", lastName='" + this.lastName + '\'' +
66-
'}';
62+
return "User{" + "id='" + this.id + '\'' + ", firstName='" + this.firstName + '\''
63+
+ ", lastName='" + this.lastName + '\'' + '}';
6764
}
65+
6866
}

0 commit comments

Comments
 (0)