diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSource.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSource.java index d10ca54480..9f8411b38c 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSource.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionSource.java @@ -54,9 +54,9 @@ public final class ContainerConnectionSource> acceptedConnectionDetailsTypes; + private final Set> acceptedConnectionDetailsTypes; ContainerConnectionSource(String beanNameSuffix, Origin origin, C container, MergedAnnotation annotation) { @@ -100,8 +100,8 @@ public final class ContainerConnectionSource candidate.isAssignableFrom(connectionDetailsType))) { + if (!this.acceptedConnectionDetailsTypes.isEmpty() && this.acceptedConnectionDetailsTypes.stream() + .noneMatch((candidate) -> candidate.isAssignableFrom(connectionDetailsType))) { logger.trace(LogMessage.of(() -> "%s not accepted as connection details type %s not in %s".formatted(this, connectionDetailsType, this.acceptedConnectionDetailsTypes))); return false; diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java index 09146036a1..06277ecb24 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionContextCustomizerFactory.java @@ -72,8 +72,8 @@ class ServiceConnectionContextCustomizerFactory implements ContextCustomizerFact + StringUtils.capitalize(field.getName()); Origin origin = new FieldOrigin(field); Object fieldValue = getFieldValue(field); - Assert.state(Container.class.isInstance(fieldValue), () -> "Field '%s' in %s must be a %s" - .formatted(field.getName(), field.getDeclaringClass().getName(), Container.class.getName())); + Assert.state(fieldValue instanceof Container, () -> "Field '%s' in %s must be a %s".formatted(field.getName(), + field.getDeclaringClass().getName(), Container.class.getName())); Container container = (Container) fieldValue; return new ContainerConnectionSource<>(beanNameSuffix, origin, container, annotation); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactory.java index b4cdd9d142..4c3fbdb745 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/amqp/RabbitContainerConnectionDetailsFactory.java @@ -68,11 +68,6 @@ class RabbitContainerConnectionDetailsFactory return this.container.getAdminPassword(); } - @Override - public String getVirtualHost() { - return null; - } - @Override public List
getAddresses() { URI uri = URI.create(this.container.getAmqpUrl());