diff --git a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/SpringDataElasticsearchExtension.java b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/SpringDataElasticsearchExtension.java index 456556ae6..4ca24daa7 100644 --- a/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/SpringDataElasticsearchExtension.java +++ b/src/test/java/org/springframework/data/elasticsearch/junit/jupiter/SpringDataElasticsearchExtension.java @@ -105,8 +105,11 @@ public class SpringDataElasticsearchExtension private void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) { - context.getBeanFactory().registerResolvableDependency(ClusterConnectionInfo.class, - ClusterConnection.clusterConnectionInfo()); + ClusterConnectionInfo clusterConnectionInfo = ClusterConnection.clusterConnectionInfo(); + + if (clusterConnectionInfo != null) { + context.getBeanFactory().registerResolvableDependency(ClusterConnectionInfo.class, clusterConnectionInfo); + } } }