commit f33b8930037e1b70ade1eb303c9705e0d2dcddd8
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jan 25 18:43:32 2016 -0800
committer Sho Shimizu <sho.shimizu@gmail.com> Tue Jan 26 18:59:11 2016 +0000
tree 92813154ea8ac698beba25d5a39d8b01487ef327
parent 2d31022034ced11d6e4d67fe30037f772878b9bb

Move inner classes to upper level

Rename as follows.
- ResourceId.Discrete -> DiscreteResourceId
- ResourceId.Continuous -> ContinuousResourceId
- Resource.Discrete -> DiscreteResource
- Resource.Continuous -> ContinuousResource

Change-Id: I80e59d1eec07128743bacc582a8725bd4d5489b4

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 592350f..21f78c9 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,10 @@
 import org.onosproject.net.intent.constraint.WaypointConstraint;
 import org.onosproject.net.link.DefaultLinkDescription;
 import org.onosproject.net.meter.MeterId;
+import org.onosproject.net.newresource.ContinuousResource;
+import org.onosproject.net.newresource.ContinuousResourceId;
+import org.onosproject.net.newresource.DiscreteResource;
+import org.onosproject.net.newresource.DiscreteResourceId;
 import org.onosproject.net.newresource.ResourceAllocation;
 import org.onosproject.net.newresource.ResourceId;
 import org.onosproject.net.newresource.Resource;
@@ -434,11 +438,11 @@
                     BandwidthResourceAllocation.class,
                     LambdaResourceAllocation.class,
                     Resource.class,
-                    Resource.Discrete.class,
-                    Resource.Continuous.class,
+                    DiscreteResource.class,
+                    ContinuousResource.class,
                     ResourceId.class,
-                    ResourceId.Discrete.class,
-                    ResourceId.Continuous.class,
+                    DiscreteResourceId.class,
+                    ContinuousResourceId.class,
                     ResourceAllocation.class,
                     // Constraints
                     LambdaConstraint.class,