commit e7ea688a60bc4c1965f98b60662aaf52af888295
author Thomas Vachuska <tom@onlab.us> Fri Jul 22 10:22:46 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 22 22:24:16 2016 +0000
tree b9398ac8cfee5ac0a014152fd9a5c89d7d189017
parent 126b8afeeb39fc3023c0b09d2961556031dad5b9

Allowing driver loaders to refer to classes loaded by others.

Change-Id: Ife4e50758620d4c052a7bb81740d9b9305647317

core/api/src/main/java/org/onosproject/net/driver/XmlDriverLoader.java

diff --git a/core/api/src/main/java/org/onosproject/net/driver/XmlDriverLoader.java b/core/api/src/main/java/org/onosproject/net/driver/XmlDriverLoader.java
index e63e710..30d1875 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/XmlDriverLoader.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/XmlDriverLoader.java
@@ -64,6 +64,7 @@
     private static final String IMPL = "[@impl]";
 
     private final ClassLoader classLoader;
+    private final BehaviourClassResolver resolver;
 
     private Map<String, Driver> drivers = Maps.newHashMap();
 
@@ -72,9 +73,23 @@
      * class loader.
      *
      * @param classLoader class loader to use
+     * @deprecated since 1.7.0 (Hummingbird)
      */
+    @Deprecated
     public XmlDriverLoader(ClassLoader classLoader) {
+        this(classLoader, null);
+    }
+
+    /**
+     * Creates a new driver loader capable of loading drivers from the supplied
+     * class loader.
+     *
+     * @param classLoader class loader to use
+     * @param resolver    behaviour class resolver
+     */
+    public XmlDriverLoader(ClassLoader classLoader, BehaviourClassResolver resolver) {
         this.classLoader = classLoader;
+        this.resolver = resolver;
     }
 
     /**
@@ -182,7 +197,13 @@
         try {
             return (Class<? extends Behaviour>) classLoader.loadClass(className);
         } catch (ClassNotFoundException e) {
-            throw new IllegalArgumentException("Unable to load class " + className, e);
+            if (resolver != null) {
+                Class<? extends Behaviour> cls = resolver.getBehaviourClass(className);
+                if (cls != null) {
+                    return cls;
+                }
+            }
+            throw new IllegalArgumentException("Unable to resolve class " + className, e);
         }
     }