Skip to content

Commit f34d309

Browse files
wilkinsonawilkinsona
committed
Formatting
1 parent c0c575c commit f34d309

File tree

10 files changed

+26
-25
lines changed

10 files changed

+26
-25
lines changed

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/admin/SpringApplicationAdminJmxAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ public class SpringApplicationAdminJmxAutoConfiguration {
6060
private final Environment environment;
6161

6262
public SpringApplicationAdminJmxAutoConfiguration(
63-
ObjectProvider<MBeanExporter> mbeanExporter,
64-
Environment environment) {
63+
ObjectProvider<MBeanExporter> mbeanExporter, Environment environment) {
6564
this.mbeanExporter = mbeanExporter.getIfAvailable();
6665
this.environment = environment;
6766
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ public CouchbaseCacheConfiguration(CacheProperties cacheProperties,
6060
public CouchbaseCacheManager cacheManager() {
6161
List<String> cacheNames = this.cacheProperties.getCacheNames();
6262
CouchbaseCacheManager cacheManager = new CouchbaseCacheManager(
63-
CacheBuilder.newInstance(this.bucket).withExpiration(
64-
this.cacheProperties.getCouchbase().getExpirationSeconds()),
63+
CacheBuilder.newInstance(this.bucket)
64+
.withExpiration(this.cacheProperties.getCouchbase()
65+
.getExpirationSeconds()),
6566
cacheNames.toArray(new String[cacheNames.size()]));
6667
return this.customizers.customize(cacheManager);
6768
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public class DataSourceAutoConfiguration {
7171

7272
@Bean
7373
@ConditionalOnMissingBean
74-
public DataSourceInitializer dataSourceInitializer(
75-
DataSourceProperties properties, ApplicationContext applicationContext) {
74+
public DataSourceInitializer dataSourceInitializer(DataSourceProperties properties,
75+
ApplicationContext applicationContext) {
7676
return new DataSourceInitializer(properties, applicationContext);
7777
}
7878

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
6060

6161
private boolean initialized = false;
6262

63-
DataSourceInitializer(DataSourceProperties properties, ApplicationContext applicationContext) {
63+
DataSourceInitializer(DataSourceProperties properties,
64+
ApplicationContext applicationContext) {
6465
this.properties = properties;
6566
this.applicationContext = applicationContext;
6667
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/aop/AopAutoConfigurationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ private void load(Class<?> config, String... environment) {
107107
this.context = ctx;
108108
}
109109

110-
111110
@EnableAspectJAutoProxy(proxyTargetClass = true)
112111
@Configuration
113112
@Import(TestConfiguration.class)

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ public void createClusterWithOverrides() {
6666
public void createCustomizeCluster() {
6767
load(MockCustomizerConfig.class);
6868
assertThat(this.context.getBeanNamesForType(Cluster.class).length).isEqualTo(1);
69-
assertThat(this.context.getBeanNamesForType(ClusterBuilderCustomizer.class).length)
70-
.isEqualTo(1);
69+
assertThat(
70+
this.context.getBeanNamesForType(ClusterBuilderCustomizer.class).length)
71+
.isEqualTo(1);
7172
}
7273

7374
@Test

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,24 +184,24 @@ public void determineDatabaseNoCheckIfDatabaseIsSet() throws SQLException {
184184
@Test
185185
public void determineDatabaseWithKnownUrl() {
186186
JpaProperties properties = load(HibernateVersion.V5);
187-
Database database = properties.determineDatabase(
188-
mockDataSource("jdbc:h2:mem:testdb"));
187+
Database database = properties
188+
.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
189189
assertThat(database).isEqualTo(Database.H2);
190190
}
191191

192192
@Test
193193
public void determineDatabaseWithKnownUrlAndUserConfig() {
194194
JpaProperties properties = load(HibernateVersion.V5, "spring.jpa.database=mysql");
195-
Database database = properties.determineDatabase(
196-
mockDataSource("jdbc:h2:mem:testdb"));
195+
Database database = properties
196+
.determineDatabase(mockDataSource("jdbc:h2:mem:testdb"));
197197
assertThat(database).isEqualTo(Database.MYSQL);
198198
}
199199

200200
@Test
201201
public void determineDatabaseWithUnknownUrl() {
202202
JpaProperties properties = load(HibernateVersion.V5);
203-
Database database = properties.determineDatabase(
204-
mockDataSource("jdbc:unknown://localhost"));
203+
Database database = properties
204+
.determineDatabase(mockDataSource("jdbc:unknown://localhost"));
205205
assertThat(database).isEqualTo(Database.DEFAULT);
206206
}
207207

@@ -222,7 +222,7 @@ private DataSource mockDataSource(String jdbcUrl) {
222222
given(ds.getConnection()).willReturn(connection);
223223
}
224224
catch (SQLException e) {
225-
//Do nothing
225+
// Do nothing
226226
}
227227
return ds;
228228
}

‎spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public SampleController(HelloWorldProperties helloWorldProperties) {
3939
@GetMapping("/")
4040
@ResponseBody
4141
public Map<String, String> hello() {
42-
return Collections.singletonMap("message", "Hello " +
43-
this.helloWorldProperties.getName());
42+
return Collections.singletonMap("message",
43+
"Hello " + this.helloWorldProperties.getName());
4444
}
4545

4646
protected static class Message {

‎spring-boot/src/main/java/org/springframework/boot/web/support/SpringBootServletInitializer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ private ApplicationContext getExistingRootWebApplicationContext(
163163
}
164164

165165
/**
166-
* Configure the application. Normally all you would need to do is to add sources (e.g.
167-
* config classes) because other settings have sensible defaults. You might choose
168-
* (for instance) to add default command line arguments, or set an active Spring
169-
* profile.
166+
* Configure the application. Normally all you would need to do is to add sources
167+
* (e.g. config classes) because other settings have sensible defaults. You might
168+
* choose (for instance) to add default command line arguments, or set an active
169+
* Spring profile.
170170
* @param builder a builder for the application context
171171
* @return the application builder
172172
* @see SpringApplicationBuilder

‎spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ public final MatchStatus matches(Set<String> profiles) {
144144
}
145145

146146
/**
147-
* {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is also
148-
* in {@code spring.profiles.active}.
147+
* {@link ProfilesMatcher} that matches when a value in {@code spring.profiles} is
148+
* also in {@code spring.profiles.active}.
149149
*/
150150
private static class ActiveProfilesMatcher extends ProfilesMatcher {
151151

0 commit comments

Comments
 (0)