commit 43de6ee30331898c09ce93bf9bea49a3d5cdcbab
author Thomas Vachuska <tom@onlab.us> Wed Mar 15 15:45:23 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Thu Mar 16 16:02:37 2017 +0000
tree 0589f47b8e9b833f0dd6a0a7e6c477d4bc6c3b16
parent 4effa06b8e35453e004562ad35d7c8bad80a8c35

Refactoring abstract driver loader to assure that default drivers get loaded first by default.

Change-Id: I2fd213d8f49b6390ec8f005795bb95661aaee793

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

diff --git a/core/api/src/main/java/org/onosproject/net/driver/AbstractDriverLoader.java b/core/api/src/main/java/org/onosproject/net/driver/AbstractDriverLoader.java
index e68eb99..7899d0c 100644
--- a/core/api/src/main/java/org/onosproject/net/driver/AbstractDriverLoader.java
+++ b/core/api/src/main/java/org/onosproject/net/driver/AbstractDriverLoader.java
@@ -15,27 +15,19 @@
  */
 package org.onosproject.net.driver;
 
-import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * Abstract boot-strapper for loading and registering driver definitions.
+ * Abstract bootstrapper for loading and registering driver definitions that
+ * are dependent on the default driver definitions.
  */
 @Component
-public abstract class AbstractDriverLoader {
-
-    private final Logger log = LoggerFactory.getLogger(getClass());
-
-    private DriverProvider provider;
-    private final String path;
+public abstract class AbstractDriverLoader extends AbstractIndependentDriverLoader {
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DriverAdminService driverAdminService;
+    protected DefaultDriverProviderService defaultDriverProviderService;
 
     /**
      * Creates a new loader for resource with the specified path.
@@ -43,25 +35,7 @@
      * @param path drivers definition XML resource path
      */
     protected AbstractDriverLoader(String path) {
-        this.path = path;
-    }
-
-    @Activate
-    protected void activate() {
-        try {
-            provider = new XmlDriverLoader(getClass().getClassLoader(), driverAdminService)
-                    .loadDrivers(getClass().getResourceAsStream(path), driverAdminService);
-            driverAdminService.registerProvider(provider);
-        } catch (Exception e) {
-            log.error("Unable to load {} driver definitions", path, e);
-        }
-        log.info("Started");
-    }
-
-    @Deactivate
-    protected void deactivate() {
-        driverAdminService.unregisterProvider(provider);
-        log.info("Stopped");
+        super(path);
     }
 
 }