commit 8fa670a8f9dac034b7f14b3dcfb5a077e9909a45
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Jan 14 11:17:18 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 14 20:54:42 2016 +0000
tree 6cdd1c63ed350b2225a2702116cabcb624ff34df
parent ab541a5dbd8fef5ce6dd2417998111612794b641

Refactor: Rename ResourcePath to Resource for a better name

Also the followings
- Rename variables from path to resource
- Update Javadoc

Change-Id: I07da7e7d13882f2134a3687c66ed91a9de5b0849

cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
index 353ab3a..869868f 100644
--- a/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/AllocationsCommand.java
@@ -31,7 +31,7 @@
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.newresource.ResourceAllocation;
-import org.onosproject.net.newresource.ResourcePath;
+import org.onosproject.net.newresource.Resource;
 import org.onosproject.net.newresource.ResourceService;
 
 import com.google.common.base.Strings;
@@ -106,11 +106,11 @@
         // TODO: Current design cannot deal with sub-resources
         //        (e.g., TX/RX under Port)
 
-        ResourcePath path = ResourcePath.discrete(did, num);
+        Resource resource = Resource.discrete(did, num);
         if (lambda) {
             //print("Lambda resources:");
             Collection<ResourceAllocation> allocations
-                = resourceService.getResourceAllocations(path, OchSignal.class);
+                = resourceService.getResourceAllocations(resource, OchSignal.class);
 
             for (ResourceAllocation a : allocations) {
                 print("%s%s allocated by %s", Strings.repeat(" ", level + 1),

cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
index b70723e..6c74848 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ResourcesCommand.java
@@ -29,7 +29,7 @@
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
-import org.onosproject.net.newresource.ResourcePath;
+import org.onosproject.net.newresource.Resource;
 import org.onosproject.net.newresource.ResourceService;
 
 import com.google.common.base.Strings;
@@ -76,20 +76,20 @@
             DeviceId deviceId = deviceId(deviceIdStr);
             PortNumber portNumber = PortNumber.fromString(portNumberStr);
 
-            printResource(ResourcePath.discrete(deviceId, portNumber), 0);
+            printResource(Resource.discrete(deviceId, portNumber), 0);
         } else if (deviceIdStr != null) {
             DeviceId deviceId = deviceId(deviceIdStr);
 
-            printResource(ResourcePath.discrete(deviceId), 0);
+            printResource(Resource.discrete(deviceId), 0);
         } else {
-            printResource(ResourcePath.ROOT, 0);
+            printResource(Resource.ROOT, 0);
         }
     }
 
-    private void printResource(ResourcePath resource, int level) {
-        Collection<ResourcePath> children = resourceService.getAvailableResources(resource);
+    private void printResource(Resource resource, int level) {
+        Collection<Resource> children = resourceService.getAvailableResources(resource);
 
-        if (resource.equals(ResourcePath.ROOT)) {
+        if (resource.equals(Resource.ROOT)) {
             print("ROOT");
         } else {
             String resourceName = resource.last().getClass().getSimpleName();

cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java b/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
index 843361f..35d9a4c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
+++ b/cli/src/main/java/org/onosproject/cli/net/TestAllocateResource.java
@@ -15,7 +15,7 @@
  */
 package org.onosproject.cli.net;
 
-import static org.onosproject.net.newresource.ResourcePath.discrete;
+import static org.onosproject.net.newresource.Resource.discrete;
 
 import java.util.Optional;
 
@@ -31,7 +31,7 @@
 import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.newresource.ResourceAllocation;
 import org.onosproject.net.newresource.ResourceConsumer;
-import org.onosproject.net.newresource.ResourcePath;
+import org.onosproject.net.newresource.Resource;
 import org.onosproject.net.newresource.ResourceService;
 
 /**
@@ -73,7 +73,7 @@
 
         ResourceConsumer consumer = IntentId.valueOf(nIntendId);
 
-        ResourcePath resource = discrete(did, portNum,
+        Resource resource = discrete(did, portNum,
                                          createLambda(Integer.parseInt(lambda)));
 
         Optional<ResourceAllocation> allocate = resourceService.allocate(consumer, resource);