Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-38877
This commit is contained in:
Phillip Webb
2023-12-19 22:51:48 -08:00
parent e1b1a621d1 ae79a7c00f
commit 5354ad15b3
45 changed files with 69 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizer.java
View File

@@ -91,8 +91,7 @@ class ServiceConnectionContextCustomizer implements ContextCustomizer {
* Relevant details from {@link ContainerConnectionSource} used as a
* MergedContextConfiguration cache key.
*/
private static record CacheKey(String connectionName, Set<Class<?>> connectionDetailsTypes,
Container<?> container) {
private record CacheKey(String connectionName, Set<Class<?>> connectionDetailsTypes, Container<?> container) {
CacheKey(ContainerConnectionSource<?> source) {
this(source.getConnectionName(), source.getConnectionDetailsTypes(), source.getContainerSupplier().get());

2
spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/ImportTestcontainersTests.java
View File

@@ -162,7 +162,7 @@ class ImportTestcontainersTests {
}
@Retention(RetentionPolicy.RUNTIME)
static @interface ContainerAnnotation {
@interface ContainerAnnotation {
}

2
spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/properties/TestcontainersPropertySourceAutoConfigurationTests.java
View File

@@ -68,7 +68,7 @@ class TestcontainersPropertySourceAutoConfigurationTests {
}
@ConfigurationProperties("container")
static record ContainerProperties(int port) {
record ContainerProperties(int port) {
}
static class TestBean {