Refactor: Rename ResourcePath to Resource for a better name
Also the followings
- Rename variables from path to resource
- Update Javadoc
Change-Id: I07da7e7d13882f2134a3687c66ed91a9de5b0849
diff --git a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index 9ee9cd9..a986278 100644
--- a/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -62,7 +62,7 @@
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.FlowRuleBatchEntry;
import org.onosproject.net.intent.IntentId;
-import org.onosproject.net.newresource.ResourcePath;
+import org.onosproject.net.newresource.Resource;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.resource.link.BandwidthResource;
import org.onosproject.net.resource.link.BandwidthResourceAllocation;
@@ -374,19 +374,19 @@
}
@Test
- public void testResourcePath() {
- testSerializedEquals(ResourcePath.discrete(DID1, P1, VLAN1));
+ public void testResource() {
+ testSerializedEquals(Resource.discrete(DID1, P1, VLAN1));
}
@Test
public void testResourceKey() {
- testSerializedEquals(ResourcePath.discrete(DID1, P1).id());
+ testSerializedEquals(Resource.discrete(DID1, P1).id());
}
@Test
public void testResourceAllocation() {
testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation(
- ResourcePath.discrete(DID1, P1, VLAN1),
+ Resource.discrete(DID1, P1, VLAN1),
IntentId.valueOf(30)));
}