From cd33b4e35a7a1e6683f1968456ea7df70b3cef64 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 21 May 2024 18:24:04 +0200 Subject: [PATCH 1/2] Polishing --- .../standard/DateTimeFormattingTests.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java index cffdb185a9..a2130906a5 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormattingTests.java @@ -274,9 +274,7 @@ class DateTimeFormattingTests { binder.bind(propertyValues); assertThat(binder.getBindingResult().getErrorCount()).isZero(); String value = binder.getBindingResult().getFieldValue("localDateTime").toString(); - assertThat(value) - .startsWith("10/31/09") - .endsWith("12:00 PM"); + assertThat(value).startsWith("10/31/09").endsWith("12:00 PM"); } @Test @@ -286,9 +284,7 @@ class DateTimeFormattingTests { binder.bind(propertyValues); assertThat(binder.getBindingResult().getErrorCount()).isZero(); String value = binder.getBindingResult().getFieldValue("localDateTime").toString(); - assertThat(value) - .startsWith("10/31/09") - .endsWith("12:00 PM"); + assertThat(value).startsWith("10/31/09").endsWith("12:00 PM"); } @Test @@ -298,9 +294,7 @@ class DateTimeFormattingTests { binder.bind(propertyValues); assertThat(binder.getBindingResult().getErrorCount()).isZero(); String value = binder.getBindingResult().getFieldValue("styleLocalDateTime").toString(); - assertThat(value) - .startsWith("Oct 31, 2009") - .endsWith("12:00:00 PM"); + assertThat(value).startsWith("Oct 31, 2009").endsWith("12:00:00 PM"); } @Test @@ -310,9 +304,7 @@ class DateTimeFormattingTests { binder.bind(propertyValues); assertThat(binder.getBindingResult().getErrorCount()).isZero(); String value = binder.getBindingResult().getFieldValue("localDateTime").toString(); - assertThat(value) - .startsWith("10/31/09") - .endsWith("12:00 PM"); + assertThat(value).startsWith("10/31/09").endsWith("12:00 PM"); } @Test @@ -325,9 +317,7 @@ class DateTimeFormattingTests { binder.bind(propertyValues); assertThat(binder.getBindingResult().getErrorCount()).isZero(); String value = binder.getBindingResult().getFieldValue("localDateTime").toString(); - assertThat(value) - .startsWith("Oct 31, 2009") - .endsWith("12:00:00 PM"); + assertThat(value).startsWith("Oct 31, 2009").endsWith("12:00:00 PM"); } @Test @@ -540,6 +530,7 @@ class DateTimeFormattingTests { assertThat(binder.getBindingResult().getRawFieldValue("monthDayAnnotatedPattern")).isEqualTo(MonthDay.parse("--01-03")); } + @Nested class FallbackPatternTests { @@ -703,7 +694,6 @@ class DateTimeFormattingTests { private final List children = new ArrayList<>(); - public LocalDate getLocalDate() { return this.localDate; } From 58da30cd30591eceeb1dd63a0afc54ae981ac9d5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 21 May 2024 19:22:20 +0200 Subject: [PATCH 2/2] Upgrade to Jetty Reactive HttpClient 4.0.4 --- framework-platform/framework-platform.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 82f13752c2..f99a1dd9a3 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -115,7 +115,7 @@ dependencies { api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.1.4") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.3") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.4") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.10.8")