Moved EventuallyConsistentMap classes into their own package.

Change-Id: I930a988a8cd8d47826a6f7d0f4ce23c56446df20

@@ -18,7 +18,6 @@ package org.onosproject.store.app;
 import com.google.common.base.Charsets;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -43,10 +42,10 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.cluster.messaging.MessageSubject;
-import org.onosproject.store.impl.EventuallyConsistentMap;
-import org.onosproject.store.impl.EventuallyConsistentMapEvent;
-import org.onosproject.store.impl.EventuallyConsistentMapImpl;
-import org.onosproject.store.impl.EventuallyConsistentMapListener;
+import org.onosproject.store.ecmap.EventuallyConsistentMap;
+import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
+import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
+import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
 import org.onosproject.store.impl.WallclockClockManager;
 import org.onosproject.store.impl.WallclockClockManager;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -63,9 +62,11 @@ import static com.google.common.io.ByteStreams.toByteArray;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.onlab.util.Tools.namedThreads;
 import static org.onlab.util.Tools.namedThreads;
 import static org.onosproject.app.ApplicationEvent.Type.*;
 import static org.onosproject.app.ApplicationEvent.Type.*;
-import static org.onosproject.store.app.GossipApplicationStore.InternalState.*;
-import static org.onosproject.store.impl.EventuallyConsistentMapEvent.Type.PUT;
-import static org.onosproject.store.impl.EventuallyConsistentMapEvent.Type.REMOVE;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.ACTIVATED;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.DEACTIVATED;
+import static org.onosproject.store.app.GossipApplicationStore.InternalState.INSTALLED;
+import static org.onosproject.store.ecmap.EventuallyConsistentMapEvent.Type.PUT;
+import static org.onosproject.store.ecmap.EventuallyConsistentMapEvent.Type.REMOVE;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.slf4j.LoggerFactory.getLogger;
 
 
 /**
 /**

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.NodeId;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import java.util.Collection;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Map;
@@ -32,7 +32,7 @@ import java.util.Set;
  * API).
  * API).
  * </p><p>
  * </p><p>
  * Clients are expected to register an
  * Clients are expected to register an
- * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if they
+ * {@link EventuallyConsistentMapListener} if they
  * are interested in receiving notifications of update to the map.
  * are interested in receiving notifications of update to the map.
  * </p><p>
  * </p><p>
  * Null values are not allowed in this map.
  * Null values are not allowed in this map.
@@ -85,7 +85,7 @@ public interface EventuallyConsistentMap<K, V> {
      * Note: this differs from the specification of {@link java.util.Map}
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return the previous value associated with the key.
      * because it does not return the previous value associated with the key.
      * Clients are expected to register an
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * they are interested in receiving notification of updates to the map.
      * </p><p>
      * </p><p>
      * Null values are not allowed in the map.
      * Null values are not allowed in the map.
@@ -102,7 +102,7 @@ public interface EventuallyConsistentMap<K, V> {
      * Note: this differs from the specification of {@link java.util.Map}
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return the previous value associated with the key.
      * because it does not return the previous value associated with the key.
      * Clients are expected to register an
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * they are interested in receiving notification of updates to the map.
      * </p>
      * </p>
      *
      *
@@ -122,7 +122,7 @@ public interface EventuallyConsistentMap<K, V> {
      * Note: this differs from the specification of {@link java.util.Map}
      * Note: this differs from the specification of {@link java.util.Map}
      * because it does not return a boolean indication whether a value was removed.
      * because it does not return a boolean indication whether a value was removed.
      * Clients are expected to register an
      * Clients are expected to register an
-     * {@link org.onosproject.store.impl.EventuallyConsistentMapListener} if
+     * {@link EventuallyConsistentMapListener} if
      * they are interested in receiving notification of updates to the map.
      * they are interested in receiving notification of updates to the map.
      * </p>
      * </p>
      *
      *

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -26,6 +26,9 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.impl.ClockService;
+import org.onosproject.store.impl.Timestamped;
+import org.onosproject.store.impl.WallClockTimestamp;
 import org.onosproject.store.serializers.KryoSerializer;
 import org.onosproject.store.serializers.KryoSerializer;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 /**
 /**
  * Listener interested in receiving modification events for an
  * Listener interested in receiving modification events for an

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableList;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects;
 import org.onosproject.store.Timestamp;
 import org.onosproject.store.Timestamp;

@@ -32,12 +32,12 @@ import org.onosproject.net.intent.IntentStoreDelegate;
 import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.Key;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
-import org.onosproject.store.impl.EventuallyConsistentMap;
-import org.onosproject.store.impl.EventuallyConsistentMapEvent;
-import org.onosproject.store.impl.EventuallyConsistentMapImpl;
-import org.onosproject.store.impl.EventuallyConsistentMapListener;
 import org.onosproject.store.impl.MultiValuedTimestamp;
 import org.onosproject.store.impl.MultiValuedTimestamp;
 import org.onosproject.store.impl.SystemClockTimestamp;
 import org.onosproject.store.impl.SystemClockTimestamp;
+import org.onosproject.store.ecmap.EventuallyConsistentMap;
+import org.onosproject.store.ecmap.EventuallyConsistentMapEvent;
+import org.onosproject.store.ecmap.EventuallyConsistentMapImpl;
+import org.onosproject.store.ecmap.EventuallyConsistentMapListener;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.store.impl;
+package org.onosproject.store.ecmap;
 
 
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -31,6 +31,8 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
 import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.impl.ClockService;
+import org.onosproject.store.impl.WallClockTimestamp;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.serializers.KryoSerializer;
 import org.onosproject.store.serializers.KryoSerializer;