moved Timestamped to appropriate package
Change-Id: I5cb9385b9bb84c0942014dd69654cfbce97db77b
Showing
15 changed files
with
15 additions
and
19 deletions
| ... | @@ -15,7 +15,7 @@ import org.onlab.onos.net.device.DefaultPortDescription; | ... | @@ -15,7 +15,7 @@ import org.onlab.onos.net.device.DefaultPortDescription; |
| 15 | import org.onlab.onos.net.device.DeviceDescription; | 15 | import org.onlab.onos.net.device.DeviceDescription; |
| 16 | import org.onlab.onos.net.device.PortDescription; | 16 | import org.onlab.onos.net.device.PortDescription; |
| 17 | import org.onlab.onos.store.Timestamp; | 17 | import org.onlab.onos.store.Timestamp; |
| 18 | -import org.onlab.onos.store.common.impl.Timestamped; | 18 | +import org.onlab.onos.store.impl.Timestamped; |
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * Collection of Description of a Device and Ports, given from a Provider. | 21 | * Collection of Description of a Device and Ports, given from a Provider. | ... | ... |
| ... | @@ -38,7 +38,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; | ... | @@ -38,7 +38,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; |
| 38 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; | 38 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; |
| 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; | 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; |
| 40 | import org.onlab.onos.store.cluster.messaging.MessageSubject; | 40 | import org.onlab.onos.store.cluster.messaging.MessageSubject; |
| 41 | -import org.onlab.onos.store.common.impl.Timestamped; | 41 | +import org.onlab.onos.store.impl.Timestamped; |
| 42 | import org.onlab.onos.store.serializers.KryoSerializer; | 42 | import org.onlab.onos.store.serializers.KryoSerializer; |
| 43 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; | 43 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; |
| 44 | import org.onlab.util.KryoPool; | 44 | import org.onlab.util.KryoPool; | ... | ... |
| ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; | ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; |
| 3 | import org.onlab.onos.net.DeviceId; | 3 | import org.onlab.onos.net.DeviceId; |
| 4 | import org.onlab.onos.net.device.DeviceDescription; | 4 | import org.onlab.onos.net.device.DeviceDescription; |
| 5 | import org.onlab.onos.net.provider.ProviderId; | 5 | import org.onlab.onos.net.provider.ProviderId; |
| 6 | -import org.onlab.onos.store.common.impl.Timestamped; | 6 | +import org.onlab.onos.store.impl.Timestamped; |
| 7 | 7 | ||
| 8 | import com.google.common.base.MoreObjects; | 8 | import com.google.common.base.MoreObjects; |
| 9 | 9 | ... | ... |
| ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; | ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; |
| 3 | import org.onlab.onos.net.DeviceId; | 3 | import org.onlab.onos.net.DeviceId; |
| 4 | import org.onlab.onos.net.device.DeviceDescription; | 4 | import org.onlab.onos.net.device.DeviceDescription; |
| 5 | import org.onlab.onos.net.provider.ProviderId; | 5 | import org.onlab.onos.net.provider.ProviderId; |
| 6 | -import org.onlab.onos.store.common.impl.Timestamped; | 6 | +import org.onlab.onos.store.impl.Timestamped; |
| 7 | 7 | ||
| 8 | import com.esotericsoftware.kryo.Kryo; | 8 | import com.esotericsoftware.kryo.Kryo; |
| 9 | import com.esotericsoftware.kryo.Serializer; | 9 | import com.esotericsoftware.kryo.Serializer; | ... | ... |
| ... | @@ -5,7 +5,7 @@ import java.util.List; | ... | @@ -5,7 +5,7 @@ import java.util.List; |
| 5 | import org.onlab.onos.net.DeviceId; | 5 | import org.onlab.onos.net.DeviceId; |
| 6 | import org.onlab.onos.net.device.PortDescription; | 6 | import org.onlab.onos.net.device.PortDescription; |
| 7 | import org.onlab.onos.net.provider.ProviderId; | 7 | import org.onlab.onos.net.provider.ProviderId; |
| 8 | -import org.onlab.onos.store.common.impl.Timestamped; | 8 | +import org.onlab.onos.store.impl.Timestamped; |
| 9 | 9 | ||
| 10 | import com.google.common.base.MoreObjects; | 10 | import com.google.common.base.MoreObjects; |
| 11 | 11 | ... | ... |
| ... | @@ -5,7 +5,7 @@ import java.util.List; | ... | @@ -5,7 +5,7 @@ import java.util.List; |
| 5 | import org.onlab.onos.net.DeviceId; | 5 | import org.onlab.onos.net.DeviceId; |
| 6 | import org.onlab.onos.net.device.PortDescription; | 6 | import org.onlab.onos.net.device.PortDescription; |
| 7 | import org.onlab.onos.net.provider.ProviderId; | 7 | import org.onlab.onos.net.provider.ProviderId; |
| 8 | -import org.onlab.onos.store.common.impl.Timestamped; | 8 | +import org.onlab.onos.store.impl.Timestamped; |
| 9 | 9 | ||
| 10 | import com.esotericsoftware.kryo.Kryo; | 10 | import com.esotericsoftware.kryo.Kryo; |
| 11 | import com.esotericsoftware.kryo.Serializer; | 11 | import com.esotericsoftware.kryo.Serializer; | ... | ... |
| ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; | ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; |
| 3 | import org.onlab.onos.net.DeviceId; | 3 | import org.onlab.onos.net.DeviceId; |
| 4 | import org.onlab.onos.net.device.PortDescription; | 4 | import org.onlab.onos.net.device.PortDescription; |
| 5 | import org.onlab.onos.net.provider.ProviderId; | 5 | import org.onlab.onos.net.provider.ProviderId; |
| 6 | -import org.onlab.onos.store.common.impl.Timestamped; | 6 | +import org.onlab.onos.store.impl.Timestamped; |
| 7 | 7 | ||
| 8 | import com.google.common.base.MoreObjects; | 8 | import com.google.common.base.MoreObjects; |
| 9 | 9 | ... | ... |
| ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; | ... | @@ -3,7 +3,7 @@ package org.onlab.onos.store.device.impl; |
| 3 | import org.onlab.onos.net.DeviceId; | 3 | import org.onlab.onos.net.DeviceId; |
| 4 | import org.onlab.onos.net.device.PortDescription; | 4 | import org.onlab.onos.net.device.PortDescription; |
| 5 | import org.onlab.onos.net.provider.ProviderId; | 5 | import org.onlab.onos.net.provider.ProviderId; |
| 6 | -import org.onlab.onos.store.common.impl.Timestamped; | 6 | +import org.onlab.onos.store.impl.Timestamped; |
| 7 | 7 | ||
| 8 | import com.esotericsoftware.kryo.Kryo; | 8 | import com.esotericsoftware.kryo.Kryo; |
| 9 | import com.esotericsoftware.kryo.Serializer; | 9 | import com.esotericsoftware.kryo.Serializer; | ... | ... |
| ... | @@ -38,7 +38,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; | ... | @@ -38,7 +38,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; |
| 38 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; | 38 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; |
| 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; | 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; |
| 40 | import org.onlab.onos.store.cluster.messaging.MessageSubject; | 40 | import org.onlab.onos.store.cluster.messaging.MessageSubject; |
| 41 | -import org.onlab.onos.store.common.impl.Timestamped; | 41 | +import org.onlab.onos.store.impl.Timestamped; |
| 42 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; | 42 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; |
| 43 | import org.onlab.onos.store.serializers.KryoSerializer; | 43 | import org.onlab.onos.store.serializers.KryoSerializer; |
| 44 | import org.onlab.packet.IpPrefix; | 44 | import org.onlab.packet.IpPrefix; | ... | ... |
| ... | @@ -39,7 +39,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; | ... | @@ -39,7 +39,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; |
| 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; | 39 | import org.onlab.onos.store.cluster.messaging.ClusterMessage; |
| 40 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; | 40 | import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; |
| 41 | import org.onlab.onos.store.cluster.messaging.MessageSubject; | 41 | import org.onlab.onos.store.cluster.messaging.MessageSubject; |
| 42 | -import org.onlab.onos.store.common.impl.Timestamped; | 42 | +import org.onlab.onos.store.impl.Timestamped; |
| 43 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; | 43 | import org.onlab.onos.store.serializers.DistributedStoreSerializers; |
| 44 | import org.onlab.onos.store.serializers.KryoSerializer; | 44 | import org.onlab.onos.store.serializers.KryoSerializer; |
| 45 | import org.onlab.util.KryoPool; | 45 | import org.onlab.util.KryoPool; | ... | ... |
| ... | @@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects; | ... | @@ -4,7 +4,7 @@ import com.google.common.base.MoreObjects; |
| 4 | 4 | ||
| 5 | import org.onlab.onos.net.link.LinkDescription; | 5 | import org.onlab.onos.net.link.LinkDescription; |
| 6 | import org.onlab.onos.net.provider.ProviderId; | 6 | import org.onlab.onos.net.provider.ProviderId; |
| 7 | -import org.onlab.onos.store.common.impl.Timestamped; | 7 | +import org.onlab.onos.store.impl.Timestamped; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | * Information published by GossipDeviceStore to notify peers of a device | 10 | * Information published by GossipDeviceStore to notify peers of a device | ... | ... |
| 1 | package org.onlab.onos.store.serializers; | 1 | package org.onlab.onos.store.serializers; |
| 2 | 2 | ||
| 3 | -import org.onlab.onos.store.common.impl.Timestamped; | ||
| 4 | import org.onlab.onos.store.impl.MastershipBasedTimestamp; | 3 | import org.onlab.onos.store.impl.MastershipBasedTimestamp; |
| 4 | +import org.onlab.onos.store.impl.Timestamped; | ||
| 5 | import org.onlab.onos.store.impl.WallClockTimestamp; | 5 | import org.onlab.onos.store.impl.WallClockTimestamp; |
| 6 | import org.onlab.util.KryoPool; | 6 | import org.onlab.util.KryoPool; |
| 7 | 7 | ... | ... |
| 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 | ||
| ... | @@ -7,6 +7,7 @@ import java.nio.ByteBuffer; | ... | @@ -7,6 +7,7 @@ import java.nio.ByteBuffer; |
| 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.onos.store.impl.MastershipBasedTimestamp; |
| 10 | +import org.onlab.onos.store.impl.Timestamped; | ||
| 10 | import org.onlab.util.KryoPool; | 11 | import org.onlab.util.KryoPool; |
| 11 | 12 | ||
| 12 | import com.google.common.testing.EqualsTester; | 13 | import com.google.common.testing.EqualsTester; | ... | ... |
-
Please register or login to post a comment