commit caa2f7b9108884ec80c99b7feb5c8ffaba300a58
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri Feb 12 17:38:49 2016 -0800
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Wed Feb 17 20:31:04 2016 -0800
tree 199726cdf2a940de2c0d62cdfd46d1a889056506
parent e5930cc85f167877383d02e8a61d7c2bfd7e9512

Refactor Resoruce/ResourceId sub-types

isTypeOf() and isSubTypeOf() of Resource is delegated to ResourceId

Change-Id: Ief39f4967b8fb43ec0cb35dbd44bd2a7dde93680

core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java

diff --git a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java b/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java
index f5a9f46..3625ce0 100644
--- a/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java
+++ b/core/api/src/main/java/org/onosproject/net/newresource/ContinuousResource.java
@@ -57,8 +57,7 @@
     public boolean isTypeOf(Class<?> type) {
         checkNotNull(type);
 
-        String typeName = (String) id.components().get(id.components().size() - 1);
-        return typeName.equals(type.getCanonicalName());
+        return id.isTypeOf(type);
     }
 
     /**
@@ -74,13 +73,7 @@
     public boolean isSubTypeOf(Class<?> ancestor) {
         checkNotNull(ancestor);
 
-        String typeName = (String) id.components().get(id.components().size() - 1);
-        boolean foundInLeaf = typeName.equals(ancestor.getCanonicalName());
-        boolean foundInAncestor = id.components().subList(0, id.components().size()).stream()
-                .filter(x -> ancestor.isAssignableFrom(x.getClass()))
-                .findAny()
-                .isPresent();
-        return foundInAncestor || foundInLeaf;
+        return id.isSubTypeOf(ancestor);
     }
 
     /**