DATAES-654 - Add JUnit5 support.

sothawo · sothawo · commit 38353e5bdde5 · 2019-10-21T18:06:49.000+02:00
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
@@ -105,8 +105,11 @@ public ContextCustomizer createContextCustomizer(Class<?> testClass,
 
 	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);
+		}
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,11 @@ public ContextCustomizer createContextCustomizer(Class<?> testClass,`
`105`	`105`
`106`	`106`	`private void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) {`
`107`	`107`
`108`		`- context.getBeanFactory().registerResolvableDependency(ClusterConnectionInfo.class,`
`109`		`- ClusterConnection.clusterConnectionInfo());`
	`108`	`+ ClusterConnectionInfo clusterConnectionInfo = ClusterConnection.clusterConnectionInfo();`
	`109`	`+`
	`110`	`+ if (clusterConnectionInfo != null) {`
	`111`	`+ context.getBeanFactory().registerResolvableDependency(ClusterConnectionInfo.class, clusterConnectionInfo);`
	`112`	`+ }`
`110`	`113`	`}`
`111`	`114`
`112`	`115`	`}`