홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
60a190b2 1 parent e7fdd0da

Fix split-package issue in onos-dist 

Change-Id: I6ae5e4cf5e60f905f1f24f85dd8d4b40f7dfd0d9
Inline Side-by-side
Showing 10 changed files with 12 additions and 11 deletions
...@@ -34,10 +34,10 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService; ...@@ -34,10 +34,10 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
34 import org.onlab.onos.store.cluster.messaging.ClusterMessage; 34 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
35 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; 35 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
36 import org.onlab.onos.store.cluster.messaging.MessageSubject; 36 import org.onlab.onos.store.cluster.messaging.MessageSubject;
37 -import org.onlab.onos.store.serializers.ClusterMessageSerializer;
38 import org.onlab.onos.store.serializers.KryoNamespaces; 37 import org.onlab.onos.store.serializers.KryoNamespaces;
39 import org.onlab.onos.store.serializers.KryoSerializer; 38 import org.onlab.onos.store.serializers.KryoSerializer;
40 -import org.onlab.onos.store.serializers.MessageSubjectSerializer; 39 +import org.onlab.onos.store.serializers.impl.ClusterMessageSerializer;
40 +import org.onlab.onos.store.serializers.impl.MessageSubjectSerializer;
41 import org.onlab.util.KryoNamespace; 41 import org.onlab.util.KryoNamespace;
42 import org.onlab.netty.Endpoint; 42 import org.onlab.netty.Endpoint;
43 import org.onlab.netty.Message; 43 import org.onlab.netty.Message;
......
...@@ -59,7 +59,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; ...@@ -59,7 +59,7 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
59 import org.onlab.onos.store.cluster.messaging.MessageSubject; 59 import org.onlab.onos.store.cluster.messaging.MessageSubject;
60 import org.onlab.onos.store.impl.Timestamped; 60 import org.onlab.onos.store.impl.Timestamped;
61 import org.onlab.onos.store.serializers.KryoSerializer; 61 import org.onlab.onos.store.serializers.KryoSerializer;
62 -import org.onlab.onos.store.serializers.DistributedStoreSerializers; 62 +import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
63 import org.onlab.packet.ChassisId; 63 import org.onlab.packet.ChassisId;
64 import org.onlab.util.KryoNamespace; 64 import org.onlab.util.KryoNamespace;
65 import org.onlab.util.NewConcurrentHashMap; 65 import org.onlab.util.NewConcurrentHashMap;
......
...@@ -75,9 +75,9 @@ import org.onlab.onos.store.flow.ReplicaInfoService; ...@@ -75,9 +75,9 @@ import org.onlab.onos.store.flow.ReplicaInfoService;
75 import org.onlab.onos.store.hz.AbstractHazelcastStore; 75 import org.onlab.onos.store.hz.AbstractHazelcastStore;
76 import org.onlab.onos.store.hz.SMap; 76 import org.onlab.onos.store.hz.SMap;
77 import org.onlab.onos.store.serializers.DecodeTo; 77 import org.onlab.onos.store.serializers.DecodeTo;
78 -import org.onlab.onos.store.serializers.DistributedStoreSerializers;
79 import org.onlab.onos.store.serializers.KryoSerializer; 78 import org.onlab.onos.store.serializers.KryoSerializer;
80 import org.onlab.onos.store.serializers.StoreSerializer; 79 import org.onlab.onos.store.serializers.StoreSerializer;
80 +import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
81 import org.onlab.util.KryoNamespace; 81 import org.onlab.util.KryoNamespace;
82 import org.slf4j.Logger; 82 import org.slf4j.Logger;
83 83
......
...@@ -67,8 +67,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage; ...@@ -67,8 +67,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage;
67 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; 67 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
68 import org.onlab.onos.store.cluster.messaging.MessageSubject; 68 import org.onlab.onos.store.cluster.messaging.MessageSubject;
69 import org.onlab.onos.store.impl.Timestamped; 69 import org.onlab.onos.store.impl.Timestamped;
70 -import org.onlab.onos.store.serializers.DistributedStoreSerializers;
71 import org.onlab.onos.store.serializers.KryoSerializer; 70 import org.onlab.onos.store.serializers.KryoSerializer;
71 +import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
72 import org.onlab.packet.IpAddress; 72 import org.onlab.packet.IpAddress;
73 import org.onlab.packet.MacAddress; 73 import org.onlab.packet.MacAddress;
74 import org.onlab.packet.VlanId; 74 import org.onlab.packet.VlanId;
......
...@@ -55,8 +55,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage; ...@@ -55,8 +55,8 @@ import org.onlab.onos.store.cluster.messaging.ClusterMessage;
55 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler; 55 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
56 import org.onlab.onos.store.cluster.messaging.MessageSubject; 56 import org.onlab.onos.store.cluster.messaging.MessageSubject;
57 import org.onlab.onos.store.impl.Timestamped; 57 import org.onlab.onos.store.impl.Timestamped;
58 -import org.onlab.onos.store.serializers.DistributedStoreSerializers;
59 import org.onlab.onos.store.serializers.KryoSerializer; 58 import org.onlab.onos.store.serializers.KryoSerializer;
59 +import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
60 import org.onlab.util.KryoNamespace; 60 import org.onlab.util.KryoNamespace;
61 import org.slf4j.Logger; 61 import org.slf4j.Logger;
62 62
......
...@@ -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.onlab.onos.store.serializers; 16 +package org.onlab.onos.store.serializers.impl;
17 17
18 import org.onlab.onos.cluster.NodeId; 18 import org.onlab.onos.cluster.NodeId;
19 import org.onlab.onos.store.cluster.messaging.ClusterMessage; 19 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
......
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
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.onlab.onos.store.serializers; 16 +package org.onlab.onos.store.serializers.impl;
17 17
18 import org.onlab.onos.store.impl.MastershipBasedTimestamp; 18 import org.onlab.onos.store.impl.MastershipBasedTimestamp;
19 import org.onlab.onos.store.impl.Timestamped; 19 import org.onlab.onos.store.impl.Timestamped;
20 import org.onlab.onos.store.impl.WallClockTimestamp; 20 import org.onlab.onos.store.impl.WallClockTimestamp;
21 +import org.onlab.onos.store.serializers.KryoNamespaces;
21 import org.onlab.util.KryoNamespace; 22 import org.onlab.util.KryoNamespace;
22 23
23 public final class DistributedStoreSerializers { 24 public final class DistributedStoreSerializers {
......
...@@ -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.onlab.onos.store.serializers; 16 +package org.onlab.onos.store.serializers.impl;
17 17
18 import org.onlab.onos.store.impl.MastershipBasedTimestamp; 18 import org.onlab.onos.store.impl.MastershipBasedTimestamp;
19 19
......
...@@ -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.onlab.onos.store.serializers; 16 +package org.onlab.onos.store.serializers.impl;
17 17
18 import org.onlab.onos.store.cluster.messaging.MessageSubject; 18 import org.onlab.onos.store.cluster.messaging.MessageSubject;
19 19
......
...@@ -21,7 +21,7 @@ import java.nio.ByteBuffer; ...@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
21 21
22 import org.junit.Test; 22 import org.junit.Test;
23 import org.onlab.onos.store.Timestamp; 23 import org.onlab.onos.store.Timestamp;
24 -import org.onlab.onos.store.serializers.MastershipBasedTimestampSerializer; 24 +import org.onlab.onos.store.serializers.impl.MastershipBasedTimestampSerializer;
25 import org.onlab.util.KryoNamespace; 25 import org.onlab.util.KryoNamespace;
26 26
27 import com.google.common.testing.EqualsTester; 27 import com.google.common.testing.EqualsTester;
......