GH-34 - Use isMetricsEnabled.

That API is present since 4.0.0 and it is safe to use across the board and much better than exception-driven-development.

Author: michael-simons

neo4j-java-driver-spring-boot-autoconfigure/src/main/java/org/neo4j/driver/springframework/boot/actuate/Neo4jDriverMetrics.java

@@ -30,7 +30,6 @@
 import org.neo4j.driver.ConnectionPoolMetrics;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Metrics;
-import org.neo4j.driver.exceptions.ClientException;
 import org.springframework.util.Assert;
 
 /**
@@ -113,18 +112,4 @@ Consumer<ConnectionPoolMetrics> getPoolMetricsBinder(MeterRegistry meterRegistry
 				.register(meterRegistry);
 		};
 	}
-
-	/**
-	 * @param driver The driver instance beans to check whether it has metrics enabled.
-	 * @return True, if the given bean exposes metrics
-	 */
-	public static boolean metricsAreEnabled(Driver driver) {
-
-		try {
-			driver.metrics();
-			return true;
-		} catch (ClientException e) {
-			return false;
-		}
-	}
 }

neo4j-java-driver-spring-boot-autoconfigure/src/main/java/org/neo4j/driver/springframework/boot/autoconfigure/Neo4jDriverMetricsAutoConfiguration.java

@@ -61,7 +61,7 @@ public class Neo4jDriverMetricsAutoConfiguration {
 	public void bindDataSourcesToRegistry(Map<String, Driver> drivers, MeterRegistry registry) {
 
 		drivers.forEach((name, driver) -> {
-			if (!Neo4jDriverMetrics.metricsAreEnabled(driver)) {
+			if (!driver.isMetricsEnabled()) {
 				return;
 			}
 			driver

neo4j-java-driver-spring-boot-autoconfigure/src/test/java/org/neo4j/driver/springframework/boot/actuate/Neo4jDriverMetricsTest.java

@@ -27,27 +27,12 @@
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
-import org.neo4j.driver.Driver;
 
 /**
  * @author Michael J. Simons
  */
 class Neo4jDriverMetricsTest {
 
-	@Test
-	void shouldDetectEnabledMetrics() {
-
-		Driver driver = mockDriverWithMetrics();
-		assertThat(Neo4jDriverMetrics.metricsAreEnabled(driver)).isTrue();
-	}
-
-	@Test
-	void shouldDetectDisabledMetrics() {
-
-		Driver driver = mockDriverWithoutMetrics();
-		assertThat(Neo4jDriverMetrics.metricsAreEnabled(driver)).isFalse();
-	}
-
 	@Test
 	void shouldRegisterCorrectMeters() {
 

neo4j-java-driver-spring-boot-autoconfigure/src/test/java/org/neo4j/driver/springframework/boot/test/Neo4jDriverMocks.java

@@ -44,6 +44,7 @@ public static Driver mockDriverWithMetrics() {
 
 		Driver driver = mock(Driver.class);
 		when(driver.metrics()).thenReturn(metrics);
+		when(driver.isMetricsEnabled()).thenReturn(true);
 
 		when(driver.verifyConnectivityAsync()).thenReturn(CompletableFuture.completedFuture(null));
 
@@ -54,6 +55,7 @@ public static Driver mockDriverWithoutMetrics() {
 
 		Driver driver = mock(Driver.class);
 		when(driver.metrics()).thenThrow(ClientException.class);
+		when(driver.isMetricsEnabled()).thenReturn(false);
 		return driver;
 	}