Browse Source

Merge branch '3.3.x' into 3.4.x

Closes gh-45499
pull/45650/head
Phillip Webb 9 months ago
parent
commit
0eddab6d3c
  1. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java
  2. 4
      spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinBindableRuntimeHintsRegistrarTests.kt

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/structured/StructuredLoggingJsonPropertiesJsonMembersCustomizerTests.java

@ -87,7 +87,7 @@ class StructuredLoggingJsonPropertiesJsonMembersCustomizerTests { @@ -87,7 +87,7 @@ class StructuredLoggingJsonPropertiesJsonMembersCustomizerTests {
}
@Test
void customizeWhenHasAddAddsMemeber() {
void customizeWhenHasAddAddsMember() {
StructuredLoggingJsonProperties properties = new StructuredLoggingJsonProperties(Collections.emptySet(),
Collections.emptySet(), Collections.emptyMap(), Map.of("z", "z"), null);
StructuredLoggingJsonPropertiesJsonMembersCustomizer customizer = new StructuredLoggingJsonPropertiesJsonMembersCustomizer(

4
spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinBindableRuntimeHintsRegistrarTests.kt

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -25,7 +25,7 @@ import org.springframework.aot.hint.RuntimeHints @@ -25,7 +25,7 @@ import org.springframework.aot.hint.RuntimeHints
/**
* Tests for {@link BindableRuntimeHintsRegistrar}.
*
* @author Andy Wilkinsin
* @author Andy Wilkinson
*/
class KotlinBindableRuntimeHintsRegistrarTests {

Loading…
Cancel
Save