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

Format with Eclipse Oxygen SR2

Browse Source
This commit is contained in:
Phillip Webb
2018-02-08 15:46:49 -08:00
parent 1f8bc391ce
commit 798522d890
62 changed files with 138 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java
View File

@@ -73,7 +73,7 @@ public abstract class JsonObjectDeserializer<T>
*/
protected abstract T deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException;
throws IOException;
/**
* Helper method to extract a value from the given {@code jsonNode} or return

2
spring-boot/src/main/java/org/springframework/boot/web/filter/ApplicationContextHeaderFilter.java
View File

@@ -50,7 +50,7 @@ public class ApplicationContextHeaderFilter extends OncePerRequestFilter {
@Override
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
throws ServletException, IOException {
response.addHeader(HEADER_NAME, this.applicationContext.getId());
filterChain.doFilter(request, response);
}

8
spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
View File

@@ -86,7 +86,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
@Override
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response, FilterChain chain)
throws ServletException, IOException {
throws ServletException, IOException {
ErrorPageFilter.this.doFilter(request, response, chain);
}
@@ -134,7 +134,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
private void handleErrorStatus(HttpServletRequest request,
HttpServletResponse response, int status, String message)
throws ServletException, IOException {
throws ServletException, IOException {
if (response.isCommitted()) {
handleCommittedResponse(request, null);
return;
@@ -151,7 +151,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
private void handleException(HttpServletRequest request, HttpServletResponse response,
ErrorWrapperResponse wrapped, Throwable ex)
throws IOException, ServletException {
throws IOException, ServletException {
Class<?> type = ex.getClass();
String errorPath = getErrorPath(type);
if (errorPath == null) {
@@ -168,7 +168,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
private void forwardToErrorPage(String path, HttpServletRequest request,
HttpServletResponse response, Throwable ex)
throws ServletException, IOException {
throws ServletException, IOException {
if (logger.isErrorEnabled()) {
String message = "Forwarding to error page from request "
+ getDescription(request) + " due to exception [" + ex.getMessage()

6
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@@ -1124,13 +1124,13 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
protected String getResponse(String url,
HttpComponentsClientHttpRequestFactory requestFactory, String... headers)
throws IOException, URISyntaxException {
throws IOException, URISyntaxException {
return getResponse(url, HttpMethod.GET, requestFactory, headers);
}
protected String getResponse(String url, HttpMethod method,
HttpComponentsClientHttpRequestFactory requestFactory, String... headers)
throws IOException, URISyntaxException {
throws IOException, URISyntaxException {
ClientHttpResponse response = getClientResponse(url, method, requestFactory,
headers);
try {
@@ -1162,7 +1162,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
protected ClientHttpResponse getClientResponse(String url, HttpMethod method,
HttpComponentsClientHttpRequestFactory requestFactory, String... headers)
throws IOException, URISyntaxException {
throws IOException, URISyntaxException {
ClientHttpRequest request = requestFactory.createRequest(new URI(url), method);
request.getHeaders().add("Cookie", "JSESSIONID=" + "123");
for (String header : headers) {

2
spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
View File

@@ -199,7 +199,7 @@ public class JsonObjectDeserializerTests {
@Override
protected T deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException {
throws IOException {
return null;
}

2
spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java
View File

@@ -49,7 +49,7 @@ public class NameAndAgeJsonComponent {
@Override
protected NameAndAge deserializeObject(JsonParser jsonParser,
DeserializationContext context, ObjectCodec codec, JsonNode tree)
throws IOException {
throws IOException {
String name = nullSafeValue(tree.get("name"), String.class);
Integer age = nullSafeValue(tree.get("age"), Integer.class);
return new NameAndAge(name, age);

5
spring-boot/src/test/java/org/springframework/boot/web/servlet/testcomponents/TestServlet.java
View File

@@ -30,9 +30,8 @@ public class TestServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
resp.getWriter()
.print(((String) req.getServletContext()
.getAttribute("listenerAttribute")) + " "
resp.getWriter().print(
((String) req.getServletContext().getAttribute("listenerAttribute")) + " "
+ req.getAttribute("filterAttribute"));
resp.getWriter().flush();
}