Merge branch '5.2.x'

jhoeller · jhoeller · commit 16f1414e5ce2 · 2020-05-18T20:18:31.000+02:00
# Conflicts:
#	build.gradle
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ configure(allprojects) { project ->
 			mavenBom "org.junit:junit-bom:5.6.2"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.13.2') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.13.3') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-slf4j-impl'
@@ -86,11 +86,11 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.26"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.8.1"
-			dependency "com.github.librepdf:openpdf:1.3.14"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.3"
+			dependency "com.github.librepdf:openpdf:1.3.17"
 			dependency "com.rometools:rome:1.12.2"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.2"
+			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
 				entry 'activemq-broker'
@@ -141,7 +141,7 @@ configure(allprojects) { project ->
 				}
 			}
 
-			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.7') {
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
 				entry 'okhttp'
 				entry 'mockwebserver'
 			}
@@ -180,7 +180,7 @@ configure(allprojects) { project ->
 			dependency "org.testng:testng:7.1.0"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.16.0"
+			dependency "org.assertj:assertj-core:3.16.1"
 			dependencySet(group: 'org.xmlunit', version: '2.6.2') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
@@ -195,10 +195,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.10.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.39.1") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.40.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.39.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.40.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -224,8 +224,8 @@ configure(allprojects) { project ->
 			}
 
 			dependency "com.ibm.websphere:uow:6.0.2.17"
