commit 76b30f7881150b405bde0c3caafce605403ac0d3
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jan 11 14:08:35 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Jan 11 22:38:16 2016 +0000
tree e67e6895a616ba0eddb6e97856aed0a432b4f6a8
parent 61ab5e0f6f394665ab4ed7c8003de1ee3ebb6b3f

Rename ResourcePath.Key to ResourceId for naming consistency

Change-Id: Idb34624f897b0fd5745f26758a007c171f4cd774

core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java

diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index f20a1e5..de72fd2 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -172,6 +172,7 @@
 import org.onosproject.net.link.DefaultLinkDescription;
 import org.onosproject.net.meter.MeterId;
 import org.onosproject.net.newresource.ResourceAllocation;
+import org.onosproject.net.newresource.ResourceId;
 import org.onosproject.net.newresource.ResourcePath;
 import org.onosproject.net.packet.DefaultOutboundPacket;
 import org.onosproject.net.packet.DefaultPacketRequest;
@@ -430,7 +431,7 @@
                     ResourcePath.class,
                     ResourcePath.Discrete.class,
                     ResourcePath.Continuous.class,
-                    ResourcePath.Key.class,
+                    ResourceId.class,
                     ResourceAllocation.class,
                     // Constraints
                     LambdaConstraint.class,

core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java

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 0d88e9f..a318068 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
@@ -379,7 +379,7 @@
 
     @Test
     public void testResourceKey() {
-        testSerializedEquals(ResourcePath.discrete(DID1, P1).key());
+        testSerializedEquals(ResourcePath.discrete(DID1, P1).id());
     }
 
     @Test