commit bcf1a48e897f02284a7aebfeb104adf03e398a5b
author Madan Jampani <madan@onlab.us> Wed Jun 24 19:05:56 2015 -0700
committer Madan Jampani <madan@onlab.us> Wed Jun 24 19:35:33 2015 -0700
tree 5a44fe6f3d605ee5ef8cf1a5adf02600b63066c7
parent d1acfd8fe6ff486bba927321085ffc0df177d9c0

Removed ClockService<K, V> and replaced its usage with a BiFunction<K, V, Timestamp>

Change-Id: Ide8d979f9361f1aff6727a83733747f4512ef8ff

core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java b/core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java
index 77db68c..869976c 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/ecmap/EventuallyConsistentMapImplTest.java
@@ -35,7 +35,6 @@
 import org.onosproject.store.cluster.messaging.ClusterMessage;
 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
 import org.onosproject.store.cluster.messaging.MessageSubject;
-import org.onosproject.store.service.ClockService;
 import org.onosproject.store.impl.LogicalTimestamp;
 import org.onosproject.store.service.WallClockTimestamp;
 import org.onosproject.store.serializers.KryoNamespaces;
@@ -148,7 +147,7 @@
                         clusterService, clusterCommunicator)
                 .withName(MAP_NAME)
                 .withSerializer(serializer)
-                .withClockService(clockService)
+                .withTimestampProvider((k, v) -> clockService.getTimestamp(k, v))
                 .withCommunicationExecutor(MoreExecutors.newDirectExecutorService())
                 .build();
 
@@ -805,12 +804,11 @@
      * @param <T> Type that the clock service will give out timestamps for
      * @param <U> Second type that the clock service will give out values for
      */
-    private class SequentialClockService<T, U> implements ClockService<T, U> {
+    private class SequentialClockService<T, U> {
 
         private static final long INITIAL_VALUE = 1;
         private final AtomicLong counter = new AtomicLong(INITIAL_VALUE);
 
-        @Override
         public Timestamp getTimestamp(T object, U object2) {
             return new TestTimestamp(counter.getAndIncrement());
         }