root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Upgrade to spring-javaformat-checkstyle version 0.0.7 

See gh-22634
This commit is contained in:
Sam Brannen 2019-03-23 15:38:44 +01:00
parent e98fd762ba
commit af99e868c4
5 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -171,7 +171,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 = [

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -314,9 +314,8 @@ 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();

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -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,7 @@ 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);
} }

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

@ -66,13 +66,12 @@ 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);

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -89,17 +89,15 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport
public Mono<MultiValueMap<String, Part>> readMono(ResolvableType elementType, public Mono<MultiValueMap<String, Part>> readMono(ResolvableType elementType,
ReactiveHttpInputMessage inputMessage, Map<String, Object> hints) { ReactiveHttpInputMessage inputMessage, Map<String, Object> hints) {
Map<String, Object> allHints = Hints.merge(hints, Hints.SUPPRESS_LOGGING_HINT, true); Map<String, Object> allHints = Hints.merge(hints, Hints.SUPPRESS_LOGGING_HINT, true);
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);
} }