Skip to content

Commit 5912235

Browse files
committed
Clean up and format code
1 parent 5d69318 commit 5912235

File tree

16 files changed

+32
-32
lines changed

16 files changed

+32
-32
lines changed

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ private ResourceLoader createResourceLoader(
216216
ApplicationContext applicationContext) {
217217
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
218218
if (applicationContext instanceof DefaultResourceLoader) {
219-
Collection<ProtocolResolver> protocolResolvers =
220-
((DefaultResourceLoader) applicationContext).getProtocolResolvers();
219+
Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
220+
.getProtocolResolvers();
221221
for (ProtocolResolver protocolResolver : protocolResolvers) {
222222
resourceLoader.addProtocolResolver(protocolResolver);
223223
}
@@ -247,11 +247,11 @@ public ResourcePatternResolver getResourcePatternResolver(
247247

248248
private ResourceLoader createResourceLoader(
249249
WebApplicationContext applicationContext) {
250-
WebApplicationContextResourceLoader resourceLoader =
251-
new WebApplicationContextResourceLoader(applicationContext);
250+
WebApplicationContextResourceLoader resourceLoader = new WebApplicationContextResourceLoader(
251+
applicationContext);
252252
if (applicationContext instanceof DefaultResourceLoader) {
253-
Collection<ProtocolResolver> protocolResolvers =
254-
((DefaultResourceLoader) applicationContext).getProtocolResolvers();
253+
Collection<ProtocolResolver> protocolResolvers = ((DefaultResourceLoader) applicationContext)
254+
.getProtocolResolvers();
255255
for (ProtocolResolver protocolResolver : protocolResolvers) {
256256
resourceLoader.addProtocolResolver(protocolResolver);
257257
}

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolverTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,7 @@ public void customProtocolResolverIsUsedInWebApplication() throws Exception {
168168

169169
private ProtocolResolver mockProtocolResolver(String path, Resource resource) {
170170
ProtocolResolver resolver = mock(ProtocolResolver.class);
171-
given(resolver.resolve(eq(path), any(ResourceLoader.class)))
172-
.willReturn(resource);
171+
given(resolver.resolve(eq(path), any(ResourceLoader.class))).willReturn(resource);
173172
return resolver;
174173
}
175174

spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public Author as(String alias) {
133133
/**
134134
* Rename this table
135135
*/
136+
@Override
136137
public Author rename(String name) {
137138
return new Author(name, null);
138139
}

spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ public Book as(String alias) {
136136
/**
137137
* Rename this table
138138
*/
139+
@Override
139140
public Book rename(String name) {
140141
return new Book(name, null);
141142
}

spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public BookStore as(String alias) {
9494
/**
9595
* Rename this table
9696
*/
97+
@Override
9798
public BookStore rename(String name) {
9899
return new BookStore(name, null);
99100
}

spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public BookToBookStore as(String alias) {
124124
/**
125125
* Rename this table
126126
*/
127+
@Override
127128
public BookToBookStore rename(String name) {
128129
return new BookToBookStore(name, null);
129130
}

spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ public Language as(String alias) {
114114
/**
115115
* Rename this table
116116
*/
117+
@Override
117118
public Language rename(String name) {
118119
return new Language(name, null);
119120
}

spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/SampleWebSocketsApplicationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.commons.logging.LogFactory;
2525
import org.junit.Test;
2626
import org.junit.runner.RunWith;
27-
import samples.websocket.jetty93.SampleJetty93WebSocketsApplication;
2827
import samples.websocket.jetty93.client.GreetingService;
2928
import samples.websocket.jetty93.client.SimpleClientWebSocketHandler;
3029
import samples.websocket.jetty93.client.SimpleGreetingService;

spring-boot-samples/spring-boot-sample-websocket-jetty93/src/test/java/samples/websocket/jetty93/snake/SnakeTimerTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2016 the original author or authors.
2+
* Copyright 2012-2017 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@
1919
import java.io.IOException;
2020

2121
import org.junit.Test;
22-
import samples.websocket.jetty93.snake.Snake;
23-
import samples.websocket.jetty93.snake.SnakeTimer;
2422

2523
import static org.assertj.core.api.Assertions.assertThat;
2624
import static org.mockito.BDDMockito.willThrow;

spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ private void load(Class<?> config, String... environment) {
7676
this.context = doLoad(config, environment);
7777
}
7878

79-
private ConfigurableApplicationContext doLoad(Class<?> config, String... environment) {
79+
private ConfigurableApplicationContext doLoad(Class<?> config,
80+
String... environment) {
8081
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
8182
if (config != null) {
8283
ctx.register(config);

0 commit comments

Comments
 (0)