3 files changed, 9 insertions, 7 deletions
diff --git a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index 0312bafd..6f96498f 100644
--- a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -416,6 +416,8 @@ public final class KryoNamespaces {
                     BandwidthResourceAllocation.class,
                     LambdaResourceAllocation.class,
                     ResourcePath.class,
+                    ResourcePath.Discrete.class,
+                    ResourcePath.Continuous.class,
                     ResourceAllocation.class,
                     // Constraints
                     LambdaConstraint.class,
@@ -438,7 +440,7 @@ public final class KryoNamespaces {
                     DefaultTableStatisticsEntry.class
             )
             .register(new DefaultApplicationIdSerializer(), DefaultApplicationId.class)
-            .register(new URISerializer(), URI.class)
+            .register(new UriSerializer(), URI.class)
             .register(new NodeIdSerializer(), NodeId.class)
             .register(new ProviderIdSerializer(), ProviderId.class)
             .register(new DeviceIdSerializer(), DeviceId.class)
diff --git a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/URISerializer.java b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/UriSerializer.java
index 43969666..1d146a55 100644
--- a/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/URISerializer.java
+++ b/framework/src/onos/core/store/serializers/src/main/java/org/onosproject/store/serializers/UriSerializer.java
@@ -15,22 +15,22 @@
  */
 package org.onosproject.store.serializers;
 
-import java.net.URI;
-
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.Input;
 import com.esotericsoftware.kryo.io.Output;
 
+import java.net.URI;
+
 /**
  * Serializer for {@link URI}.
  */
-public class URISerializer extends Serializer<URI> {
+public class UriSerializer extends Serializer<URI> {
 
     /**
      * Creates {@link URI} serializer instance.
      */
-    public URISerializer() {
+    public UriSerializer() {
         super(false);
     }
 
diff --git a/framework/src/onos/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java b/framework/src/onos/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
index 97ccb836..11a62d4e 100644
--- a/framework/src/onos/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
+++ b/framework/src/onos/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
@@ -373,13 +373,13 @@ public class KryoSerializerTest {
 
     @Test
     public void testResourcePath() {
-        testSerializedEquals(new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1));
+        testSerializedEquals(ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1));
     }
 
     @Test
     public void testResourceAllocation() {
         testSerializedEquals(new org.onosproject.net.newresource.ResourceAllocation(
-                new ResourcePath(LinkKey.linkKey(CP1, CP2), VLAN1),
+                ResourcePath.discrete(LinkKey.linkKey(CP1, CP2), VLAN1),
                 IntentId.valueOf(30)));
     }