-			dependency "com.jamonapi:jamon:2.81"
-			dependency "joda-time:joda-time:2.10.5"
+			dependency "com.jamonapi:jamon:2.82"
+			dependency "joda-time:joda-time:2.10.6"
 			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.6"
 			dependency "org.javamoney:moneta:1.3"
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
@@ -47,19 +47,17 @@
  */
 public class ServerSentEventHttpMessageReader implements HttpMessageReader<Object> {
 
-	private static final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
-
 	private static final ResolvableType STRING_TYPE = ResolvableType.forClass(String.class);
 
+	private static final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
+
 
 	@Nullable
 	private final Decoder<?> decoder;
 
 	private final StringDecoder lineDecoder = StringDecoder.textPlainOnly();
 
 
-
-
 	/**
 	 * Constructor without a {@code Decoder}. In this mode only {@code String}
 	 * is supported as the data of an event.
@@ -171,31 +169,31 @@ else if (line.startsWith(":")) {
 			}
 		}
 
-		Object decodedData = (data != null ? decodeData(data.toString(), valueType, hints) : null);
+		Object decodedData = (data != null ? decodeData(data, valueType, hints) : null);
 
 		if (shouldWrap) {
 			if (comment != null) {
-				sseBuilder.comment(comment.toString().substring(0, comment.length() - 1));
+				sseBuilder.comment(comment.substring(0, comment.length() - 1));
 			}
 			if (decodedData != null) {
 				sseBuilder.data(decodedData);
 			}
 			return sseBuilder.build();
 		}
 		else {
-			return (decodedData);
+			return decodedData;
 		}
 	}
 
 	@Nullable
-	private Object decodeData(String data, ResolvableType dataType, Map<String, Object> hints) {
+	private Object decodeData(StringBuilder data, ResolvableType dataType, Map<String, Object> hints) {
 		if (String.class == dataType.resolve()) {
 			return data.substring(0, data.length() - 1);
 		}
 		if (this.decoder == null) {
 			throw new CodecException("No SSE decoder configured and the data is not String.");
 		}
-		byte[] bytes = data.getBytes(StandardCharsets.UTF_8);
+		byte[] bytes = data.toString().getBytes(StandardCharsets.UTF_8);
 		DataBuffer buffer = bufferFactory.wrap(bytes);  // wrapping only, no allocation
 		return this.decoder.decode(buffer, dataType, MediaType.TEXT_EVENT_STREAM, hints);
 	}
@@ -221,7 +219,6 @@ private class LimitTracker {
 
 		private int accumulated = 0;
 
-
 		public void afterLineParsed(String line) {
 			if (getMaxInMemorySize() < 0) {
 				return;
@@ -242,8 +239,7 @@ public void afterLineParsed(String line) {
 
 		private void raiseLimitException() {
 			// Do not release here, it's likely down via doOnDiscard..
-			throw new DataBufferLimitException(
-					"Exceeded limit on max bytes to buffer : " + getMaxInMemorySize());
+			throw new DataBufferLimitException("Exceeded limit on max bytes to buffer : " + getMaxInMemorySize());
 		}
 	}
 
diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java
@@ -153,15 +153,15 @@ else if (data instanceof String) {
 				result = Flux.just(encodeText(sb + (String) data + "\n\n", mediaType, factory));
 			}
 			else {
-				result = encodeEvent(sb.toString(), data, dataType, mediaType, factory, hints);
+				result = encodeEvent(sb, data, dataType, mediaType, factory, hints);
 			}
 
 			return result.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 		});
 	}
 
 	@SuppressWarnings("unchecked")
-	private <T> Flux<DataBuffer> encodeEvent(String eventContent, T data, ResolvableType dataType,
+	private <T> Flux<DataBuffer> encodeEvent(StringBuilder eventContent, T data, ResolvableType dataType,
 			MediaType mediaType, DataBufferFactory factory, Map<String, Object> hints) {
 
 		if (this.encoder == null) {
@@ -174,16 +174,13 @@ private <T> Flux<DataBuffer> encodeEvent(String eventContent, T data, Resolvable
 	}
 
 	private void writeField(String fieldName, Object fieldValue, StringBuilder sb) {
-		sb.append(fieldName);
-		sb.append(':');
-		sb.append(fieldValue.toString());
-		sb.append("\n");
+		sb.append(fieldName).append(':').append(fieldValue).append("\n");
 	}
 
 	private DataBuffer encodeText(CharSequence text, MediaType mediaType, DataBufferFactory bufferFactory) {
 		Assert.notNull(mediaType.getCharset(), "Expected MediaType with charset");
 		byte[] bytes = text.toString().getBytes(mediaType.getCharset());
-		return bufferFactory.wrap(bytes); // wrapping, not allocating
+		return bufferFactory.wrap(bytes);  // wrapping, not allocating
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -47,19 +47,17 @@`
`47`	`47`	`*/`
`48`	`48`	`public class ServerSentEventHttpMessageReader implements HttpMessageReader<Object> {`
`49`	`49`
`50`		`- private static final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();`
`51`		`-`
`52`	`50`	`private static final ResolvableType STRING_TYPE = ResolvableType.forClass(String.class);`
`53`	`51`
	`52`	`+ private static final DataBufferFactory bufferFactory = new DefaultDataBufferFactory();`
	`53`	`+`
`54`	`54`
`55`	`55`	`@Nullable`
`56`	`56`	`private final Decoder<?> decoder;`
`57`	`57`
`58`	`58`	`private final StringDecoder lineDecoder = StringDecoder.textPlainOnly();`
`59`	`59`
`60`	`60`
`61`		`-`
`62`		`-`
`63`	`61`	`/**`
`64`	`62`	`* Constructor without a {@code Decoder}. In this mode only {@code String}`
`65`	`63`	`* is supported as the data of an event.`
`@@ -171,31 +169,31 @@ else if (line.startsWith(":")) {`
`171`	`169`	`}`
`172`	`170`	`}`
`173`	`171`
`174`		`- Object decodedData = (data != null ? decodeData(data.toString(), valueType, hints) : null);`
	`172`	`+ Object decodedData = (data != null ? decodeData(data, valueType, hints) : null);`
`175`	`173`
`176`	`174`	`if (shouldWrap) {`
`177`	`175`	`if (comment != null) {`
`178`		`- sseBuilder.comment(comment.toString().substring(0, comment.length() - 1));`
	`176`	`+ sseBuilder.comment(comment.substring(0, comment.length() - 1));`
`179`	`177`	`}`
`180`	`178`	`if (decodedData != null) {`
`181`	`179`	`sseBuilder.data(decodedData);`
`182`	`180`	`}`
`183`	`181`	`return sseBuilder.build();`
`184`	`182`	`}`
`185`	`183`	`else {`
`186`		`- return (decodedData);`
	`184`	`+ return decodedData;`
`187`	`185`	`}`
`188`	`186`	`}`
`189`	`187`
`190`	`188`	`@Nullable`
`191`		`- private Object decodeData(String data, ResolvableType dataType, Map<String, Object> hints) {`
	`189`	`+ private Object decodeData(StringBuilder data, ResolvableType dataType, Map<String, Object> hints) {`
`192`	`190`	`if (String.class == dataType.resolve()) {`
`193`	`191`	`return data.substring(0, data.length() - 1);`
`194`	`192`	`}`
`195`	`193`	`if (this.decoder == null) {`
`196`	`194`	`throw new CodecException("No SSE decoder configured and the data is not String.");`
`197`	`195`	`}`
`198`		`- byte[] bytes = data.getBytes(StandardCharsets.UTF_8);`
	`196`	`+ byte[] bytes = data.toString().getBytes(StandardCharsets.UTF_8);`
`199`	`197`	`DataBuffer buffer = bufferFactory.wrap(bytes); // wrapping only, no allocation`
`200`	`198`	`return this.decoder.decode(buffer, dataType, MediaType.TEXT_EVENT_STREAM, hints);`
`201`	`199`	`}`
`@@ -221,7 +219,6 @@ private class LimitTracker {`
`221`	`219`
`222`	`220`	`private int accumulated = 0;`
`223`	`221`
`224`		`-`
`225`	`222`	`public void afterLineParsed(String line) {`
`226`	`223`	`if (getMaxInMemorySize() < 0) {`
`227`	`224`	`return;`
`@@ -242,8 +239,7 @@ public void afterLineParsed(String line) {`
`242`	`239`
`243`	`240`	`private void raiseLimitException() {`
`244`	`241`	`// Do not release here, it's likely down via doOnDiscard..`
`245`		`- throw new DataBufferLimitException(`
`246`		`- "Exceeded limit on max bytes to buffer : " + getMaxInMemorySize());`
	`242`	`+ throw new DataBufferLimitException("Exceeded limit on max bytes to buffer : " + getMaxInMemorySize());`
`247`	`243`	`}`
`248`	`244`	`}`
`249`	`245`
Original file line number	Diff line number	Diff line change
`@@ -153,15 +153,15 @@ else if (data instanceof String) {`
`153`	`153`	`result = Flux.just(encodeText(sb + (String) data + "\n\n", mediaType, factory));`
`154`	`154`	`}`
`155`	`155`	`else {`
`156`		`- result = encodeEvent(sb.toString(), data, dataType, mediaType, factory, hints);`
	`156`	`+ result = encodeEvent(sb, data, dataType, mediaType, factory, hints);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`return result.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);`
`160`	`160`	`});`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`@SuppressWarnings("unchecked")`
`164`		`- private <T> Flux<DataBuffer> encodeEvent(String eventContent, T data, ResolvableType dataType,`
	`164`	`+ private <T> Flux<DataBuffer> encodeEvent(StringBuilder eventContent, T data, ResolvableType dataType,`
`165`	`165`	`MediaType mediaType, DataBufferFactory factory, Map<String, Object> hints) {`
`166`	`166`
`167`	`167`	`if (this.encoder == null) {`
`@@ -174,16 +174,13 @@ private <T> Flux<DataBuffer> encodeEvent(String eventContent, T data, Resolvable`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`private void writeField(String fieldName, Object fieldValue, StringBuilder sb) {`
`177`		`- sb.append(fieldName);`
`178`		`- sb.append(':');`
`179`		`- sb.append(fieldValue.toString());`
`180`		`- sb.append("\n");`
	`177`	`+ sb.append(fieldName).append(':').append(fieldValue).append("\n");`
`181`	`178`	`}`
`182`	`179`
`183`	`180`	`private DataBuffer encodeText(CharSequence text, MediaType mediaType, DataBufferFactory bufferFactory) {`
`184`	`181`	`Assert.notNull(mediaType.getCharset(), "Expected MediaType with charset");`
`185`	`182`	`byte[] bytes = text.toString().getBytes(mediaType.getCharset());`
`186`		`- return bufferFactory.wrap(bytes); // wrapping, not allocating`
	`183`	`+ return bufferFactory.wrap(bytes); // wrapping, not allocating`
`187`	`184`	`}`
`188`	`185`
`189`	`186`	`@Override`