From 38353e5bdde55f74702742f9e0a3f7d30328c77c Mon Sep 17 00:00:00 2001
From: Peter-Josef Meisch <pj.meisch@sothawo.com>
Date: Mon, 21 Oct 2019 18:06:49 +0200
Subject: [PATCH] DATAES-654 - Add JUnit5 support.

---
 .../junit/jupiter/SpringDataElasticsearchExtension.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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);
+		}
 	}
 
 }