More bug fixes for controller initiations

hal-core/src/se/hal/EventControllerManager.java

@@ -25,8 +25,6 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
     private static final Logger logger = LogUtil.getLogger();
     private static EventControllerManager instance;
 
-    /** All available event plugins **/
-    private List<Class<? extends HalEventConfig>> availableEvents = new ArrayList<>();
     /** List of all registered events **/
     private List<Event> registeredEvents = Collections.synchronizedList(new ArrayList<>());
     /** List of auto detected events **/
@@ -66,7 +64,7 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
             logger.warning("Event config is null: " + event);
             return;
         }
-        if (!availableEvents.contains(event.getDeviceConfig().getClass())) {
+        if (!getAvailableDeviceConfigs().contains(event.getDeviceConfig().getClass())) {
             logger.warning("Event data plugin not available: " + event.getDeviceConfig().getClass());
             return;
         }
@@ -105,23 +103,6 @@ public class EventControllerManager extends HalAbstractControllerManager<HalEven
         }
     }
 
-    /**
-     * Registers a Event class type as usable by the manager
-     */
-    @Override
-    public void addAvailableDeviceConfig(Class<? extends HalEventConfig> eventClass) {
-        if (!availableEvents.contains(eventClass))
-            availableEvents.add(eventClass);
-    }
-
-    /**
-     * @return a List of all available Events that can be registered to this manager
-     */
-    @Override
-    public List<Class<? extends HalEventConfig>> getAvailableDeviceConfigs(){
-        return availableEvents;
-    }
-
     /**
      * @return a List of Sensor instances that have been registered to this manager
      */

hal-core/src/se/hal/SensorControllerManager.java

@@ -24,8 +24,6 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
     private static final Logger logger = LogUtil.getLogger();
     private static SensorControllerManager instance;
 
-    /** All available sensor plugins **/
-    private List<Class<? extends HalSensorConfig>> availableSensors = new ArrayList<>();
     /** List of all registered sensors **/
     private List<Sensor> registeredSensors = Collections.synchronizedList(new ArrayList<>());
     /** List of auto detected sensors **/
@@ -66,7 +64,7 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
             logger.warning("Sensor config is null: " + sensor);
             return;
         }
-        if (!availableSensors.contains(sensor.getDeviceConfig().getClass())) {
+        if (!getAvailableDeviceConfigs().contains(sensor.getDeviceConfig().getClass())) {
             logger.warning("Sensor data plugin not available: " + sensor.getDeviceConfig().getClass());
             return;
         }
@@ -106,23 +104,6 @@ public class SensorControllerManager extends HalAbstractControllerManager<HalAbs
         }
     }
 
-    /**
-     * Registers a Sensor class type as usable by the manager
-     */
-    @Override
-    public void addAvailableDeviceConfig(Class<? extends HalSensorConfig> sensorConfigClass) {
-        if (!availableSensors.contains(sensorConfigClass))
-            availableSensors.add(sensorConfigClass);
-    }
-
-    /**
-     * @return a List of all available Sensors that can be registered to this manager
-     */
-    @Override
-    public List<Class<? extends HalSensorConfig>> getAvailableDeviceConfigs(){
-        return availableSensors;
-    }
-
     /**
      * @return a List of Sensor instances that have been registered to this manager
      */

hal-core/src/se/hal/intf/HalAbstractControllerManager.java

@@ -4,10 +4,8 @@ import zutil.ClassUtil;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginManager;
 
-import java.util.Collection;
+import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Iterator;
-import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -22,7 +20,8 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
 
     /** A map of all instantiated controllers **/
     protected HashMap<Class, T> controllerMap = new HashMap<>();
