Skip to content

Commit 0a02479

Browse files
philwebbphilwebb
committed
Formatting
1 parent 1314aaa commit 0a02479

File tree

36 files changed

+59
-28
lines changed

36 files changed

+59
-28
lines changed

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ public void serializeAsField(Object pojo, JsonGenerator jgen,
344344
}
345345
super.serializeAsField(pojo, jgen, provider, writer);
346346
}
347+
347348
}
348349

349350
/**
@@ -395,4 +396,5 @@ private AnnotatedMethod findSetter(BeanDescription beanDesc,
395396
}
396397

397398
}
399+
398400
}

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ protected String createPrefix(String name, DataSource dataSource, boolean primar
104104
if (primary) {
105105
return "datasource.primary";
106106
}
107-
if (name.length() > DATASOURCE_SUFFIX.length()
108-
&& name.toLowerCase(Locale.ENGLISH).endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
107+
if (name.length() > DATASOURCE_SUFFIX.length() && name.toLowerCase(Locale.ENGLISH)
108+
.endsWith(DATASOURCE_SUFFIX.toLowerCase())) {
109109
name = name.substring(0, name.length() - DATASOURCE_SUFFIX.length());
110110
}
111111
return "datasource." + name;

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public List<FlywayReport> invoke() {
7373
public static class FlywayReport {
7474

7575
private final String name;
76+
7677
private final List<FlywayMigration> migrations;
7778

7879
public FlywayReport(String name, List<FlywayMigration> migrations) {

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpointSecurityInterceptor.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ private boolean hasAuthority(String role) {
142142
}
143143
return false;
144144
}
145+
145146
}
146147

147148
}

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,23 @@ static class TestMetricsMvcEndpoint extends MetricsMvcEndpoint {
325325
TestMetricsMvcEndpoint(MetricsEndpoint delegate) {
326326
super(delegate);
327327
}
328+
328329
}
329330

330331
static class TestAuditEventsMvcEndpoint extends AuditEventsMvcEndpoint {
331332

332333
TestAuditEventsMvcEndpoint(AuditEventRepository auditEventRepository) {
333334
super(auditEventRepository);
334335
}
336+
335337
}
336338

337339
static class TestShutdownMvcEndpoint extends ShutdownMvcEndpoint {
338340

339341
TestShutdownMvcEndpoint(ShutdownEndpoint delegate) {
340342
super(delegate);
341343
}
344+
342345
}
343346

344347
}

‎spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpointTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,5 @@ public void newValueIsReturnedOnceTtlExpires() throws InterruptedException {
277277
Health health = ((ResponseEntity<Health>) result).getBody();
278278
assertThat(health.getStatus() == Status.DOWN).isTrue();
279279
}
280+
280281
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ public CacheManagerCustomizers cacheManagerCustomizers(
7575

7676
@Bean
7777
public CacheManagerValidator cacheAutoConfigurationValidator(
78-
CacheProperties cacheProperties,
79-
ObjectProvider<CacheManager> cacheManager) {
78+
CacheProperties cacheProperties, ObjectProvider<CacheManager> cacheManager) {
8079
return new CacheManagerValidator(cacheProperties, cacheManager);
8180
}
8281

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ public CassandraSessionFactoryBean session(CassandraConverter converter)
115115
session.setKeyspaceName(this.properties.getKeyspaceName());
116116
String name = this.propertyResolver.getProperty("schemaAction",
117117
SchemaAction.NONE.name());
118-
SchemaAction schemaAction = SchemaAction.valueOf(
119-
name.toUpperCase(Locale.ENGLISH));
118+
SchemaAction schemaAction = SchemaAction
119+
.valueOf(name.toUpperCase(Locale.ENGLISH));
120120
session.setSchemaAction(schemaAction);
121121
return session;
122122
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ protected static class IntegrationManagementConfiguration {
120120
@Configuration
121121
@EnableIntegrationManagement(defaultCountsEnabled = "true", defaultStatsEnabled = "true")
122122
protected static class EnableIntegrationManagementConfiguration {
123+
123124
}
124125

125126
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationScanRegistrar.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public Map<String, Object> getAnnotationAttributes(String annotationName) {
7777
}
7878
return attributes;
7979
}
80+
8081
}
8182

8283
@IntegrationComponentScan

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ static class NoClientCredentialsCondition extends NoneNestedConditions {
185185

186186
@Conditional(ClientCredentialsCondition.class)
187187
static class ClientCredentialsActivated {
188+
188189
}
189190

190191
}
@@ -200,10 +201,12 @@ static class ClientCredentialsCondition extends AnyNestedCondition {
200201

201202
@ConditionalOnProperty(prefix = "security.oauth2.client", name = "grant-type", havingValue = "client_credentials", matchIfMissing = false)
202203
static class ClientCredentialsConfigured {
204+
203205
}
204206

205207
@ConditionalOnNotWebApplication
206208
static class NoWebApplication {
209+
207210
}
208211

209212
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ public String getKeySetUri() {
292292
public void setKeySetUri(String keySetUri) {
293293
this.keySetUri = keySetUri;
294294
}
295+
295296
}
296297

297298
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ public DefaultTokenServices jwkTokenServices(TokenStore jwkTokenStore) {
234234
public TokenStore jwkTokenStore() {
235235
return new JwkTokenStore(this.resource.getJwk().getKeySetUri());
236236
}
237+
237238
}
238239

239240
@Configuration
@@ -415,6 +416,7 @@ static class HasJwtConfiguration {
415416
static class HasJwkConfiguration {
416417

417418
}
419+
418420
}
419421

420422
static class AcceptJsonRequestInterceptor implements ClientHttpRequestInterceptor {

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public TransactionTemplateConfiguration(
7575
public TransactionTemplate transactionTemplate() {
7676
return new TransactionTemplate(this.transactionManager);
7777
}
78+
7879
}
7980

8081
@Configuration

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -776,8 +776,8 @@ public void caffeineCacheExplicitWithSpecString() {
776776
public void autoConfiguredCacheManagerCanBeSwapped() {
777777
load(CacheManagerPostProcessorConfiguration.class, "spring.cache.type=caffeine");
778778
validateCacheManager(SimpleCacheManager.class);
779-
CacheManagerPostProcessor postProcessor = this.context.getBean(
780-
CacheManagerPostProcessor.class);
779+
CacheManagerPostProcessor postProcessor = this.context
780+
.getBean(CacheManagerPostProcessor.class);
781781
assertThat(postProcessor.cacheManagers).hasSize(1);
782782
assertThat(postProcessor.cacheManagers.get(0))
783783
.isInstanceOf(CaffeineCacheManager.class);
@@ -1193,14 +1193,14 @@ private static class CacheManagerPostProcessor implements BeanPostProcessor {
11931193
private final List<CacheManager> cacheManagers = new ArrayList<CacheManager>();
11941194

11951195
@Override
1196-
public Object postProcessBeforeInitialization(Object bean,
1197-
String beanName) throws BeansException {
1196+
public Object postProcessBeforeInitialization(Object bean, String beanName)
1197+
throws BeansException {
11981198
return bean;
11991199
}
12001200

12011201
@Override
1202-
public Object postProcessAfterInitialization(Object bean,
1203-
String beanName) throws BeansException {
1202+
public Object postProcessAfterInitialization(Object bean, String beanName)
1203+
throws BeansException {
12041204
if (bean instanceof CacheManager) {
12051205
this.cacheManagers.add((CacheManager) bean);
12061206
return new SimpleCacheManager();

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ static class MyConverter implements Converter<CouchbaseProperties, Boolean> {
185185
public Boolean convert(CouchbaseProperties value) {
186186
return true;
187187
}
188+
188189
}
189190

190191
}

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public TransactionalService transactionalService() {
203203
public AnotherServiceImpl anotherService() {
204204
return new AnotherServiceImpl();
205205
}
206+
206207
}
207208

208209
@Configuration

‎spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ public void doSomething(@Size(min = 3, max = 10) String name) {
304304
interface AnotherSampleService {
305305

306306
void doSomething(@Min(42) Integer counter);
307+
307308
}
308309

309310
@Validated
@@ -313,6 +314,7 @@ static class DefaultAnotherSampleService implements AnotherSampleService {
313314
public void doSomething(Integer counter) {
314315

315316
}
317+
316318
}
317319

318320
@Configuration
@@ -382,6 +384,7 @@ public Object postProcessBeforeInitialization(Object bean, String name) {
382384
}
383385

384386
}
387+
385388
}
386389

387390
}

‎spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ protected ExitStatus run(OptionSet options) throws Exception {
131131

132132
File output = new File((String) nonOptionArguments.remove(0));
133133
Assert.isTrue(
134-
output.getName().toLowerCase(Locale.ENGLISH).endsWith("." + this.type),
135-
"The output '" + output + "' is not a " + this.type.toUpperCase(
136-
Locale.ENGLISH) + " file.");
134+
output.getName().toLowerCase(Locale.ENGLISH)
135+
.endsWith("." + this.type),
136+
"The output '" + output + "' is not a "
137+
+ this.type.toUpperCase(Locale.ENGLISH) + " file.");
137138
deleteIfExists(output);
138139

139140
GroovyCompiler compiler = createCompiler(options);

‎spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,8 @@ URI generateUrl(InitializrServiceMetadata metadata) {
360360
return builder.build();
361361
}
362362
catch (URISyntaxException ex) {
363-
throw new ReportableException("Invalid service URL (" + ex.getMessage() + ")");
363+
throw new ReportableException(
364+
"Invalid service URL (" + ex.getMessage() + ")");
364365
}
365366
}
366367

‎spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,5 @@ public void customize(HttpClientConfig.Builder builder) {
4242

4343
}
4444
// end::customizer[]
45+
4546
}

‎spring-boot-docs/src/test/java/org/springframework/boot/web/client/SampleWebClientTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@ static class Config {
5555

5656
@Bean
5757
public RestTemplateBuilder restTemplateBuilder() {
58-
return new RestTemplateBuilder()
59-
.setConnectTimeout(1000)
60-
.setReadTimeout(1000);
58+
return new RestTemplateBuilder().setConnectTimeout(1000).setReadTimeout(1000);
6159
}
6260

6361
}

‎spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ public boolean equals(Object obj) {
354354
public String toString() {
355355
return this.key.toString();
356356
}
357+
357358
}
358359

359360
/**

‎spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestMethodConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ public class TestMethodConfiguration {
3030
public Object method() {
3131
return null;
3232
}
33+
3334
}

‎spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/TestOrderedClassConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@
2929
@TestConditionalOnClass(name = "java.io.InputStream", value = OutputStream.class)
3030
@TestAutoConfigureOrder(123)
3131
public class TestOrderedClassConfiguration {
32+
3233
}

‎spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,8 +549,8 @@ public void mergingOfAdditionalPropertyMatchingGroup() throws Exception {
549549
"java.lang.String", null, null, null, null, null);
550550
writeAdditionalMetadata(property);
551551
ConfigurationMetadata metadata = compile(SimpleProperties.class);
552-
assertThat(metadata).has(Metadata.withGroup("simple")
553-
.fromSource(SimpleProperties.class));
552+
assertThat(metadata)
553+
.has(Metadata.withGroup("simple").fromSource(SimpleProperties.class));
554554
assertThat(metadata).has(Metadata.withProperty("simple", String.class));
555555
}
556556

‎spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public boolean isExecutable() {
160160

161161
/**
162162
* Module layout (designed to be used as a "plug-in").
163+
*
163164
* @deprecated as of 1.5 in favor of a custom {@link LayoutFactory}
164165
*/
165166
@Deprecated

