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

Merge branch '2.3.x' 

Closes gh-22008
This commit is contained in:
Stephane Nicoll 2020-06-18 11:31:00 +02:00
parent cc6d6ce4dd c3678dff53
commit f0f8424191
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/http/HttpExchangeTracerTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -318,7 +318,7 @@ class HttpExchangeTracerTests {
@Override @Override
protected void postProcessRequestHeaders(Map<String, List<String>> headers) { protected void postProcessRequestHeaders(Map<String, List<String>> headers) {
headers.remove("to-remove"); headers.remove("to-remove");
headers.putIfAbsent("to-add", Collections.singletonList("42")); headers.computeIfAbsent("to-add", (key) -> Collections.singletonList("42"));
} }
} }

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientExcludeFilter.java
View File

@ -36,7 +36,7 @@ public final class WebServiceClientExcludeFilter
protected WebServiceClientExcludeFilter(Class<?> testClass) { protected WebServiceClientExcludeFilter(Class<?> testClass) {
super(testClass); super(testClass);
this.components = getAnnotation().getValue("components", Class[].class).orElse(new Class<?>[0]); this.components = getAnnotation().getValue("components", Class[].class).orElseGet(() -> new Class<?>[0]);
} }
@Override @Override

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/result/view/MustacheView.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
@ -84,7 +84,7 @@ public class MustacheView extends AbstractUrlBasedView {
DataBuffer dataBuffer = exchange.getResponse().bufferFactory().allocateBuffer(); DataBuffer dataBuffer = exchange.getResponse().bufferFactory().allocateBuffer();
try (Reader reader = getReader(resource)) { try (Reader reader = getReader(resource)) {
Template template = this.compiler.compile(reader); Template template = this.compiler.compile(reader);
Charset charset = getCharset(contentType).orElse(getDefaultCharset()); Charset charset = getCharset(contentType).orElseGet(this::getDefaultCharset);
try (Writer writer = new OutputStreamWriter(dataBuffer.asOutputStream(), charset)) { try (Writer writer = new OutputStreamWriter(dataBuffer.asOutputStream(), charset)) {
template.execute(model, writer); template.execute(model, writer);
writer.flush(); writer.flush();