Skip to content

Commit af99e86

Browse files
committed
Upgrade to spring-javaformat-checkstyle version 0.0.7
See gh-22634
1 parent e98fd76 commit af99e86

File tree

5 files changed

+12
-17
lines changed

5 files changed

+12
-17
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ configure(allprojects) { project ->
171171
// JSR-305 only used for non-required meta-annotations
172172
compileOnly("com.google.code.findbugs:jsr305:3.0.2")
173173
testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
174-
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.5")
174+
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.7")
175175
}
176176

177177
ext.javadocLinks = [

spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/AbstractJdbcCall.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -314,9 +314,8 @@ protected void compileInternal() {
314314
this.callMetaDataContext.initializeMetaData(dataSource);
315315

316316
// Iterate over the declared RowMappers and register the corresponding SqlParameter
317-
this.declaredRowMappers.forEach((key, value) -> {
318-
this.declaredParameters.add(this.callMetaDataContext.createReturnResultSetParameter(key, value));
319-
});
317+
this.declaredRowMappers.forEach((key, value) ->
318+
this.declaredParameters.add(this.callMetaDataContext.createReturnResultSetParameter(key, value)));
320319
this.callMetaDataContext.processParameters(this.declaredParameters);
321320

322321
this.callString = this.callMetaDataContext.createCallString();

spring-web/src/main/java/org/springframework/http/client/reactive/JettyClientHttpResponse.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -66,7 +66,7 @@ public MultiValueMap<String, ResponseCookie> getCookies() {
6666
MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>();
6767
List<String> cookieHeader = getHeaders().get(HttpHeaders.SET_COOKIE);
6868
if (cookieHeader != null) {
69-
cookieHeader.forEach(header -> {
69+
cookieHeader.forEach(header ->
7070
HttpCookie.parse(header)
7171
.forEach(cookie -> result.add(cookie.getName(),
7272
ResponseCookie.from(cookie.getName(), cookie.getValue())
@@ -75,8 +75,7 @@ public MultiValueMap<String, ResponseCookie> getCookies() {
7575
.maxAge(cookie.getMaxAge())
7676
.secure(cookie.getSecure())
7777
.httpOnly(cookie.isHttpOnly())
78-
.build()));
79-
});
78+
.build())));
8079
}
8180
return CollectionUtils.unmodifiableMultiValueMap(result);
8281
}

spring-web/src/main/java/org/springframework/http/client/reactive/ReactorClientHttpResponse.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,12 @@ public Flux<DataBuffer> getBody() {
6666
throw new IllegalStateException("The client response body can only be consumed once.");
6767
}
6868
})
69-
.doOnCancel(() -> {
69+
.doOnCancel(() ->
7070
// https://github.com/reactor/reactor-netty/issues/503
7171
// FluxReceive rejects multiple subscribers, but not after a cancel().
7272
// Subsequent subscribers after cancel() will not be rejected, but will hang instead.
7373
// So we need to intercept and reject them in that case.
74-
this.rejectSubscribers.set(true);
75-
})
74+
this.rejectSubscribers.set(true))
7675
.map(byteBuf -> {
7776
byteBuf.retain();
7877
return this.bufferFactory.wrap(byteBuf);

spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2019 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.
@@ -89,17 +89,15 @@ public Flux<MultiValueMap<String, Part>> read(ResolvableType elementType,
8989
public Mono<MultiValueMap<String, Part>> readMono(ResolvableType elementType,
9090
ReactiveHttpInputMessage inputMessage, Map<String, Object> hints) {
9191

92-
9392
Map<String, Object> allHints = Hints.merge(hints, Hints.SUPPRESS_LOGGING_HINT, true);
9493

9594
return this.partReader.read(elementType, inputMessage, allHints)
9695
.collectMultimap(Part::name)
97-
.doOnNext(map -> {
96+
.doOnNext(map ->
9897
LogFormatUtils.traceDebug(logger, traceOn -> Hints.getLogPrefix(hints) + "Parsed " +
9998
(isEnableLoggingRequestDetails() ?
10099
LogFormatUtils.formatValue(map, !traceOn) :
101-
"parts " + map.keySet() + " (content masked)"));
102-
})
100+
"parts " + map.keySet() + " (content masked)")))
103101
.map(this::toMultiValueMap);
104102
}
105103

0 commit comments

Comments
 (0)