From 24c62512f5c2d0cc919ea3d2f9ad610f5d235aa5 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@yahoo-inc.com>
Date: Tue, 23 Aug 2016 14:22:09 +0200
Subject: Nonfunctional changes only

---
 .../container/jdisc/state/MetricSnapshot.java      |  4 +--
 .../yahoo/container/jdisc/state/StateMonitor.java  |  3 +-
 .../container/jdisc/state/MetricSnapshotTest.java  | 39 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)

(limited to 'container-core')

diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java
index 3affbb0f8c5..7f96c9c3516 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricSnapshot.java
@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 /**
  * A snapshot of the metrics of this system in a particular time interval.
  *
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 public final class MetricSnapshot implements Iterable<Map.Entry<MetricDimensions, MetricSet>> {
 
@@ -86,7 +86,7 @@ public final class MetricSnapshot implements Iterable<Map.Entry<MetricDimensions
         Map<MetricDimensions, MetricSet> newData = new HashMap<>();
         for (Map.Entry<MetricDimensions, MetricSet> entry : data.entrySet()) {
             MetricSet newSet = entry.getValue().partialClone();
-            if (!newSet.isEmpty()) {
+            if ( ! newSet.isEmpty()) {
                 newData.put(entry.getKey(), newSet);
             }
         }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
index b81c758aa32..ac1ceb9175b 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
@@ -97,8 +97,7 @@ public class StateMonitor extends AbstractComponent {
     private void updateNames(MetricSnapshot current) {
         TreeSet<String> seen = new TreeSet<>();
         for (Map.Entry<MetricDimensions, MetricSet> dimensionAndMetric : current) {
-            for (Map.Entry<String, MetricValue> nameAndMetric : dimensionAndMetric
-                    .getValue()) {
+            for (Map.Entry<String, MetricValue> nameAndMetric : dimensionAndMetric.getValue()) {
                 seen.add(nameAndMetric.getKey());
             }
         }
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
index 9dc9379e585..fb48b4455b5 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/MetricSnapshotTest.java
@@ -2,9 +2,15 @@
 package com.yahoo.container.jdisc.state;
 
 import org.junit.Test;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.junit.Assert.*;
 
 public class MetricSnapshotTest {
+
     /**
      * Aggregate metrics are not cloned into new snapshot. In turn, a metric
      * set with only aggregates will be added as an empty set if we do not
@@ -20,4 +26,37 @@ public class MetricSnapshotTest {
         MetricSnapshot newSnapshot = snapshot.createSnapshot();
         assertFalse(newSnapshot.iterator().hasNext());
     }
+    
+    @Test
+    public void testEquality() {
+        assertEquals(Collections.unmodifiableMap(new HashMap(0)).hashCode(), Collections.emptyMap().hashCode());
+        assertEquals(Collections.unmodifiableMap(new HashMap(0)), Collections.emptyMap());
+    }
+
+    @Test
+    public void testLookup() {
+        Map<Key, String> map = new HashMap<>();
+        map.put(new Key(), "a");
+        System.out.println("Lookup value after putting a: " + map.get(new Key()));
+        map.put(new Key(), "b");
+        System.out.println("Map content after putting b: ");
+        for (Map.Entry<Key, String> entry : map.entrySet())
+            System.out.println("    " + entry);
+    }
+
+    public static class Key {
+        
+        @Override
+        public int hashCode() {
+            return 1;
+        }
+        
+        @Override
+        public boolean equals(Object other) {
+            if (this == other) return true;
+            return false;
+        }
+        
+    }
+    
 }
-- 
cgit v1.2.3