홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
8ce0873c 1 parent 093e83ea

Moved MastershipBasedTimestamp 

- store.common.impl -> store.impl
-- Note: Timestamp interface is located in store package

Change-Id: I97452a41622d3eb97a0c95c4d7ca827863a37e20
Inline Side-by-side
Showing 9 changed files with 9 additions and 7 deletions
...@@ -10,7 +10,8 @@ import com.google.common.base.MoreObjects; ...@@ -10,7 +10,8 @@ import com.google.common.base.MoreObjects;
10 10
11 /** 11 /**
12 * Wrapper class to store Timestamped value. 12 * Wrapper class to store Timestamped value.
13 - * @param <T> 13 + *
14 + * @param <T> Timestamped value type
14 */ 15 */
15 public final class Timestamped<T> { 16 public final class Timestamped<T> {
16 17
......
...@@ -15,7 +15,7 @@ import org.onlab.onos.net.DeviceId; ...@@ -15,7 +15,7 @@ import org.onlab.onos.net.DeviceId;
15 import org.onlab.onos.net.device.DeviceClockProviderService; 15 import org.onlab.onos.net.device.DeviceClockProviderService;
16 import org.onlab.onos.net.device.DeviceClockService; 16 import org.onlab.onos.net.device.DeviceClockService;
17 import org.onlab.onos.store.Timestamp; 17 import org.onlab.onos.store.Timestamp;
18 -import org.onlab.onos.store.common.impl.MastershipBasedTimestamp; 18 +import org.onlab.onos.store.impl.MastershipBasedTimestamp;
19 import org.slf4j.Logger; 19 import org.slf4j.Logger;
20 20
21 /** 21 /**
......
1 -package org.onlab.onos.store.common.impl; 1 +package org.onlab.onos.store.impl;
2 2
3 import static com.google.common.base.Preconditions.checkArgument; 3 import static com.google.common.base.Preconditions.checkArgument;
4 4
......
...@@ -46,4 +46,4 @@ public class InternalLinkRemovedEvent { ...@@ -46,4 +46,4 @@ public class InternalLinkRemovedEvent {
46 linkKey = null; 46 linkKey = null;
47 timestamp = null; 47 timestamp = null;
48 } 48 }
49 -}
...\ No newline at end of file ...\ No newline at end of file
49 +}
......
1 package org.onlab.onos.store.serializers; 1 package org.onlab.onos.store.serializers;
2 2
3 -import org.onlab.onos.store.common.impl.MastershipBasedTimestamp;
4 import org.onlab.onos.store.common.impl.Timestamped; 3 import org.onlab.onos.store.common.impl.Timestamped;
4 +import org.onlab.onos.store.impl.MastershipBasedTimestamp;
5 import org.onlab.util.KryoPool; 5 import org.onlab.util.KryoPool;
6 6
7 public final class DistributedStoreSerializers { 7 public final class DistributedStoreSerializers {
......
1 package org.onlab.onos.store.serializers; 1 package org.onlab.onos.store.serializers;
2 2
3 -import org.onlab.onos.store.common.impl.MastershipBasedTimestamp; 3 +import org.onlab.onos.store.impl.MastershipBasedTimestamp;
4 4
5 import com.esotericsoftware.kryo.Kryo; 5 import com.esotericsoftware.kryo.Kryo;
6 import com.esotericsoftware.kryo.Serializer; 6 import com.esotericsoftware.kryo.Serializer;
......
...@@ -6,6 +6,7 @@ import java.nio.ByteBuffer; ...@@ -6,6 +6,7 @@ import java.nio.ByteBuffer;
6 6
7 import org.junit.Test; 7 import org.junit.Test;
8 import org.onlab.onos.store.Timestamp; 8 import org.onlab.onos.store.Timestamp;
9 +import org.onlab.onos.store.impl.MastershipBasedTimestamp;
9 import org.onlab.util.KryoPool; 10 import org.onlab.util.KryoPool;
10 11
11 import com.google.common.testing.EqualsTester; 12 import com.google.common.testing.EqualsTester;
......
1 -package org.onlab.onos.store.common.impl; 1 +package org.onlab.onos.store.impl;
2 2
3 import static org.junit.Assert.*; 3 import static org.junit.Assert.*;
4 4
......