Merge pull request #3382 from vespa-engine/bratseth/support-error-removal

Bratseth/support error removal

2 files changed, 25 insertions, 22 deletions

diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
index 731ef633f94..3a9f71b932c 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/UntypedMetric.java
@@ -11,9 +11,10 @@ import com.yahoo.log.LogLevel;
  * A gauge or a counter or... who knows? The class for storing a metric when the
  * metric has not been declared.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class UntypedMetric {
+
     private static final Logger log = Logger.getLogger(UntypedMetric.class.getName());
 
     private long count = 0L;
@@ -27,26 +28,6 @@ public class UntypedMetric {
 
     public enum AssumedType { NONE, GAUGE, COUNTER };
 
-    public String toString() {
-        StringBuilder buf = new StringBuilder();
-        buf.append(this.getClass().getName()).append(": ");
-        buf.append("outputFormat=").append(outputFormat).append(", ");
-        if (count > 0 && outputFormat == AssumedType.GAUGE) {
-            buf.append("max=").append(max).append(", ");
-            buf.append("min=").append(min).append(", ");
-            buf.append("sum=").append(sum).append(", ");
-        }
-        if (histogram != null) {
-            buf.append("histogram=").append(histogram).append(", ");
-        }
-        if (metricSettings != null) {
-            buf.append("metricSettings=").append(metricSettings).append(", ");
-        }
-        buf.append("current=").append(current).append(", ");
-        buf.append("count=").append(count);
-        return buf.toString();
-    }
-
     UntypedMetric(MetricSettings metricSettings) {
         this.metricSettings = metricSettings;
         if (metricSettings == null || !metricSettings.isHistogram()) {
@@ -128,4 +109,26 @@ public class UntypedMetric {
     public DoubleHistogram getHistogram() {
         return histogram;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder buf = new StringBuilder();
+        buf.append(this.getClass().getName()).append(": ");
+        buf.append("outputFormat=").append(outputFormat).append(", ");
+        if (count > 0 && outputFormat == AssumedType.GAUGE) {
+            buf.append("max=").append(max).append(", ");
+            buf.append("min=").append(min).append(", ");
+            buf.append("sum=").append(sum).append(", ");
+        }
+        if (histogram != null) {
+            buf.append("histogram=").append(histogram).append(", ");
+        }
+        if (metricSettings != null) {
+            buf.append("metricSettings=").append(metricSettings).append(", ");
+        }
+        buf.append("current=").append(current).append(", ");
+        buf.append("count=").append(count);
+        return buf.toString();
+    }
+
 }
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java
index efa01121e04..9306c7c59db 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/package-info.java
@@ -23,7 +23,7 @@
  * {@link com.yahoo.metrics.simple.MetricUpdater}.
  * </p>
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 @PublicApi
 @ExportPackage