-
+    /** All available sensor plugins **/
+    protected List<Class<? extends C>> availableDeviceConfigs = new ArrayList<>();
 
     /**
      * Will instantiate a generic ControllerManager.
@@ -30,19 +29,27 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
      * @param pluginManager     a PluginManager instance that will be used to find Controller plugins.
      */
     public void initialize(PluginManager pluginManager) {
-        Class[] genericClasses = ClassUtil.getGenericClasses(HalAbstractControllerManager.class);
+        Class[] genericClasses = ClassUtil.getGenericClasses(this.getClass());
 
-        if (genericClasses.length >= 1 && genericClasses[0] != null) {
+        if (genericClasses.length >= 3 && genericClasses[2] != null) {
-            for (Iterator<Class<C>> it = pluginManager.getClassIterator(genericClasses[0]); it.hasNext(); ) {
+            for (Iterator<Class<C>> it = pluginManager.getClassIterator(genericClasses[2]); it.hasNext(); ) {
                 addAvailableDeviceConfig(it.next());
             }
         } else {
-            logger.severe("Unable to retrieve Controller class from generics.");
+            logger.severe("Unable to retrieve Controller class from generics for class: " + this.getClass());
         }
 
-        for (Iterator<Class<? extends HalAutoScannableController>> it = pluginManager.getClassIterator(HalAutoScannableController.class); it.hasNext(); ){
+        for (Class<? extends C> deviceConfig : getAvailableDeviceConfigs()){
-            Class controller = it.next();
+            try {
-            getControllerInstance(controller); // Instantiate controller
+                @SuppressWarnings("unchecked")
+                Class<T> controllerClass = (Class<T>) deviceConfig.getDeclaredConstructor().newInstance().getDeviceControllerClass();
+
+                if (controllerClass.isAssignableFrom(HalAutoScannableController.class)) {
+                    getControllerInstance(controllerClass); // Instantiate controller
+                }
+            } catch (Exception e) {
+                logger.log(Level.WARNING, "Unable to instantiate Device Config for controller check: " + deviceConfig.getClass());
+            }
         }
     }
 
@@ -63,16 +70,6 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
      */
     public abstract void deregister(V device);
 
-    /**
-     * Registers a device configuration class type as usable by the manager
-     */
-    public abstract void addAvailableDeviceConfig(Class<? extends C> deviceConfigClass);
-
-    /**
-     * @return a List of all available devices that can be registered with this manager
-     */
-    public abstract List<Class<? extends C>> getAvailableDeviceConfigs();
-
     /**
      * @return a List of device instances that have been registered on this manager
      */
@@ -89,7 +86,26 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
     public abstract void clearDetectedDevices();
 
     // ----------------------------------------------------
-    //                   Common Logic
+    //               Common Device Logic
+    // ----------------------------------------------------
+
+    /**
+     * Registers a device configuration class type as usable by this manager
+     */
+    protected void addAvailableDeviceConfig(Class<? extends C> deviceConfigClass) {
+        if (!availableDeviceConfigs.contains(deviceConfigClass))
+            availableDeviceConfigs.add(deviceConfigClass);
+    }
+
+    /**
+     * @return a List of all available device configurations that can be registered with this manager
+     */
+    public List<Class<? extends C>> getAvailableDeviceConfigs() {
+        return availableDeviceConfigs;
+    }
+
+    // ----------------------------------------------------
+    //             Common Controller Logic
     // ----------------------------------------------------
 
     /**
@@ -115,7 +131,7 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
         } else {
             try {
                 // Instantiate controller
-                controller = clazz.newInstance();
+                controller = clazz.getDeclaredConstructor().newInstance();
 
                 if (controller instanceof HalAutoScannableController &&
                         ! ((HalAutoScannableController) controller).isAvailable()) {

plugins/hal-dummy/src/se/hal/plugin/dummy/DummyHumiditySensor.java

@@ -41,6 +41,6 @@ public class DummyHumiditySensor implements DummyDevice, HalSensorConfig {
 
     @Override
     public boolean equals(Object obj) {
-        return this.equals(obj);
+        return super.equals(obj);
     }
 }

plugins/hal-dummy/src/se/hal/plugin/dummy/DummyTemperatureSensor.java

@@ -41,6 +41,6 @@ public class DummyTemperatureSensor implements DummyDevice, HalSensorConfig {
 
     @Override
     public boolean equals(Object obj) {
-        return this.equals(obj);
+        return super.equals(obj);
     }
 }

plugins/hal-nvr/src/se/hal/plugin/nvr/CameraControllerManager.java

@@ -7,7 +7,9 @@ import se.hal.plugin.nvr.struct.Camera;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginManager;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -16,6 +18,8 @@ public class CameraControllerManager extends HalAbstractControllerManager<HalCam
     private static final Logger logger = LogUtil.getLogger();
     private static CameraControllerManager instance;
 
+    /** List of all registered cameras **/
+    private List<Camera> registeredCameras = Collections.synchronizedList(new ArrayList<>());
 
     @Override
     public void register(Camera device) {
@@ -27,25 +31,16 @@ public class CameraControllerManager extends HalAbstractControllerManager<HalCam
 
     }
 
-    @Override
-    public List<Class<? extends HalCameraConfig>> getAvailableDeviceConfigs() {
-        return null;
-    }
-
     @Override
     public List<Camera> getRegisteredDevices() {
-        return null;
+        return registeredCameras;
     }
 
     @Override
     public List<Camera> getDetectedDevices() {
-        return null;
+        return Collections.EMPTY_LIST;
     }
 
-    @Override
-    public void addAvailableDeviceConfig(Class deviceConfigClass) {
-
-    }
 
     @Override
     public void clearDetectedDevices() {