Polish "Migrating to mongo client 4.x"

See micrometer-metricsgh-2493
izeye · Mar 23, 2021 · b8c71f0 · b8c71f0
1 parent 7a377e7
commit b8c71f0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 35 deletions.
diff --git a/...java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListener.java b/...java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListener.java
@@ -37,6 +37,7 @@
  * @author Christophe Bornet
  * @author Jonatan Ivanov
  * @since 1.2.0
+ * @implNote This implementation requires MongoDB Java driver 4 or later.
  */
 @NonNullApi
 @NonNullFields

diff --git a/...st/java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsCommandListenerTest.java b/...st/java/io/micrometer/core/instrument/binder/mongodb/MongoMetricsCommandListenerTest.java
@@ -60,13 +60,14 @@ void setup() {
         clusterId = new AtomicReference<>();
         MongoClientSettings settings = MongoClientSettings.builder()
                 .addCommandListener(new MongoMetricsCommandListener(registry))
-                .applyToClusterSettings(builder -> builder.hosts(singletonList(new ServerAddress(HOST, port))))
-                .applyToClusterSettings(builder -> builder.addClusterListener(new ClusterListener() {
-                    @Override
-                    public void clusterOpening(ClusterOpeningEvent event) {
-                        clusterId.set(event.getClusterId().getValue());
-                    }
-                })).build();
+                .applyToClusterSettings(builder -> builder
+                        .hosts(singletonList(new ServerAddress(HOST, port)))
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(ClusterOpeningEvent event) {
+                                clusterId.set(event.getClusterId().getValue());
+                            }
+                        })).build();
         mongo = MongoClients.create(settings);
     }
 
@@ -110,13 +111,14 @@ public Iterable<Tag> commandTags(CommandEvent event) {
         };
         MongoClientSettings settings = MongoClientSettings.builder()
                 .addCommandListener(new MongoMetricsCommandListener(registry, tagsProvider))
-                .applyToClusterSettings(builder -> builder.hosts(singletonList(new ServerAddress(HOST, port))))
-                .applyToClusterSettings(builder -> builder.addClusterListener(new ClusterListener() {
-                    @Override
-                    public void clusterOpening(ClusterOpeningEvent event) {
-                        clusterId.set(event.getClusterId().getValue());
-                    }
-                }))
+                .applyToClusterSettings(builder -> builder
+                        .hosts(singletonList(new ServerAddress(HOST, port)))
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(ClusterOpeningEvent event) {
+                                clusterId.set(event.getClusterId().getValue());
+                            }
+                        }))
                 .build();
         try (MongoClient mongo = MongoClients.create(settings)) {
             mongo.getDatabase("test")
@@ -143,13 +145,14 @@ public Iterable<Tag> commandTags(CommandEvent event) {
         };
         MongoClientSettings settings = MongoClientSettings.builder()
                 .addCommandListener(new MongoMetricsCommandListener(registry, tagsProvider))
-                .applyToClusterSettings(builder -> builder.hosts(singletonList(new ServerAddress(HOST, port))))
-                .applyToClusterSettings(builder -> builder.addClusterListener(new ClusterListener() {
-                    @Override
-                    public void clusterOpening(ClusterOpeningEvent event) {
-                        clusterId.set(event.getClusterId().getValue());
-                    }
-                }))
+                .applyToClusterSettings(builder -> builder
+                        .hosts(singletonList(new ServerAddress(HOST, port)))
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(ClusterOpeningEvent event) {
+                                clusterId.set(event.getClusterId().getValue());
+                            }
+                        }))
                 .build();
         try (MongoClient mongo = MongoClients.create(settings)) {
             mongo.getDatabase("test")

diff --git a/.../io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListenerTest.java b/.../io/micrometer/core/instrument/binder/mongodb/MongoMetricsConnectionPoolListenerTest.java
@@ -54,13 +54,14 @@ void shouldCreatePoolMetrics() {
                         .minSize(2)
                         .addConnectionPoolListener(new MongoMetricsConnectionPoolListener(registry))
                 )
-                .applyToClusterSettings(builder -> builder.hosts(singletonList(new ServerAddress(HOST, port))))
-                .applyToClusterSettings(builder -> builder.addClusterListener(new ClusterListener() {
-                    @Override
-                    public void clusterOpening(ClusterOpeningEvent event) {
-                        clusterId.set(event.getClusterId().getValue());
-                    }
-                }))
+                .applyToClusterSettings(builder -> builder
+                        .hosts(singletonList(new ServerAddress(HOST, port)))
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(ClusterOpeningEvent event) {
+                                clusterId.set(event.getClusterId().getValue());
+                            }
+                        }))
                 .build();
         MongoClient mongo = MongoClients.create(settings);
 
@@ -98,13 +99,14 @@ void shouldCreatePoolMetricsWithCustomTags() {
                         .minSize(2)
                         .addConnectionPoolListener(connectionPoolListener)
                 )
-                .applyToClusterSettings(builder -> builder.hosts(singletonList(new ServerAddress(HOST, port))))
-                .applyToClusterSettings(builder -> builder.addClusterListener(new ClusterListener() {
-                    @Override
-                    public void clusterOpening(ClusterOpeningEvent event) {
-                        clusterId.set(event.getClusterId().getValue());
-                    }
-                }))
+                .applyToClusterSettings(builder -> builder
+                        .hosts(singletonList(new ServerAddress(HOST, port)))
+                        .addClusterListener(new ClusterListener() {
+                            @Override
+                            public void clusterOpening(ClusterOpeningEvent event) {
+                                clusterId.set(event.getClusterId().getValue());
+                            }
+                        }))
                 .build();
         MongoClient mongo = MongoClients.create(settings);