Update to spring-javaformat-checkstyle 0.0.7

Remove unnecessary lambdas to fix updated checkstyle
This commit is contained in:
Rob Winch 2019-03-22 00:35:32 -05:00
parent 62ea7382d7
commit bff3d2f2be
5 changed files with 11 additions and 13 deletions

View File

@ -168,7 +168,7 @@ configure(allprojects) { project ->
// JSR-305 only used for non-required meta-annotations // JSR-305 only used for non-required meta-annotations
compileOnly("com.google.code.findbugs:jsr305:3.0.2") compileOnly("com.google.code.findbugs:jsr305:3.0.2")
testCompileOnly("com.google.code.findbugs:jsr305:3.0.2") testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.5") checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.7")
} }
ext.javadocLinks = [ ext.javadocLinks = [

View File

@ -314,9 +314,7 @@ public abstract class AbstractJdbcCall {
this.callMetaDataContext.initializeMetaData(dataSource); this.callMetaDataContext.initializeMetaData(dataSource);
// Iterate over the declared RowMappers and register the corresponding SqlParameter // Iterate over the declared RowMappers and register the corresponding SqlParameter
this.declaredRowMappers.forEach((key, value) -> { this.declaredRowMappers.forEach((key, value) -> this.declaredParameters.add(this.callMetaDataContext.createReturnResultSetParameter(key, value)));
this.declaredParameters.add(this.callMetaDataContext.createReturnResultSetParameter(key, value));
});
this.callMetaDataContext.processParameters(this.declaredParameters); this.callMetaDataContext.processParameters(this.declaredParameters);
this.callString = this.callMetaDataContext.createCallString(); this.callString = this.callMetaDataContext.createCallString();

View File

@ -66,7 +66,7 @@ class JettyClientHttpResponse implements ClientHttpResponse {
MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>(); MultiValueMap<String, ResponseCookie> result = new LinkedMultiValueMap<>();
List<String> cookieHeader = getHeaders().get(HttpHeaders.SET_COOKIE); List<String> cookieHeader = getHeaders().get(HttpHeaders.SET_COOKIE);
if (cookieHeader != null) { if (cookieHeader != null) {
cookieHeader.forEach(header -> { cookieHeader.forEach(header ->
HttpCookie.parse(header) HttpCookie.parse(header)
.forEach(cookie -> result.add(cookie.getName(), .forEach(cookie -> result.add(cookie.getName(),
ResponseCookie.from(cookie.getName(), cookie.getValue()) ResponseCookie.from(cookie.getName(), cookie.getValue())
@ -75,8 +75,8 @@ class JettyClientHttpResponse implements ClientHttpResponse {
.maxAge(cookie.getMaxAge()) .maxAge(cookie.getMaxAge())
.secure(cookie.getSecure()) .secure(cookie.getSecure())
.httpOnly(cookie.isHttpOnly()) .httpOnly(cookie.isHttpOnly())
.build())); .build()))
}); );
} }
return CollectionUtils.unmodifiableMultiValueMap(result); return CollectionUtils.unmodifiableMultiValueMap(result);
} }

View File

@ -66,13 +66,13 @@ class ReactorClientHttpResponse implements ClientHttpResponse {
throw new IllegalStateException("The client response body can only be consumed once."); throw new IllegalStateException("The client response body can only be consumed once.");
} }
}) })
.doOnCancel(() -> { .doOnCancel(() ->
// https://github.com/reactor/reactor-netty/issues/503 // https://github.com/reactor/reactor-netty/issues/503
// FluxReceive rejects multiple subscribers, but not after a cancel(). // FluxReceive rejects multiple subscribers, but not after a cancel().
// Subsequent subscribers after cancel() will not be rejected, but will hang instead. // Subsequent subscribers after cancel() will not be rejected, but will hang instead.
// So we need to intercept and reject them in that case. // So we need to intercept and reject them in that case.
this.rejectSubscribers.set(true); this.rejectSubscribers.set(true)
}) )
.map(byteBuf -> { .map(byteBuf -> {
byteBuf.retain(); byteBuf.retain();
return this.bufferFactory.wrap(byteBuf); return this.bufferFactory.wrap(byteBuf);

View File

@ -94,12 +94,12 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport
return this.partReader.read(elementType, inputMessage, allHints) return this.partReader.read(elementType, inputMessage, allHints)
.collectMultimap(Part::name) .collectMultimap(Part::name)
.doOnNext(map -> { .doOnNext(map ->
LogFormatUtils.traceDebug(logger, traceOn -> Hints.getLogPrefix(hints) + "Parsed " + LogFormatUtils.traceDebug(logger, traceOn -> Hints.getLogPrefix(hints) + "Parsed " +
(isEnableLoggingRequestDetails() ? (isEnableLoggingRequestDetails() ?
LogFormatUtils.formatValue(map, !traceOn) : LogFormatUtils.formatValue(map, !traceOn) :
"parts " + map.keySet() + " (content masked)")); "parts " + map.keySet() + " (content masked)"))
}) )
.map(this::toMultiValueMap); .map(this::toMultiValueMap);
} }