From 891a20c6084cc3ca78ff199a03728bb312c4c48e Mon Sep 17 00:00:00 2001
From: Leandro Alves <leandroalves@yahoo-inc.com>
Date: Fri, 2 Jun 2017 15:15:18 +0200
Subject: add a static import for 'singleton'

---
 .../com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java   | 2 ++
 .../java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'config-model')

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
index 56cc430e734..68346477f23 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/DefaultVespaMetrics.java
@@ -5,6 +5,8 @@ import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 
 /**
+ * Encapsulates a minimal set of Vespa metrics to be used as default for all metrics consumers.
+ *
  * @author leandroalves
  */
 public class DefaultVespaMetrics {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
index 57b838a721a..d260de7b5d0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/monitoring/VespaMetricSet.java
@@ -2,11 +2,11 @@
 package com.yahoo.vespa.model.admin.monitoring;
 
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import static com.yahoo.vespa.model.admin.monitoring.DefaultVespaMetrics.defaultVespaMetricSet;
+import static java.util.Collections.singleton;
 
 /**
  * Encapsulates vespa service metrics.
@@ -18,7 +18,7 @@ public class VespaMetricSet {
 
     public static final MetricSet vespaMetricSet = new MetricSet("vespa",
                                                                  getVespaMetrics(),
-                                                                 Collections.singleton(defaultVespaMetricSet));
+                                                                 singleton(defaultVespaMetricSet));
 
     private static Set<Metric> getVespaMetrics() {
         Set<Metric> metrics = new LinkedHashSet<>();
-- 
cgit v1.2.3