Committed by
Gerrit Code Review
Refactor Comparator class to break dependency of core/net on the CLI
Change-Id: I6f3165f399ab448eff5c5d2232f4b96f10ebf57e
Showing
20 changed files
with
23 additions
and
23 deletions
... | @@ -19,7 +19,7 @@ package org.onosproject.routing.cli; | ... | @@ -19,7 +19,7 @@ package org.onosproject.routing.cli; |
19 | import com.google.common.collect.Lists; | 19 | import com.google.common.collect.Lists; |
20 | import org.apache.karaf.shell.commands.Command; | 20 | import org.apache.karaf.shell.commands.Command; |
21 | import org.onosproject.cli.AbstractShellCommand; | 21 | import org.onosproject.cli.AbstractShellCommand; |
22 | -import org.onosproject.cli.Comparators; | 22 | +import org.onosproject.utils.Comparators; |
23 | import org.onosproject.core.ApplicationId; | 23 | import org.onosproject.core.ApplicationId; |
24 | import org.onosproject.core.CoreService; | 24 | import org.onosproject.core.CoreService; |
25 | import org.onosproject.net.config.NetworkConfigService; | 25 | import org.onosproject.net.config.NetworkConfigService; | ... | ... |
... | @@ -24,6 +24,7 @@ import org.onosproject.cluster.ClusterService; | ... | @@ -24,6 +24,7 @@ import org.onosproject.cluster.ClusterService; |
24 | import org.onosproject.cluster.ControllerNode; | 24 | import org.onosproject.cluster.ControllerNode; |
25 | import org.onosproject.mastership.MastershipService; | 25 | import org.onosproject.mastership.MastershipService; |
26 | import org.onosproject.net.DeviceId; | 26 | import org.onosproject.net.DeviceId; |
27 | +import org.onosproject.utils.Comparators; | ||
27 | 28 | ||
28 | import java.util.Collections; | 29 | import java.util.Collections; |
29 | import java.util.List; | 30 | import java.util.List; | ... | ... |
... | @@ -24,6 +24,7 @@ import org.joda.time.DateTime; | ... | @@ -24,6 +24,7 @@ import org.joda.time.DateTime; |
24 | import org.onlab.util.Tools; | 24 | import org.onlab.util.Tools; |
25 | import org.onosproject.cluster.ClusterService; | 25 | import org.onosproject.cluster.ClusterService; |
26 | import org.onosproject.cluster.ControllerNode; | 26 | import org.onosproject.cluster.ControllerNode; |
27 | +import org.onosproject.utils.Comparators; | ||
27 | 28 | ||
28 | import java.util.Collections; | 29 | import java.util.Collections; |
29 | import java.util.List; | 30 | import java.util.List; | ... | ... |
... | @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; | ... | @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
20 | import com.fasterxml.jackson.databind.node.ArrayNode; | 20 | import com.fasterxml.jackson.databind.node.ArrayNode; |
21 | import org.apache.karaf.shell.commands.Command; | 21 | import org.apache.karaf.shell.commands.Command; |
22 | import org.onosproject.cli.AbstractShellCommand; | 22 | import org.onosproject.cli.AbstractShellCommand; |
23 | -import org.onosproject.cli.Comparators; | 23 | +import org.onosproject.utils.Comparators; |
24 | import org.onosproject.core.ApplicationId; | 24 | import org.onosproject.core.ApplicationId; |
25 | import org.onosproject.core.CoreService; | 25 | import org.onosproject.core.CoreService; |
26 | 26 | ... | ... |
... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Command; | ... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Command; |
23 | import org.apache.karaf.shell.commands.Option; | 23 | import org.apache.karaf.shell.commands.Option; |
24 | import org.onosproject.app.ApplicationService; | 24 | import org.onosproject.app.ApplicationService; |
25 | import org.onosproject.cli.AbstractShellCommand; | 25 | import org.onosproject.cli.AbstractShellCommand; |
26 | -import org.onosproject.cli.Comparators; | 26 | +import org.onosproject.utils.Comparators; |
27 | import org.onosproject.core.Application; | 27 | import org.onosproject.core.Application; |
28 | 28 | ||
29 | import com.fasterxml.jackson.databind.JsonNode; | 29 | import com.fasterxml.jackson.databind.JsonNode; | ... | ... |
... | @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; | ... | @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
19 | import com.google.common.collect.Lists; | 19 | import com.google.common.collect.Lists; |
20 | import org.apache.karaf.shell.commands.Argument; | 20 | import org.apache.karaf.shell.commands.Argument; |
21 | import org.apache.karaf.shell.commands.Command; | 21 | import org.apache.karaf.shell.commands.Command; |
22 | -import org.onosproject.cli.Comparators; | 22 | +import org.onosproject.utils.Comparators; |
23 | import org.onosproject.net.DeviceId; | 23 | import org.onosproject.net.DeviceId; |
24 | import org.onosproject.net.topology.TopologyCluster; | 24 | import org.onosproject.net.topology.TopologyCluster; |
25 | 25 | ... | ... |
... | @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; | ... | @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; |
20 | import com.fasterxml.jackson.databind.node.ArrayNode; | 20 | import com.fasterxml.jackson.databind.node.ArrayNode; |
21 | import com.google.common.collect.Lists; | 21 | import com.google.common.collect.Lists; |
22 | import org.apache.karaf.shell.commands.Command; | 22 | import org.apache.karaf.shell.commands.Command; |
23 | -import org.onosproject.cli.Comparators; | 23 | +import org.onosproject.utils.Comparators; |
24 | import org.onosproject.net.topology.TopologyCluster; | 24 | import org.onosproject.net.topology.TopologyCluster; |
25 | 25 | ||
26 | import java.util.Collections; | 26 | import java.util.Collections; | ... | ... |
... | @@ -18,7 +18,7 @@ package org.onosproject.cli.net; | ... | @@ -18,7 +18,7 @@ package org.onosproject.cli.net; |
18 | 18 | ||
19 | import org.apache.karaf.shell.commands.Command; | 19 | import org.apache.karaf.shell.commands.Command; |
20 | import org.onosproject.cli.AbstractShellCommand; | 20 | import org.onosproject.cli.AbstractShellCommand; |
21 | -import org.onosproject.cli.Comparators; | 21 | +import org.onosproject.utils.Comparators; |
22 | import org.onosproject.net.key.DeviceKey; | 22 | import org.onosproject.net.key.DeviceKey; |
23 | import org.onosproject.net.key.DeviceKeyService; | 23 | import org.onosproject.net.key.DeviceKeyService; |
24 | 24 | ... | ... |
... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Argument; |
23 | import org.apache.karaf.shell.commands.Command; | 23 | import org.apache.karaf.shell.commands.Command; |
24 | import org.apache.karaf.shell.commands.Option; | 24 | import org.apache.karaf.shell.commands.Option; |
25 | import org.onlab.util.Frequency; | 25 | import org.onlab.util.Frequency; |
26 | -import org.onosproject.cli.Comparators; | 26 | +import org.onosproject.utils.Comparators; |
27 | import org.onosproject.net.Device; | 27 | import org.onosproject.net.Device; |
28 | import org.onosproject.net.OchPort; | 28 | import org.onosproject.net.OchPort; |
29 | import org.onosproject.net.OduCltPort; | 29 | import org.onosproject.net.OduCltPort; | ... | ... |
... | @@ -20,7 +20,7 @@ import java.util.List; | ... | @@ -20,7 +20,7 @@ import java.util.List; |
20 | 20 | ||
21 | import org.apache.karaf.shell.commands.Command; | 21 | import org.apache.karaf.shell.commands.Command; |
22 | import org.onosproject.cli.AbstractShellCommand; | 22 | import org.onosproject.cli.AbstractShellCommand; |
23 | -import org.onosproject.cli.Comparators; | 23 | +import org.onosproject.utils.Comparators; |
24 | import org.onosproject.net.Device; | 24 | import org.onosproject.net.Device; |
25 | import org.onosproject.net.device.DeviceService; | 25 | import org.onosproject.net.device.DeviceService; |
26 | 26 | ... | ... |
... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -23,7 +23,7 @@ import org.apache.karaf.shell.commands.Argument; |
23 | import org.apache.karaf.shell.commands.Command; | 23 | import org.apache.karaf.shell.commands.Command; |
24 | import org.apache.karaf.shell.commands.Option; | 24 | import org.apache.karaf.shell.commands.Option; |
25 | import org.onosproject.cli.AbstractShellCommand; | 25 | import org.onosproject.cli.AbstractShellCommand; |
26 | -import org.onosproject.cli.Comparators; | 26 | +import org.onosproject.utils.Comparators; |
27 | import org.onosproject.core.ApplicationId; | 27 | import org.onosproject.core.ApplicationId; |
28 | import org.onosproject.core.CoreService; | 28 | import org.onosproject.core.CoreService; |
29 | import org.onosproject.net.Device; | 29 | import org.onosproject.net.Device; | ... | ... |
... | @@ -25,7 +25,7 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -25,7 +25,7 @@ import org.apache.karaf.shell.commands.Argument; |
25 | import org.apache.karaf.shell.commands.Command; | 25 | import org.apache.karaf.shell.commands.Command; |
26 | import org.apache.karaf.shell.commands.Option; | 26 | import org.apache.karaf.shell.commands.Option; |
27 | import org.onosproject.cli.AbstractShellCommand; | 27 | import org.onosproject.cli.AbstractShellCommand; |
28 | -import org.onosproject.cli.Comparators; | 28 | +import org.onosproject.utils.Comparators; |
29 | import org.onosproject.net.Device; | 29 | import org.onosproject.net.Device; |
30 | import org.onosproject.net.DeviceId; | 30 | import org.onosproject.net.DeviceId; |
31 | import org.onosproject.net.device.DeviceService; | 31 | import org.onosproject.net.device.DeviceService; | ... | ... |
... | @@ -20,7 +20,7 @@ import java.util.List; | ... | @@ -20,7 +20,7 @@ import java.util.List; |
20 | 20 | ||
21 | import org.apache.karaf.shell.commands.Command; | 21 | import org.apache.karaf.shell.commands.Command; |
22 | import org.onosproject.cli.AbstractShellCommand; | 22 | import org.onosproject.cli.AbstractShellCommand; |
23 | -import org.onosproject.cli.Comparators; | 23 | +import org.onosproject.utils.Comparators; |
24 | import org.onosproject.net.Host; | 24 | import org.onosproject.net.Host; |
25 | import org.onosproject.net.host.HostService; | 25 | import org.onosproject.net.host.HostService; |
26 | 26 | ... | ... |
... | @@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command; | ... | @@ -20,7 +20,7 @@ import org.apache.karaf.shell.commands.Command; |
20 | import org.onlab.packet.MacAddress; | 20 | import org.onlab.packet.MacAddress; |
21 | import org.onlab.packet.VlanId; | 21 | import org.onlab.packet.VlanId; |
22 | import org.onosproject.cli.AbstractShellCommand; | 22 | import org.onosproject.cli.AbstractShellCommand; |
23 | -import org.onosproject.cli.Comparators; | 23 | +import org.onosproject.utils.Comparators; |
24 | import org.onosproject.incubator.net.intf.Interface; | 24 | import org.onosproject.incubator.net.intf.Interface; |
25 | import org.onosproject.incubator.net.intf.InterfaceService; | 25 | import org.onosproject.incubator.net.intf.InterfaceService; |
26 | 26 | ... | ... |
... | @@ -18,7 +18,7 @@ package org.onosproject.cli.net; | ... | @@ -18,7 +18,7 @@ package org.onosproject.cli.net; |
18 | import org.apache.karaf.shell.commands.Argument; | 18 | import org.apache.karaf.shell.commands.Argument; |
19 | import org.apache.karaf.shell.commands.Command; | 19 | import org.apache.karaf.shell.commands.Command; |
20 | import org.onosproject.cli.AbstractShellCommand; | 20 | import org.onosproject.cli.AbstractShellCommand; |
21 | -import org.onosproject.cli.Comparators; | 21 | +import org.onosproject.utils.Comparators; |
22 | import org.onosproject.net.region.Region; | 22 | import org.onosproject.net.region.Region; |
23 | import org.onosproject.net.region.RegionId; | 23 | import org.onosproject.net.region.RegionId; |
24 | import org.onosproject.net.region.RegionService; | 24 | import org.onosproject.net.region.RegionService; | ... | ... |
... | @@ -27,7 +27,7 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -27,7 +27,7 @@ import org.apache.karaf.shell.commands.Argument; |
27 | import org.apache.karaf.shell.commands.Command; | 27 | import org.apache.karaf.shell.commands.Command; |
28 | import org.apache.karaf.shell.commands.Option; | 28 | import org.apache.karaf.shell.commands.Option; |
29 | import org.onosproject.cli.AbstractShellCommand; | 29 | import org.onosproject.cli.AbstractShellCommand; |
30 | -import org.onosproject.cli.Comparators; | 30 | +import org.onosproject.utils.Comparators; |
31 | import org.onosproject.net.Device; | 31 | import org.onosproject.net.Device; |
32 | import org.onosproject.net.DeviceId; | 32 | import org.onosproject.net.DeviceId; |
33 | import org.onosproject.net.device.DeviceService; | 33 | import org.onosproject.net.device.DeviceService; | ... | ... |
... | @@ -40,6 +40,10 @@ | ... | @@ -40,6 +40,10 @@ |
40 | <groupId>org.onosproject</groupId> | 40 | <groupId>org.onosproject</groupId> |
41 | <artifactId>onos-api</artifactId> | 41 | <artifactId>onos-api</artifactId> |
42 | </dependency> | 42 | </dependency> |
43 | + <dependency> | ||
44 | + <groupId>org.onosproject</groupId> | ||
45 | + <artifactId>onos-incubator-api</artifactId> | ||
46 | + </dependency> | ||
43 | 47 | ||
44 | <dependency> | 48 | <dependency> |
45 | <groupId>org.onosproject</groupId> | 49 | <groupId>org.onosproject</groupId> | ... | ... |
1 | /* | 1 | /* |
2 | - * Copyright 2014-2015 Open Networking Laboratory | 2 | + * Copyright 2014-2016 Open Networking Laboratory |
3 | * | 3 | * |
4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
... | @@ -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.cli; | 16 | +package org.onosproject.utils; |
17 | 17 | ||
18 | import org.onosproject.cluster.ControllerNode; | 18 | import org.onosproject.cluster.ControllerNode; |
19 | import org.onosproject.core.Application; | 19 | import org.onosproject.core.Application; | ... | ... |
... | @@ -52,12 +52,6 @@ | ... | @@ -52,12 +52,6 @@ |
52 | 52 | ||
53 | <dependency> | 53 | <dependency> |
54 | <groupId>org.onosproject</groupId> | 54 | <groupId>org.onosproject</groupId> |
55 | - <version>${project.version}</version> | ||
56 | - <artifactId>onos-cli</artifactId> | ||
57 | - </dependency> | ||
58 | - | ||
59 | - <dependency> | ||
60 | - <groupId>org.onosproject</groupId> | ||
61 | <artifactId>onos-core-common</artifactId> | 55 | <artifactId>onos-core-common</artifactId> |
62 | <version>${project.version}</version> | 56 | <version>${project.version}</version> |
63 | <classifier>tests</classifier> | 57 | <classifier>tests</classifier> | ... | ... |
... | @@ -25,7 +25,7 @@ import org.apache.felix.scr.annotations.Deactivate; | ... | @@ -25,7 +25,7 @@ import org.apache.felix.scr.annotations.Deactivate; |
25 | import org.apache.felix.scr.annotations.Reference; | 25 | import org.apache.felix.scr.annotations.Reference; |
26 | import org.apache.felix.scr.annotations.ReferenceCardinality; | 26 | import org.apache.felix.scr.annotations.ReferenceCardinality; |
27 | import org.apache.felix.scr.annotations.Service; | 27 | import org.apache.felix.scr.annotations.Service; |
28 | -import org.onosproject.cli.Comparators; | 28 | +import org.onosproject.utils.Comparators; |
29 | import org.onosproject.net.ConnectPoint; | 29 | import org.onosproject.net.ConnectPoint; |
30 | import org.onosproject.net.Device; | 30 | import org.onosproject.net.Device; |
31 | import org.onosproject.net.Port; | 31 | import org.onosproject.net.Port; | ... | ... |
-
Please register or login to post a comment