DistHostStore: HOST_MOVED based on distributed state

- Use information in the distributed Map to determine
 if the Host has moved instead of instance local cache view.

Change-Id: I374e7cf9f4f03451770b137ef2e835e6c578a463

@@ -55,7 +55,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Objects;
 import java.util.Set;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -82,9 +81,6 @@ public class DistributedHostStore
     private ConsistentMap<HostId, DefaultHost> hostsConsistentMap;
     private ConsistentMap<HostId, DefaultHost> hostsConsistentMap;
     private Map<HostId, DefaultHost> hosts;
     private Map<HostId, DefaultHost> hosts;
 
 
-    private final ConcurrentHashMap<HostId, DefaultHost> prevHosts =
-            new ConcurrentHashMap<>();
-
     private MapEventListener<HostId, DefaultHost> hostLocationTracker =
     private MapEventListener<HostId, DefaultHost> hostLocationTracker =
             new HostLocationTracker();
             new HostLocationTracker();
 
 
@@ -101,7 +97,6 @@ public class DistributedHostStore
 
 
         hosts = hostsConsistentMap.asJavaMap();
         hosts = hostsConsistentMap.asJavaMap();
 
 
-        prevHosts.putAll(hosts);
 
 
         hostsConsistentMap.addListener(hostLocationTracker);
         hostsConsistentMap.addListener(hostLocationTracker);
 
 
@@ -111,7 +106,6 @@ public class DistributedHostStore
     @Deactivate
     @Deactivate
     public void deactivate() {
     public void deactivate() {
         hostsConsistentMap.removeListener(hostLocationTracker);
         hostsConsistentMap.removeListener(hostLocationTracker);
-        prevHosts.clear();
 
 
         log.info("Stopped");
         log.info("Stopped");
     }
     }
@@ -283,13 +277,15 @@ public class DistributedHostStore
     private class HostLocationTracker implements MapEventListener<HostId, DefaultHost> {
     private class HostLocationTracker implements MapEventListener<HostId, DefaultHost> {
         @Override
         @Override
         public void event(MapEvent<HostId, DefaultHost> event) {
         public void event(MapEvent<HostId, DefaultHost> event) {
-            DefaultHost host = checkNotNull(event.value().value());
-            Host prevHost = prevHosts.put(host.id(), host);
+            Host host;
             switch (event.type()) {
             switch (event.type()) {
                 case INSERT:
                 case INSERT:
+                    host = checkNotNull(event.newValue().value());
                     notifyDelegate(new HostEvent(HOST_ADDED, host));
                     notifyDelegate(new HostEvent(HOST_ADDED, host));
                     break;
                     break;
                 case UPDATE:
                 case UPDATE:
+                    host = checkNotNull(event.newValue().value());
+                    Host prevHost = checkNotNull(event.oldValue().value());
                     if (!Objects.equals(prevHost.location(), host.location())) {
                     if (!Objects.equals(prevHost.location(), host.location())) {
                         notifyDelegate(new HostEvent(HOST_MOVED, host, prevHost));
                         notifyDelegate(new HostEvent(HOST_MOVED, host, prevHost));
                     } else if (!Objects.equals(prevHost, host)) {
                     } else if (!Objects.equals(prevHost, host)) {
@@ -297,9 +293,8 @@ public class DistributedHostStore
                     }
                     }
                     break;
                     break;
                 case REMOVE:
                 case REMOVE:
-                    if (prevHosts.remove(host.id()) != null) {
+                    host = checkNotNull(event.oldValue().value());
                     notifyDelegate(new HostEvent(HOST_REMOVED, host));
                     notifyDelegate(new HostEvent(HOST_REMOVED, host));
-                    }
                     break;
                     break;
                 default:
                 default:
                     log.warn("Unknown map event type: {}", event.type());
                     log.warn("Unknown map event type: {}", event.type());