From a35384fd57b20596f4b032449c8608e424c39288 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Thu, 28 Dec 2023 15:04:50 +0800 Subject: [PATCH] Use text block where feasible See gh-31916 --- .../PropertiesEditorTests.java | 21 ++++++++++-------- .../messaging/protobuf/OuterSample.java | 14 ++++++++---- .../stomp/BufferingStompDecoderTests.java | 9 +++++++- ...ServerSentEventHttpMessageReaderTests.java | 21 ++++++++++++++++-- .../springframework/protobuf/OuterSample.java | 14 ++++++++---- .../reactive/function/BodyInsertersTests.java | 22 ++++++++++--------- .../web/reactive/protobuf/OuterSample.java | 14 ++++++++---- .../servlet/ComplexWebApplicationContext.java | 7 ++++-- .../function/SseServerResponseTests.java | 12 +++++----- 9 files changed, 93 insertions(+), 41 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java index 5d3a8d83c0..9a0b3f8947 100644 --- a/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/propertyeditors/PropertiesEditorTests.java @@ -58,9 +58,10 @@ public class PropertiesEditorTests { @Test public void handlesEqualsInValue() { - String s = "foo=bar\n" + - "me=mi\n" + - "x=y=z"; + String s = """ + foo=bar + me=mi + x=y=z"""; PropertiesEditor pe= new PropertiesEditor(); pe.setAsText(s); Properties p = (Properties) pe.getValue(); @@ -98,12 +99,14 @@ public class PropertiesEditorTests { */ @Test public void ignoresCommentLinesAndEmptyLines() { - String s = "#Ignore this comment\n" + - "foo=bar\n" + - "#Another=comment more junk /\n" + - "me=mi\n" + - "x=x\n" + - "\n"; + String s = """ + #Ignore this comment + foo=bar + #Another=comment more junk / + me=mi + x=x + + """; PropertiesEditor pe= new PropertiesEditor(); pe.setAsText(s); Properties p = (Properties) pe.getValue(); diff --git a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/OuterSample.java b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/OuterSample.java index d3ecd6a62c..cfb70c16fe 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/protobuf/OuterSample.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/protobuf/OuterSample.java @@ -28,10 +28,16 @@ public class OuterSample { descriptor; static { java.lang.String[] descriptorData = { - "\n\014sample.proto\",\n\003Msg\022\013\n\003foo\030\001 \001(\t\022\030\n\004bl" + - "ah\030\002 \001(\0132\n.SecondMsg\"\031\n\tSecondMsg\022\014\n\004bla" + - "h\030\001 \001(\005B-\n\034org.springframework.protobufB" + - "\013OuterSampleP\001" + """ + +\014sample.proto", +\003Msg\022\013 +\003foo\030\001 \001(\t\022\030 +\004blah\030\002 \001(\0132 +.SecondMsg"\031 +\tSecondMsg\022\014 +\004blah\030\001 \001(\005B- +\034org.springframework.protobufB\013OuterSampleP\001""" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java index a499e02e23..251f904dd2 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java @@ -72,7 +72,14 @@ public class BufferingStompDecoderTests { @Test public void twoMessagesInOneChunk() throws InterruptedException { BufferingStompDecoder stompDecoder = new BufferingStompDecoder(STOMP_DECODER, 128); - String chunk = "SEND\na:alpha\n\nPayload1\0" + "SEND\na:alpha\n\nPayload2\0"; + String chunk = """ + SEND + a:alpha + + Payload1\0SEND + a:alpha + + Payload2\0"""; List> messages = stompDecoder.decode(toByteBuffer(chunk)); assertThat(messages).hasSize(2); diff --git a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java index 01b203e3d4..af5cdea4c0 100644 --- a/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java +++ b/spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java @@ -66,8 +66,25 @@ class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingTests { void readServerSentEvents() { MockServerHttpRequest request = MockServerHttpRequest.post("/") .body(Mono.just(stringBuffer( - "id:c42\nevent:foo\nretry:123\n:bla\n:bla bla\n:bla bla bla\ndata:bar\n\n" + - "id:c43\nevent:bar\nretry:456\ndata:baz\n\ndata:\n\ndata: \n\n"))); + """ + id:c42 + event:foo + retry:123 + :bla + :bla bla + :bla bla bla + data:bar + + id:c43 + event:bar + retry:456 + data:baz + + data: + + data:\s + + """))); Flux events = this.reader .read(ResolvableType.forClassWithGenerics(ServerSentEvent.class, String.class), diff --git a/spring-web/src/test/java/org/springframework/protobuf/OuterSample.java b/spring-web/src/test/java/org/springframework/protobuf/OuterSample.java index 9b63ef7288..4f423a9b07 100644 --- a/spring-web/src/test/java/org/springframework/protobuf/OuterSample.java +++ b/spring-web/src/test/java/org/springframework/protobuf/OuterSample.java @@ -33,10 +33,16 @@ public final class OuterSample { descriptor; static { String[] descriptorData = { - "\n\014sample.proto\",\n\003Msg\022\013\n\003foo\030\001 \001(\t\022\030\n\004bl" + - "ah\030\002 \001(\0132\n.SecondMsg\"\031\n\tSecondMsg\022\014\n\004bla" + - "h\030\001 \001(\005B-\n\034org.springframework.protobufB" + - "\013OuterSampleP\001" + """ + +\014sample.proto", +\003Msg\022\013 +\003foo\030\001 \001(\t\022\030 +\004blah\030\002 \001(\0132 +.SecondMsg"\031 +\tSecondMsg\022\014 +\004blah\030\001 \001(\005B- +\034org.springframework.protobufB\013OuterSampleP\001""" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java index 71124300d9..ab3e44076f 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/BodyInsertersTests.java @@ -404,16 +404,18 @@ public class BodyInsertersTests { dataBuffer.read(resultBytes); DataBufferUtils.release(dataBuffer); String content = new String(resultBytes, StandardCharsets.UTF_8); - assertThat(content).contains("Content-Disposition: form-data; name=\"name\"\r\n" + - "Content-Type: text/plain;charset=UTF-8\r\n" + - "Content-Length: 6\r\n" + - "\r\n" + - "value1"); - assertThat(content).contains("Content-Disposition: form-data; name=\"name\"\r\n" + - "Content-Type: text/plain;charset=UTF-8\r\n" + - "Content-Length: 6\r\n" + - "\r\n" + - "value2"); + assertThat(content).contains(""" + Content-Disposition: form-data; name="name"\r + Content-Type: text/plain;charset=UTF-8\r + Content-Length: 6\r + \r + value1"""); + assertThat(content).contains(""" + Content-Disposition: form-data; name="name"\r + Content-Type: text/plain;charset=UTF-8\r + Content-Length: 6\r + \r + value2"""); }) .expectComplete() .verify(); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/OuterSample.java b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/OuterSample.java index 01239dfdf8..da713509f7 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/OuterSample.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/protobuf/OuterSample.java @@ -28,10 +28,16 @@ public class OuterSample { descriptor; static { String[] descriptorData = { - "\n\014sample.proto\",\n\003Msg\022\013\n\003foo\030\001 \001(\t\022\030\n\004bl" + - "ah\030\002 \001(\0132\n.SecondMsg\"\031\n\tSecondMsg\022\014\n\004bla" + - "h\030\001 \001(\005B-\n\034org.springframework.protobufB" + - "\013OuterSampleP\001" + """ + +\014sample.proto", +\003Msg\022\013 +\003foo\030\001 \001(\t\022\030 +\004blah\030\002 \001(\0132 +.SecondMsg"\031 +\tSecondMsg\022\014 +\004blah\030\001 \001(\005B- +\034org.springframework.protobufB\013OuterSampleP\001""" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java index 629eaf49be..c211938208 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/ComplexWebApplicationContext.java @@ -114,8 +114,11 @@ public class ComplexWebApplicationContext extends StaticWebApplicationContext { pvs = new MutablePropertyValues(); pvs.add( - "mappings", "/head.do=headController\n" + - "body.do=bodyController\n/noview*=noviewController\n/noview/simple*=noviewController"); + "mappings", """ + /head.do=headController + body.do=bodyController + /noview*=noviewController + /noview/simple*=noviewController"""); pvs.add("order", "1"); registerSingleton("handlerMapping", SimpleUrlHandlerMapping.class, pvs); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/SseServerResponseTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/SseServerResponseTests.java index c89172ee59..db76542ad9 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/SseServerResponseTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/SseServerResponseTests.java @@ -109,11 +109,13 @@ class SseServerResponseTests { ModelAndView mav = response.writeTo(this.mockRequest, this.mockResponse, context); assertThat(mav).isNull(); - String expected = "data:{\n" + - "data: \"name\" : \"John Doe\",\n" + - "data: \"age\" : 42\n" + - "data:}\n" + - "\n"; + String expected = """ + data:{ + data: "name" : "John Doe", + data: "age" : 42 + data:} + + """; assertThat(this.mockResponse.getContentAsString()).isEqualTo(expected); }