홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
63939a36 1 parent d7f7bcc9

Moved generic Timestamp/ClockManager classes to onos-api 

so they are usable by applications.

Change-Id: Icf0e92d12434dec782332e91b632da8066a85b60
Inline Side-by-side
Showing 14 changed files with 15 additions and 15 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.store.impl; 16 +package org.onosproject.store.service;
17 17
18 import com.google.common.base.MoreObjects; 18 import com.google.common.base.MoreObjects;
19 import com.google.common.collect.ComparisonChain; 19 import com.google.common.collect.ComparisonChain;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.store.impl; 16 +package org.onosproject.store.service;
17 17
18 import static com.google.common.base.Preconditions.checkArgument; 18 import static com.google.common.base.Preconditions.checkArgument;
19 19
......
...@@ -13,10 +13,9 @@ ...@@ -13,10 +13,9 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.store.impl; 16 +package org.onosproject.store.service;
17 17
18 import org.onosproject.store.Timestamp; 18 import org.onosproject.store.Timestamp;
19 -import org.onosproject.store.service.ClockService;
20 19
21 /** 20 /**
22 * A clock service which hands out wallclock-based timestamps. 21 * A clock service which hands out wallclock-based timestamps.
......
...@@ -43,7 +43,7 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService; ...@@ -43,7 +43,7 @@ import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
43 import org.onosproject.store.cluster.messaging.ClusterMessage; 43 import org.onosproject.store.cluster.messaging.ClusterMessage;
44 import org.onosproject.store.cluster.messaging.ClusterMessageHandler; 44 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
45 import org.onosproject.store.cluster.messaging.MessageSubject; 45 import org.onosproject.store.cluster.messaging.MessageSubject;
46 -import org.onosproject.store.impl.MultiValuedTimestamp; 46 +import org.onosproject.store.service.MultiValuedTimestamp;
47 import org.onosproject.store.serializers.KryoNamespaces; 47 import org.onosproject.store.serializers.KryoNamespaces;
48 import org.onosproject.store.service.EventuallyConsistentMap; 48 import org.onosproject.store.service.EventuallyConsistentMap;
49 import org.onosproject.store.service.EventuallyConsistentMapEvent; 49 import org.onosproject.store.service.EventuallyConsistentMapEvent;
......
...@@ -35,7 +35,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; ...@@ -35,7 +35,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
35 import org.onosproject.store.cluster.messaging.MessageSubject; 35 import org.onosproject.store.cluster.messaging.MessageSubject;
36 import org.onosproject.store.impl.LogicalTimestamp; 36 import org.onosproject.store.impl.LogicalTimestamp;
37 import org.onosproject.store.impl.Timestamped; 37 import org.onosproject.store.impl.Timestamped;
38 -import org.onosproject.store.impl.WallClockTimestamp; 38 +import org.onosproject.store.service.WallClockTimestamp;
39 import org.onosproject.store.serializers.KryoSerializer; 39 import org.onosproject.store.serializers.KryoSerializer;
40 import org.onosproject.store.service.ClockService; 40 import org.onosproject.store.service.ClockService;
41 import org.onosproject.store.service.EventuallyConsistentMap; 41 import org.onosproject.store.service.EventuallyConsistentMap;
......
...@@ -62,7 +62,7 @@ import org.onosproject.store.Timestamp; ...@@ -62,7 +62,7 @@ import org.onosproject.store.Timestamp;
62 import org.onosproject.store.cluster.messaging.ClusterCommunicationService; 62 import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
63 import org.onosproject.store.cluster.messaging.ClusterMessage; 63 import org.onosproject.store.cluster.messaging.ClusterMessage;
64 import org.onosproject.store.cluster.messaging.ClusterMessageHandler; 64 import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
65 -import org.onosproject.store.impl.MultiValuedTimestamp; 65 +import org.onosproject.store.service.MultiValuedTimestamp;
66 import org.onosproject.store.serializers.KryoNamespaces; 66 import org.onosproject.store.serializers.KryoNamespaces;
67 import org.onosproject.store.service.ClockService; 67 import org.onosproject.store.service.ClockService;
68 import org.onosproject.store.service.EventuallyConsistentMap; 68 import org.onosproject.store.service.EventuallyConsistentMap;
......
...@@ -24,7 +24,7 @@ import org.apache.felix.scr.annotations.Service; ...@@ -24,7 +24,7 @@ import org.apache.felix.scr.annotations.Service;
24 import org.onosproject.net.HostId; 24 import org.onosproject.net.HostId;
25 import org.onosproject.net.host.HostClockService; 25 import org.onosproject.net.host.HostClockService;
26 import org.onosproject.store.Timestamp; 26 import org.onosproject.store.Timestamp;
27 -import org.onosproject.store.impl.WallClockTimestamp; 27 +import org.onosproject.store.service.WallClockTimestamp;
28 import org.slf4j.Logger; 28 import org.slf4j.Logger;
29 29
30 /** 30 /**
......
...@@ -36,8 +36,8 @@ import org.onosproject.net.intent.IntentStoreDelegate; ...@@ -36,8 +36,8 @@ import org.onosproject.net.intent.IntentStoreDelegate;
36 import org.onosproject.net.intent.Key; 36 import org.onosproject.net.intent.Key;
37 import org.onosproject.net.intent.PartitionService; 37 import org.onosproject.net.intent.PartitionService;
38 import org.onosproject.store.AbstractStore; 38 import org.onosproject.store.AbstractStore;
39 -import org.onosproject.store.impl.MultiValuedTimestamp; 39 +import org.onosproject.store.service.MultiValuedTimestamp;
40 -import org.onosproject.store.impl.WallClockTimestamp; 40 +import org.onosproject.store.service.WallClockTimestamp;
41 import org.onosproject.store.serializers.KryoNamespaces; 41 import org.onosproject.store.serializers.KryoNamespaces;
42 import org.onosproject.store.service.EventuallyConsistentMap; 42 import org.onosproject.store.service.EventuallyConsistentMap;
43 import org.onosproject.store.service.EventuallyConsistentMapEvent; 43 import org.onosproject.store.service.EventuallyConsistentMapEvent;
......
...@@ -22,7 +22,7 @@ import org.apache.felix.scr.annotations.Service; ...@@ -22,7 +22,7 @@ import org.apache.felix.scr.annotations.Service;
22 import org.onosproject.net.intent.IntentClockService; 22 import org.onosproject.net.intent.IntentClockService;
23 import org.onosproject.net.intent.IntentId; 23 import org.onosproject.net.intent.IntentId;
24 import org.onosproject.store.Timestamp; 24 import org.onosproject.store.Timestamp;
25 -import org.onosproject.store.impl.WallClockTimestamp; 25 +import org.onosproject.store.service.WallClockTimestamp;
26 import org.slf4j.Logger; 26 import org.slf4j.Logger;
27 27
28 import static org.slf4j.LoggerFactory.getLogger; 28 import static org.slf4j.LoggerFactory.getLogger;
......
...@@ -18,7 +18,7 @@ package org.onosproject.store.intent.impl; ...@@ -18,7 +18,7 @@ package org.onosproject.store.intent.impl;
18 import org.onosproject.net.intent.IntentData; 18 import org.onosproject.net.intent.IntentData;
19 import org.onosproject.store.Timestamp; 19 import org.onosproject.store.Timestamp;
20 import org.onosproject.store.service.ClockService; 20 import org.onosproject.store.service.ClockService;
21 -import org.onosproject.store.impl.MultiValuedTimestamp; 21 +import org.onosproject.store.service.MultiValuedTimestamp;
22 22
23 /** 23 /**
24 * ClockService that uses IntentData versions as timestamps. 24 * ClockService that uses IntentData versions as timestamps.
......
...@@ -18,7 +18,7 @@ package org.onosproject.store.intent.impl; ...@@ -18,7 +18,7 @@ package org.onosproject.store.intent.impl;
18 import org.onosproject.net.intent.IntentData; 18 import org.onosproject.net.intent.IntentData;
19 import org.onosproject.store.Timestamp; 19 import org.onosproject.store.Timestamp;
20 import org.onosproject.store.service.ClockService; 20 import org.onosproject.store.service.ClockService;
21 -import org.onosproject.store.impl.MultiValuedTimestamp; 21 +import org.onosproject.store.service.MultiValuedTimestamp;
22 22
23 import java.util.concurrent.atomic.AtomicLong; 23 import java.util.concurrent.atomic.AtomicLong;
24 24
......
...@@ -17,7 +17,7 @@ package org.onosproject.store.serializers.impl; ...@@ -17,7 +17,7 @@ package org.onosproject.store.serializers.impl;
17 17
18 import org.onosproject.store.impl.MastershipBasedTimestamp; 18 import org.onosproject.store.impl.MastershipBasedTimestamp;
19 import org.onosproject.store.impl.Timestamped; 19 import org.onosproject.store.impl.Timestamped;
20 -import org.onosproject.store.impl.WallClockTimestamp; 20 +import org.onosproject.store.service.WallClockTimestamp;
21 import org.onosproject.store.serializers.KryoNamespaces; 21 import org.onosproject.store.serializers.KryoNamespaces;
22 import org.onlab.util.KryoNamespace; 22 import org.onlab.util.KryoNamespace;
23 23
......
...@@ -38,7 +38,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler; ...@@ -38,7 +38,7 @@ import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
38 import org.onosproject.store.cluster.messaging.MessageSubject; 38 import org.onosproject.store.cluster.messaging.MessageSubject;
39 import org.onosproject.store.service.ClockService; 39 import org.onosproject.store.service.ClockService;
40 import org.onosproject.store.impl.LogicalTimestamp; 40 import org.onosproject.store.impl.LogicalTimestamp;
41 -import org.onosproject.store.impl.WallClockTimestamp; 41 +import org.onosproject.store.service.WallClockTimestamp;
42 import org.onosproject.store.serializers.KryoNamespaces; 42 import org.onosproject.store.serializers.KryoNamespaces;
43 import org.onosproject.store.serializers.KryoSerializer; 43 import org.onosproject.store.serializers.KryoSerializer;
44 import org.onosproject.store.service.EventuallyConsistentMap; 44 import org.onosproject.store.service.EventuallyConsistentMap;
......
...@@ -24,6 +24,7 @@ import org.onosproject.store.Timestamp; ...@@ -24,6 +24,7 @@ import org.onosproject.store.Timestamp;
24 import org.onlab.util.KryoNamespace; 24 import org.onlab.util.KryoNamespace;
25 25
26 import com.google.common.testing.EqualsTester; 26 import com.google.common.testing.EqualsTester;
27 +import org.onosproject.store.service.WallClockTimestamp;
27 28
28 /** 29 /**
29 * Tests for {@link WallClockTimestamp}. 30 * Tests for {@link WallClockTimestamp}.
......