Nonfunctional changes only

8 files changed, 17 insertions, 17 deletions

diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
index 120d27d37ff..5e7b60411c9 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Bucket.java
@@ -21,7 +21,7 @@ import edu.umd.cs.findbugs.annotations.NonNull;
 /**
  * An aggregation of data which is only written to from a single thread.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class Bucket {
 
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/DimensionCache.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/DimensionCache.java
index 0318368a31c..8893a88d94c 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/DimensionCache.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/DimensionCache.java
@@ -13,7 +13,7 @@ import java.util.Set;
  * The persistence layer for metrics. Both CPU and memory hungry, but
  * it runs in its own little world.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 class DimensionCache {
 
@@ -74,10 +74,8 @@ class DimensionCache {
 
     private static final long MAX_AGE_MILLIS = 4 * 3600 * 1000;
 
-    private void padMetric(String metric,
-            Bucket toPresent,
-            int currentDataPoints) {
-        final LinkedHashMap<Point, TimeStampedMetric> cachedPoints = getCachedMetric(metric);
+    private void padMetric(String metric, Bucket toPresent, int currentDataPoints) {
+        LinkedHashMap<Point, TimeStampedMetric> cachedPoints = getCachedMetric(metric);
         int toAdd = pointsToKeep - currentDataPoints;
         @SuppressWarnings({"unchecked","rawtypes"})
             Entry<Point, TimeStampedMetric>[] cachedEntries = cachedPoints.entrySet().toArray(new Entry[0]);
@@ -87,8 +85,8 @@ class DimensionCache {
             if (leastOld.getValue().millis + MAX_AGE_MILLIS  < nowMillis) {
                 continue;
             }
-            final Identifier id = new Identifier(metric, leastOld.getKey());
-            if (!toPresent.hasIdentifier(id)) {
+            Identifier id = new Identifier(metric, leastOld.getKey());
+            if ( ! toPresent.hasIdentifier(id)) {
                 toPresent.put(id, leastOld.getValue().metric.pruneData());
                 --toAdd;
             }
@@ -99,7 +97,7 @@ class DimensionCache {
     private LinkedHashMap<Point, TimeStampedMetric> getCachedMetric(String metricName) {
         LinkedHashMap<Point, TimeStampedMetric> points = persistentData.get(metricName);
         if (points == null) {
-            points = new LinkedHashMap<Point, TimeStampedMetric>(16, 0.75f, false) {
+            points = new LinkedHashMap<>(16, 0.75f, false) {
                 protected @Override boolean removeEldestEntry(Map.Entry<Point, TimeStampedMetric> eldest) {
                     return size() > pointsToKeep;
                 }
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Measurement.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Measurement.java
index dee98024dda..cc7a4b0f717 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Measurement.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Measurement.java
@@ -5,7 +5,7 @@ package com.yahoo.metrics.simple;
  * Wrapper class for the actually measured value. Candidate for removal, but I
  * wanted a type instead of some opaque instance of Number.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class Measurement {
     private final Number magnitude;
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java
index 42af115bae9..7d142a8e4d8 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricAggregator.java
@@ -12,7 +12,7 @@ import com.yahoo.metrics.ManagerConfig;
  * snapshots for external consumption. Using the correct executor gives the
  * necessary guarantuees for this being invoked from only a single thread.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 class MetricAggregator implements Runnable {
 
@@ -44,7 +44,7 @@ class MetricAggregator implements Runnable {
     }
 
     private void createSnapshot(Bucket toDelete) {
-        final Bucket toPresent = new Bucket();
+        Bucket toPresent = new Bucket();
         for (Bucket b : buffer) {
             if (b == null) {
                 continue;
@@ -57,8 +57,8 @@ class MetricAggregator implements Runnable {
 
     private Bucket updateBuffer() {
         List<Bucket> buckets = metricsCollection.fetch();
-        final long toMillis = System.currentTimeMillis();
-        final int bucketIndex = generation++ % buffer.length;
+        long toMillis = System.currentTimeMillis();
+        int bucketIndex = generation++ % buffer.length;
         Bucket bucketToDelete = buffer[bucketIndex];
         Bucket latest = new Bucket(fromMillis, toMillis);
         for (Bucket b : buckets) {
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java
index e6e41ace04a..a2b82978a26 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/MetricReceiver.java
@@ -15,7 +15,7 @@ import com.yahoo.concurrent.ThreadLocalDirectory;
  * in constructors for declaring instances of {@link Counter} and {@link Gauge}
  * for the actual measurement of metrics.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 @Beta
 public class MetricReceiver {
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Point.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Point.java
index 5dc54c28ba0..672d05c1874 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Point.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Point.java
@@ -129,4 +129,5 @@ public final class Point implements Context {
     Value[] getLocation() {
         return location;
     }
+
 }
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Sample.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Sample.java
index d55dce7bd79..837e93de09a 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/Sample.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/Sample.java
@@ -7,9 +7,10 @@ import com.yahoo.metrics.simple.UntypedMetric.AssumedType;
  * A single metric measurement and all the meta data needed to route it
  * correctly.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class Sample {
+
     private final Identifier identifier;
     private final Measurement measurement;
     private final AssumedType metricType;
diff --git a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
index 66d7e0e7c2b..ee5f18e78d3 100644
--- a/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
+++ b/simplemetrics/src/main/java/com/yahoo/metrics/simple/jdisc/SimpleMetricConsumer.java
@@ -16,7 +16,7 @@ import com.yahoo.metrics.simple.UntypedMetric.AssumedType;
 /**
  * The single user facing part of the JDisc interfaces of simple metrics.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class SimpleMetricConsumer implements MetricConsumer {