spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-46542
This commit is contained in:
Stéphane Nicoll
2025-07-25 16:21:04 +02:00
parent eeef769c40 d92976e69f
commit 9c124de2a8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/test/java/org/springframework/boot/json/JsonWriterTests.java
+1 -1
View File
@@ -436,7 +436,7 @@ class JsonWriterTests {
}
@Test
void usingMemebersWithoutNameAtAll() {
void usingMembersWithoutNameAtAll() {
Couple couple = new Couple(PERSON, new Person("Spring", "Framework", 20));
JsonWriter<Couple> writer = JsonWriter.of((members) -> members.from(Couple::person2)
.usingMembers((personMembers) -> personMembers.from(Person::toString)));
core/spring-boot/src/test/java/org/springframework/boot/logging/StandardStackTracePrinterTests.java
+10 -10
View File
@@ -69,7 +69,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
... 1 more
""");
@@ -85,7 +85,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Caused by: java.lang.RuntimeException: cause
@@ -115,7 +115,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
""");
@@ -177,7 +177,7 @@ class StandardStackTracePrinterTests {
Wrapped by: java.lang.RuntimeException: exception
at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:NN)
... 3 filtered
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
... 1 more
""");
@@ -201,7 +201,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.actualCreateException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
... 2 filtered
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
""");
@@ -253,7 +253,7 @@ class StandardStackTracePrinterTests {
Wrapped by: java.lang.RuntimeException: exception
... 3 filtered
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
... 1 filtered
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
""");
@@ -284,7 +284,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: RuntimeException: supressed
Suppressed: RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
... 1 more
Caused by: RuntimeException: cause
@@ -316,7 +316,7 @@ class StandardStackTracePrinterTests {
at TestException.createException
at TestException.createTestException
at TestException.CreatorThread.run
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at TestException.createTestException
... 1 more
Caused by: java.lang.RuntimeException: cause
@@ -340,7 +340,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:59)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:49)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:77)
Suppressed: <#834defc3> java.lang.RuntimeException: supressed
Suppressed: <#834defc3> java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:50)
... 1 more
Caused by: <#611639c5> java.lang.RuntimeException: cause
@@ -367,7 +367,7 @@ class StandardStackTracePrinterTests {
at org.springframework.boot.logging.TestException.createException(TestException.java:NN)
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
at org.springframework.boot.logging.TestException$CreatorThread.run(TestException.java:NN)
Suppressed: java.lang.RuntimeException: supressed
Suppressed: java.lang.RuntimeException: suppressed
at org.springframework.boot.logging.TestException.createTestException(TestException.java:NN)
... 1 more
Caused by: java.lang.RuntimeException: cause
core/spring-boot/src/test/java/org/springframework/boot/logging/TestException.java
+1 -1
View File
@@ -47,7 +47,7 @@ public final class TestException {
Throwable root = new RuntimeException("root");
Throwable cause = createCause(root);
Exception exception = createException(cause);
exception.addSuppressed(new RuntimeException("supressed"));
exception.addSuppressed(new RuntimeException("suppressed"));
return exception;
}
module/spring-boot-reactor-netty/src/test/java/org/springframework/boot/reactor/netty/NettyReactiveWebServerFactoryTests.java
+1 -1
View File
@@ -177,7 +177,7 @@ class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServerFactor
@Override
@Test
@Disabled("Reactor Netty does not support mutiple ports")
@Disabled("Reactor Netty does not support multiple ports")
protected void startedLogMessageWithMultiplePorts() {
}