‎spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
108108

109109
private JarFile(RandomAccessDataFile rootFile, String pathFromRoot,
110110
RandomAccessData data, JarEntryFilter filter, JarFileType type)
111-
throws IOException {
111+
throws IOException {
112112
super(rootFile.getFile());
113113
this.rootFile = rootFile;
114114
this.pathFromRoot = pathFromRoot;

‎spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
* @param <T> the target type
5555
* @author Dave Syer
5656
*/
57-
public class PropertiesConfigurationFactory<T>
58-
implements FactoryBean<T>, ApplicationContextAware, MessageSourceAware, InitializingBean {
57+
public class PropertiesConfigurationFactory<T> implements FactoryBean<T>,
58+
ApplicationContextAware, MessageSourceAware, InitializingBean {
5959

6060
private static final char[] EXACT_DELIMITERS = { '_', '.', '[' };
6161

‎spring-boot/src/main/java/org/springframework/boot/context/config/AnsiOutputApplicationListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public void onApplicationEvent(ApplicationEnvironmentPreparedEvent event) {
4242
event.getEnvironment(), "spring.output.ansi.");
4343
if (resolver.containsProperty("enabled")) {
4444
String enabled = resolver.getProperty("enabled");
45-
AnsiOutput.setEnabled(Enum.valueOf(Enabled.class,
46-
enabled.toUpperCase(Locale.ENGLISH)));
45+
AnsiOutput.setEnabled(
46+
Enum.valueOf(Enabled.class, enabled.toUpperCase(Locale.ENGLISH)));
4747
}
4848

4949
if (resolver.containsProperty("console-available")) {

‎spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ && isResourcesJar((JarURLConnection) connection)) {
130130

131131
/**
132132
* Converts the given {@code url} into a decoded file path.
133-
*
134133
* @param url the url to convert
135134
* @return the file path
136135
* @deprecated Since 1.5.13 in favor of {@link File#File(java.net.URI)}

‎spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
* @author Venil Noronha
103103
* @author Henri Kerola
104104
* @author Henrich Krämer
105-
*
106105
* @see #setPort(int)
107106
* @see #setConfigurations(Collection)
108107
* @see JettyEmbeddedServletContainer

‎spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,7 @@ private URLResource getMetaInfResource(URL resourceJar, String path) {
701701
return null;
702702
}
703703
}
704+
704705
}
705706

706707
/**
@@ -722,6 +723,7 @@ public void onStartup(Set<Class<?>> classes, ServletContext servletContext)
722723
initializer.onStartup(servletContext);
723724
}
724725
}
726+
725727
}
726728

727729
/**

‎spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
112112
resp.getWriter().print("An error occurred");
113113
resp.flushBuffer();
114114
}
115+
115116
}
116117

117118
}

‎spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessorTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,7 @@ public ValidatedPropertiesImpl testProperties() {
554554
interface ValidatedProperties {
555555

556556
String getFoo();
557+
557558
}
558559

559560
@ConfigurationProperties("test")
@@ -890,6 +891,7 @@ public Resource resolve(String location, ResourceLoader resourceLoader) {
890891
}
891892
return null;
892893
}
894+
893895
}
894896

895897
}

0 commit comments

Comments
 (0)