Updated with new Configurator changes and cleaned up imports

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

@@ -6,13 +6,13 @@ import se.hal.util.HalDeviceUtil;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginManager;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.PostConfigurationActionListener;
-import zutil.ui.Configurator.PreConfigurationActionListener;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

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

@@ -11,8 +11,13 @@ import zutil.log.LogUtil;
 
 import java.io.File;
 import java.io.FileReader;
-import java.sql.*;
+import java.sql.PreparedStatement;
-import java.util.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 import java.util.logging.Logger;
 
 

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

@@ -1,8 +1,11 @@
 package se.hal;
 
 
-import se.hal.intf.*;
+import se.hal.intf.HalAbstractControllerManager;
-import se.hal.page.*;
+import se.hal.intf.HalDaemon;
+import se.hal.intf.HalJsonPage;
+import se.hal.intf.HalWebPage;
+import se.hal.page.HalAlertManager;
 import se.hal.struct.PluginConfig;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
@@ -14,7 +17,9 @@ import zutil.plugin.PluginData;
 import zutil.plugin.PluginManager;
 
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.logging.Level;

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

@@ -6,13 +6,12 @@ import se.hal.util.HalDeviceUtil;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginManager;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.PostConfigurationActionListener;
-import zutil.ui.Configurator.PreConfigurationActionListener;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

hal-core/src/se/hal/action/SendEventAction.java

@@ -5,9 +5,10 @@ import se.hal.HalContext;
 import se.hal.intf.HalAction;
 import se.hal.intf.HalEventData;
 import se.hal.struct.Event;
+import se.hal.util.ConfigEventValueProvider;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -18,8 +19,8 @@ import java.util.logging.Logger;
 public class SendEventAction implements HalAction {
     private static final Logger logger = LogUtil.getLogger();
 
-    @Configurator.Configurable("Event Device ID")
+    @Configurator.Configurable(value = "Event Device", valueProvider = ConfigEventValueProvider.class)
-    private int eventId;
+    private Event event;
     @Configurator.Configurable("Data to Send")
     private double data;
 
@@ -28,7 +29,6 @@ public class SendEventAction implements HalAction {
     public void execute() {
         try {
             DBConnection db = HalContext.getDB();
-            Event event = Event.getEvent(db, eventId);
             if (event != null) {
                 HalEventData dataObj = (HalEventData) event.getDeviceConfig().getDeviceDataClass().newInstance();
                 dataObj.setData(data);
@@ -37,7 +37,7 @@ public class SendEventAction implements HalAction {
                 EventControllerManager.getInstance().send(event);
             }
             else
-                logger.warning("Unable to find event with id: "+ eventId);
+                logger.warning("Unable to find event with id: "+ event.getId());
         } catch (Exception e) {
             logger.log(Level.SEVERE, null, e);
         }
@@ -45,10 +45,7 @@ public class SendEventAction implements HalAction {
 
 
     public String toString(){
-        DBConnection db = HalContext.getDB();
+        return "Send event: " + event.getId() +
-        Event event = null;
-        try{ event = Event.getEvent(db, eventId); } catch (Exception e){} //ignore exception
-        return "Send event: "+ eventId +
                 " (" + (event!=null ? event.getName() : null) + ")" +
                 " with data: " + data;
     }

hal-core/src/se/hal/daemon/SensorDataAggregatorDaemon.java

@@ -12,7 +12,8 @@ import zutil.db.SQLResultHandler;
 import zutil.db.handler.SimpleSQLResult;
 import zutil.log.LogUtil;
 import zutil.ui.UserMessageManager;
-import zutil.ui.UserMessageManager.*;
+import zutil.ui.UserMessageManager.MessageTTL;
+import zutil.ui.UserMessageManager.UserMessage;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

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

@@ -4,7 +4,10 @@ import zutil.ClassUtil;
 import zutil.log.LogUtil;
 import zutil.plugin.PluginManager;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

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

@@ -8,7 +8,7 @@ import zutil.db.bean.DBBean;
 import zutil.log.LogUtil;
 import zutil.parser.json.JSONParser;
 import zutil.parser.json.JSONWriter;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 import java.sql.SQLException;
 import java.util.LinkedList;

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

@@ -9,7 +9,6 @@ import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.parser.Templator;
-import zutil.parser.json.JSONWriter;
 import zutil.ui.Navigation;
 
 import java.io.IOException;

hal-core/src/se/hal/page/EventConfigWebPage.java

@@ -11,7 +11,9 @@ import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 import zutil.parser.Templator;
-import zutil.ui.UserMessageManager.*;
+import zutil.ui.UserMessageManager.MessageLevel;
+import zutil.ui.UserMessageManager.MessageTTL;
+import zutil.ui.UserMessageManager.UserMessage;
 
 import java.util.ArrayList;
 import java.util.Map;

hal-core/src/se/hal/page/HalAlertManager.java

@@ -11,7 +11,8 @@ import zutil.ui.UserMessageManager;
 import zutil.ui.UserMessageManager.UserMessage;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

hal-core/src/se/hal/page/MapJsonPage.java

@@ -1,8 +1,8 @@
 package se.hal.page;
 
 import se.hal.HalContext;
-import se.hal.intf.HalJsonPage;
 import se.hal.intf.HalAbstractDevice;
+import se.hal.intf.HalJsonPage;
 import se.hal.struct.Event;
 import se.hal.struct.Sensor;
 import zutil.db.DBConnection;

hal-core/src/se/hal/page/PropertyConfigWebPage.java

@@ -2,11 +2,10 @@ package se.hal.page;
 
 import se.hal.HalContext;
 import se.hal.intf.HalWebPage;
-import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 
-import java.util.*;
+import java.util.Map;
 
 public class PropertyConfigWebPage extends HalWebPage {
     private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/property_config.tmpl";

hal-core/src/se/hal/page/SensorJsonPage.java

@@ -9,8 +9,6 @@ import se.hal.util.UTCTimeUtility;
 import zutil.ArrayUtil;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
-import zutil.net.http.HttpHeader;
-import zutil.net.http.HttpPrintStream;
 import zutil.parser.DataNode;
 
 import java.util.ArrayList;

hal-core/src/se/hal/page/SensorOverviewWebPage.java

@@ -12,7 +12,6 @@ import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
 
 import java.sql.PreparedStatement;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

hal-core/src/se/hal/page/TriggerWebPage.java

@@ -12,7 +12,6 @@ import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 import zutil.parser.Templator;
-import zutil.ui.UserMessageManager;
 
 import java.util.ArrayList;
 import java.util.Map;

hal-core/src/se/hal/page/UserConfigWebPage.java

@@ -7,7 +7,6 @@ import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 import zutil.parser.Templator;
-import zutil.ui.UserMessageManager;
 
 import java.util.Map;
 import java.util.logging.Logger;

hal-core/src/se/hal/struct/Action.java

@@ -1,16 +1,11 @@
 package se.hal.struct;
 
 import se.hal.intf.HalAction;
-import se.hal.intf.HalTrigger;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanObjectDSO;
-import zutil.db.bean.DBBeanSQLResultHandler;
 
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Defines a action that will be executed

hal-core/src/se/hal/struct/ClassConfigurationData.java

@@ -1,7 +1,7 @@
 package se.hal.struct;
 
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
-import zutil.ui.Configurator.ConfigurationParam;
+import zutil.ui.conf.Configurator.ConfigurationParam;
 
 /**
  * A Data class used by the dynamic class configuration pages

hal-core/src/se/hal/struct/Event.java

@@ -1,6 +1,9 @@
 package se.hal.struct;
 
-import se.hal.intf.*;
+import se.hal.intf.HalAbstractDevice;
+import se.hal.intf.HalEventConfig;
+import se.hal.intf.HalEventController;
+import se.hal.intf.HalEventData;
 import se.hal.util.DeviceDataSqlResult;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;

hal-core/src/se/hal/struct/Trigger.java

@@ -4,12 +4,8 @@ import se.hal.intf.HalTrigger;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 import zutil.db.bean.DBBeanObjectDSO;
-import zutil.db.bean.DBBeanSQLResultHandler;
 
-import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * A class that declares a trigger/condition that

hal-core/src/se/hal/trigger/DateTimeTrigger.java

@@ -2,11 +2,11 @@ package se.hal.trigger;
 
 import se.hal.intf.HalTrigger;
 import zutil.CronTimer;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
-import zutil.ui.Configurator.PreConfigurationActionListener;
 
 import java.text.SimpleDateFormat;
 
+
 public class DateTimeTrigger implements HalTrigger,Configurator.PostConfigurationActionListener {
 
     @Configurator.Configurable("Minute (Cron format)")

hal-core/src/se/hal/trigger/DeviceTrigger.java

@@ -1,14 +1,10 @@
 package se.hal.trigger;
 
 import se.hal.TriggerManager;
-import se.hal.intf.HalDeviceConfig;
+import se.hal.intf.*;
-import se.hal.intf.HalDeviceData;
+import zutil.ui.conf.Configurator;
-import se.hal.intf.HalDeviceReportListener;
+import zutil.ui.conf.Configurator.PostConfigurationActionListener;
-import se.hal.intf.HalTrigger;
+import zutil.ui.conf.Configurator.PreConfigurationActionListener;
-import se.hal.intf.HalAbstractDevice;
-import zutil.ui.Configurator;
-import zutil.ui.Configurator.PostConfigurationActionListener;
-import zutil.ui.Configurator.PreConfigurationActionListener;
 
 /**
  * An abstract class that implements generic device data logic
@@ -18,8 +14,6 @@ public abstract class DeviceTrigger implements HalTrigger,
         PostConfigurationActionListener,
         HalDeviceReportListener<HalDeviceConfig,HalDeviceData> {
 
-    @Configurator.Configurable("Device ID")
-    protected int deviceId = -1;
     @Configurator.Configurable("Trigger only on change")
     protected boolean triggerOnChange = true;
     @Configurator.Configurable("Data to compare to")
@@ -31,14 +25,14 @@ public abstract class DeviceTrigger implements HalTrigger,
 
     @Override
     public void preConfigurationAction(Configurator configurator, Object obj) {
-        HalAbstractDevice device = getDevice(deviceId);
+        HalAbstractDevice device = getDevice();
         if (device != null)
             device.removeReportListener(this);
         reset();
     }
     @Override
     public void postConfigurationAction(Configurator configurator, Object obj) {
-        HalAbstractDevice device = getDevice(deviceId);
+        HalAbstractDevice device = getDevice();
         if (device != null)
             device.addReportListener(this);
     }
@@ -67,5 +61,5 @@ public abstract class DeviceTrigger implements HalTrigger,
 
 
 
-    protected abstract HalAbstractDevice getDevice(long id);
+    protected abstract HalAbstractDevice getDevice();
 }

hal-core/src/se/hal/trigger/EventTrigger.java

@@ -1,30 +1,29 @@
 package se.hal.trigger;
 
-import se.hal.HalContext;
 import se.hal.struct.Event;
+import se.hal.util.ConfigEventValueProvider;
 import zutil.log.LogUtil;
+import zutil.ui.conf.Configurator;
 
-import java.sql.SQLException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class EventTrigger extends DeviceTrigger{
     private static final Logger logger = LogUtil.getLogger();
 
+    @Configurator.Configurable(value = "Event", valueProvider = ConfigEventValueProvider.class)
+    protected Event device;
+
+
     @Override
-    protected Event getDevice(long id) {
+    protected Event getDevice() {
-        try {
+        return device;
-            if (id >= 0)
-                return Event.getEvent(HalContext.getDB(), id);
-        } catch (SQLException e){ logger.log(Level.SEVERE, null, e);}
-        return null;
     }
 
     @Override
     public String toString(){
-        Event event = getDevice(deviceId);
+        Event event = getDevice();
         return "Trigger " + (triggerOnChange ? "on" : "when") +
-                " event: "+ deviceId +" ("+(event != null ? event.getName() : null) + ")" +
+                " event: " + device.getId() + " (" + (event != null ? event.getName() : null) + ")" +
                 " == " + expectedData;
     }
 

hal-core/src/se/hal/trigger/SensorTrigger.java

@@ -1,31 +1,29 @@
 package se.hal.trigger;
 
-import se.hal.HalContext;
-import se.hal.struct.Event;
 import se.hal.struct.Sensor;
+import se.hal.util.ConfigSensorValueProvider;
 import zutil.log.LogUtil;
+import zutil.ui.conf.Configurator;
 
-import java.sql.SQLException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class SensorTrigger extends DeviceTrigger {
     private static final Logger logger = LogUtil.getLogger();
 
+    @Configurator.Configurable(value = "Sensor", valueProvider = ConfigSensorValueProvider.class)
+    protected Sensor device;
+
+
     @Override
-    protected Sensor getDevice(long id) {
+    protected Sensor getDevice() {
-        try {
+        return device;
-            if (id >= 0)
-                return Sensor.getSensor(HalContext.getDB(), id);
-        } catch (SQLException e){ logger.log(Level.SEVERE, null, e);}
-        return null;
     }
 
     @Override
     public String toString(){
-        Sensor sensor = getDevice(deviceId);
+        Sensor sensor = getDevice();
         return "Trigger " + (triggerOnChange ? "on" : "when") +
-                " sensor: "+ deviceId +" ("+(sensor != null ? sensor.getName() : null) + ")" +
+                " sensor: " + sensor.getId() +" (" + (sensor != null ? sensor.getName() : null) + ")" +
                 " == " + expectedData;
     }
 

hal-core/src/se/hal/trigger/TimerTrigger.java

@@ -2,7 +2,7 @@ package se.hal.trigger;
 
 import se.hal.intf.HalTrigger;
 import zutil.Timer;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 public class TimerTrigger implements HalTrigger {
 

hal-core/src/se/hal/util/ConfigEventValueProvider.java

@@ -0,0 +1,55 @@
+package se.hal.util;
+
+import se.hal.HalContext;
+import se.hal.struct.Event;
+import zutil.db.DBConnection;
+import zutil.ui.conf.Configurator;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A value provider that will give all Enum values
+ */
+public class ConfigEventValueProvider implements Configurator.ConfigValueProvider<Event> {
+    private Event currentValue;
+    private Map<String, Event> events = new HashMap<>();
+
+
+    public ConfigEventValueProvider(Class<Enum> fieldType, Object fieldValue) {
+        this.currentValue = (Event) fieldValue;
+
+        try {
+            DBConnection db = HalContext.getDB();
+
+            for (Event event : Event.getLocalEvents(db)) {
+                events.put(getValue(event), event);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Unable to collect Event objects.", e);
+        }
+    }
+
+
+    private String getValue(Event event) {
+        return event.getName() + " (id: " + event.getId() + ")";
+    }
+
+    @Override
+    public String getCurrentValue() {
+        return getValue(currentValue);
+    }
+
+    @Override
+    public List<String> getPossibleValues() {
+        return new ArrayList<String>(events.keySet());
+    }
+
+    @Override
+    public Event getObject(String value) {
+        return events.get(value);
+    }
+}

hal-core/src/se/hal/util/ConfigSensorValueProvider.java

@@ -0,0 +1,55 @@
+package se.hal.util;
+
+import se.hal.HalContext;
+import se.hal.struct.Sensor;
+import zutil.db.DBConnection;
+import zutil.ui.conf.Configurator;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A value provider that will give all Enum values
+ */
+public class ConfigSensorValueProvider implements Configurator.ConfigValueProvider<Sensor> {
+    private Sensor currentValue;
+    private Map<String, Sensor> sensors = new HashMap<>();
+
+
+    public ConfigSensorValueProvider(Class<Enum> fieldType, Object fieldValue) {
+        this.currentValue = (Sensor) fieldValue;
+
+        try {
+            DBConnection db = HalContext.getDB();
+
+            for (Sensor sensor : Sensor.getLocalSensors(db)) {
+                sensors.put(getValue(sensor), sensor);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Unable to collect Event objects.", e);
+        }
+    }
+
+
+    private String getValue(Sensor sensor) {
+        return sensor.getName() + " (id: " + sensor.getId() + ")";
+    }
+
+    @Override
+    public String getCurrentValue() {
+        return getValue(currentValue);
+    }
+
+    @Override
+    public List<String> getPossibleValues() {
+        return new ArrayList<String>(sensors.keySet());
+    }
+
+    @Override
+    public Sensor getObject(String value) {
+        return sensors.get(value);
+    }
+}

hal-core/src/se/hal/util/DeviceDataSqlResult.java

@@ -1,7 +1,6 @@
 package se.hal.util;
 
 import se.hal.intf.HalDeviceData;
-import zutil.ClassUtil;
 import zutil.db.SQLResultHandler;
 
 import java.sql.ResultSet;

hal-core/src/se/hal/util/HalDeviceChangeListener.java

@@ -4,7 +4,7 @@ import se.hal.HalServer;
 import se.hal.intf.HalAbstractControllerManager;
 import se.hal.intf.HalAbstractDevice;
 import se.hal.intf.HalDeviceConfig;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 import java.util.ArrayList;
 import java.util.HashMap;

hal-core/test/se/hal/SensorControllerManagerTest.java

@@ -8,7 +8,8 @@ import se.hal.struct.devicedata.TemperatureSensorData;
 
 import java.util.Collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 
 public class SensorControllerManagerTest {

hal-core/test/se/hal/TriggerManagerTest.java

@@ -9,7 +9,8 @@ import se.hal.struct.TriggerFlow;
 
 import java.util.Collections;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  *

hal-core/test/se/hal/daemon/SensorDataAggregationDaemonTest.java

@@ -1,16 +1,15 @@
 package se.hal.daemon;
 
-import java.sql.PreparedStatement;
-
 import org.junit.Before;
 import org.junit.Test;
-
 import se.hal.HalContext;
 import se.hal.util.UTCTimeUtility;
 import zutil.db.DBConnection;
 import zutil.db.DBUpgradeHandler;
 import zutil.log.LogUtil;
 
+import java.sql.PreparedStatement;
+
 public class SensorDataAggregationDaemonTest {
     private static final String DEFAULT_DB_FILE = "resource/resource/hal-default.db";
 

hal-core/test/se/hal/test/TestDeviceConfig.java

@@ -1,6 +1,9 @@
 package se.hal.test;
 
-import se.hal.intf.*;
+import se.hal.intf.HalEventConfig;
+import se.hal.intf.HalSensorConfig;
+import se.hal.intf.HalSensorController;
+import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.TemperatureSensorData;
 
 /**

hal-core/test/se/hal/util/TimePeriodTest.java

@@ -4,7 +4,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-
 import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength;
 
 import java.util.Arrays;

hal-core/test/se/hal/util/TimeUtilityTest.java

@@ -4,7 +4,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-
 import se.hal.daemon.SensorDataAggregatorDaemon.AggregationPeriodLength;
 
 import java.util.Arrays;

plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java

@@ -16,11 +16,6 @@
 
 package se.hal.plugin.assistant.google;
 
-import java.sql.SQLException;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import com.google.actions.api.smarthome.*;
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.GoogleCredentials;
@@ -38,6 +33,11 @@ import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.net.http.page.oauth.OAuth2Registry.TokenRegistrationListener;
 
+import java.sql.SQLException;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 
 public class SmartHomeImpl extends SmartHomeApp implements TokenRegistrationListener {
     private static final Logger logger = LogUtil.getLogger();

plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomePage.java

@@ -24,21 +24,17 @@
 
 package se.hal.plugin.assistant.google;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.google.actions.api.smarthome.SmartHomeApp;
-import se.hal.plugin.assistant.google.SmartHomeImpl;
 import zutil.io.IOUtil;
 import zutil.log.LogUtil;
 import zutil.net.http.HttpHeader;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 
+import java.io.IOException;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Handles Google SMartHome request received via HTTP POST.
  */

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

@@ -7,7 +7,8 @@ import se.hal.intf.*;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 
 public class DummyController implements HalSensorController, HalEventController, Runnable, HalDaemon {

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

@@ -1,6 +1,9 @@
 package se.hal.plugin.dummy;
 
-import se.hal.intf.*;
+import se.hal.intf.HalDeviceData;
+import se.hal.intf.HalSensorConfig;
+import se.hal.intf.HalSensorController;
+import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.HumiditySensorData;
 
 

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

@@ -1,6 +1,9 @@
 package se.hal.plugin.dummy;
 
-import se.hal.intf.*;
+import se.hal.intf.HalDeviceData;
+import se.hal.intf.HalEventConfig;
+import se.hal.intf.HalEventController;
+import se.hal.intf.HalEventData;
 import se.hal.struct.devicedata.OnOffEventData;
 
 public class DummySwitchEvent implements DummyDevice, HalEventConfig {

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

@@ -1,6 +1,9 @@
 package se.hal.plugin.dummy;
 
-import se.hal.intf.*;
+import se.hal.intf.HalDeviceData;
+import se.hal.intf.HalSensorConfig;
+import se.hal.intf.HalSensorController;
+import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.TemperatureSensorData;
 
 

plugins/hal-mqtt/src/se/hal/plugin/mqtt/device/HalMqttDeviceConfig.java

@@ -48,7 +48,6 @@
 
 package se.hal.plugin.mqtt.device;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventController;
 import se.hal.intf.HalEventData;

plugins/hal-netscan/src/se/hal/plugin/netscan/NetworkDevice.java

@@ -1,11 +1,10 @@
 package se.hal.plugin.netscan;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventController;
 import se.hal.intf.HalEventData;
 import se.hal.struct.devicedata.OnOffEventData;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 public class NetworkDevice implements HalEventConfig {
 

plugins/hal-nutups/src/se/hal/plugin/nutups/NutUpsController.java

@@ -49,7 +49,10 @@
 package se.hal.plugin.nutups;
 
 import se.hal.HalContext;
-import se.hal.intf.*;
+import se.hal.intf.HalAutoScannableController;
+import se.hal.intf.HalDeviceConfig;
+import se.hal.intf.HalDeviceReportListener;
+import se.hal.intf.HalSensorController;
 import zutil.log.LogUtil;
 import zutil.osal.linux.app.NutUPSClient;
 

plugins/hal-nutups/src/se/hal/plugin/nutups/NutUpsDevice.java

@@ -48,13 +48,12 @@
 
 package se.hal.plugin.nutups;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.PowerConsumptionSensorData;
 import zutil.osal.linux.app.NutUPSClient;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 public class NutUpsDevice implements HalSensorConfig{
 

plugins/hal-nvr/src/se/hal/plugin/nvr/rtsp/RTSPCameraConfig.java

@@ -24,10 +24,9 @@
 
 package se.hal.plugin.nvr.rtsp;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalDeviceData;
-import se.hal.plugin.nvr.intf.HalCameraController;
 import se.hal.plugin.nvr.intf.HalCameraConfig;
+import se.hal.plugin.nvr.intf.HalCameraController;
 
 public class RTSPCameraConfig implements HalCameraConfig {
 

plugins/hal-nvr/src/se/hal/plugin/nvr/struct/Camera.java

@@ -25,9 +25,9 @@
 package se.hal.plugin.nvr.struct;
 
 import se.hal.intf.HalAbstractController;
+import se.hal.intf.HalAbstractDevice;
 import se.hal.plugin.nvr.intf.HalCameraConfig;
 import se.hal.plugin.nvr.intf.HalCameraData;
-import se.hal.intf.HalAbstractDevice;
 import zutil.db.DBConnection;
 import zutil.db.bean.DBBean;
 

plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/daemon/PCDataSynchronizationClient.java

@@ -25,18 +25,17 @@
 package se.hal.plugin.powerchallenge.daemon;
 
 import se.hal.HalContext;
+import se.hal.intf.HalDaemon;
+import se.hal.page.HalAlertManager;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.PeerDataRspDTO;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.SensorDTO;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.SensorDataDTO;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationDaemon.SensorDataListDTO;
-import se.hal.intf.HalDaemon;
-import se.hal.page.HalAlertManager;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;
 import zutil.log.LogUtil;
 import zutil.parser.json.JSONParser;
-import zutil.ui.UserMessageManager;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;

plugins/hal-powerchallenge/src/se/hal/plugin/powerchallenge/daemon/PCDataSynchronizationDaemon.java

@@ -25,9 +25,9 @@
 package se.hal.plugin.powerchallenge.daemon;
 
 import se.hal.HalContext;
+import se.hal.intf.HalDaemon;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationClient.PeerDataReqDTO;
 import se.hal.plugin.powerchallenge.daemon.PCDataSynchronizationClient.SensorDataReqDTO;
-import se.hal.intf.HalDaemon;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
 import zutil.db.DBConnection;

plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiPowerConsumptionSensor.java

@@ -1,11 +1,10 @@
 package se.hal.plugin.raspberry;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.PowerConsumptionSensorData;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 public class RPiPowerConsumptionSensor implements HalSensorConfig {
 

plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiTemperatureSensor.java

@@ -1,11 +1,10 @@
 package se.hal.plugin.raspberry;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.struct.devicedata.TemperatureSensorData;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 public class RPiTemperatureSensor implements HalSensorConfig {
 

plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearning.java

@@ -22,7 +22,6 @@
 
 package se.hal.plugin.tellstick.device;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventController;
 import se.hal.intf.HalEventData;
@@ -31,7 +30,7 @@ import se.hal.plugin.tellstick.TellstickDeviceGroup;
 import se.hal.plugin.tellstick.TellstickSerialComm;
 import se.hal.plugin.tellstick.protocol.NexaSelfLearningProtocol;
 import se.hal.struct.devicedata.OnOffEventData;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 /**
  * Created by Ziver on 2015-02-18.

plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/NexaSelfLearningDimmer.java

@@ -22,7 +22,6 @@
 
 package se.hal.plugin.tellstick.device;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventController;
 import se.hal.intf.HalEventData;
@@ -30,7 +29,7 @@ import se.hal.plugin.tellstick.TellstickDevice;
 import se.hal.plugin.tellstick.TellstickSerialComm;
 import se.hal.plugin.tellstick.protocol.NexaSelfLearningProtocol;
 import se.hal.struct.devicedata.DimmerEventData;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 /**
  * Created by Ziver on 2015-02-18.

plugins/hal-tellstick/src/se/hal/plugin/tellstick/device/Oregon0x1A2D.java

@@ -1,6 +1,5 @@
 package se.hal.plugin.tellstick.device;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
@@ -12,7 +11,7 @@ import se.hal.struct.devicedata.LightSensorData;
 import se.hal.struct.devicedata.PowerConsumptionSensorData;
 import se.hal.struct.devicedata.TemperatureSensorData;
 import zutil.log.LogUtil;
-import zutil.ui.Configurator;
+import zutil.ui.conf.Configurator;
 
 import java.util.logging.Logger;
 

plugins/hal-tellstick/src/se/hal/plugin/tellstick/protocol/NexaSelfLearningProtocol.java

@@ -24,9 +24,9 @@ package se.hal.plugin.tellstick.protocol;
 
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventData;
+import se.hal.plugin.tellstick.TellstickProtocol;
 import se.hal.plugin.tellstick.cmd.TellstickCmd;
 import se.hal.plugin.tellstick.cmd.TellstickCmdExtendedSend;
-import se.hal.plugin.tellstick.TellstickProtocol;
 import se.hal.plugin.tellstick.device.NexaSelfLearning;
 import se.hal.plugin.tellstick.device.NexaSelfLearningDimmer;
 import se.hal.struct.devicedata.DimmerEventData;

plugins/hal-tellstick/test/se/hal/plugin/tellstick/TellstickSerialCommEventTest.java

@@ -2,7 +2,9 @@ package se.hal.plugin.tellstick;
 
 import org.junit.Before;
 import org.junit.Test;
-import se.hal.intf.*;
+import se.hal.intf.HalDeviceReportListener;
+import se.hal.intf.HalEventConfig;
+import se.hal.intf.HalEventData;
 import se.hal.plugin.tellstick.test.TestEventDevice;
 import se.hal.plugin.tellstick.test.TestProtocol;
 

plugins/hal-tellstick/test/se/hal/plugin/tellstick/TellstickSerialCommSensorTest.java

@@ -2,7 +2,9 @@ package se.hal.plugin.tellstick;
 
 import org.junit.Before;
 import org.junit.Test;
-import se.hal.intf.*;
+import se.hal.intf.HalDeviceReportListener;
+import se.hal.intf.HalSensorConfig;
+import se.hal.intf.HalSensorData;
 import se.hal.plugin.tellstick.test.TestProtocol;
 import se.hal.plugin.tellstick.test.TestSensorDevice;
 

plugins/hal-tellstick/test/se/hal/plugin/tellstick/test/TestEventDevice.java

@@ -1,11 +1,9 @@
 package se.hal.plugin.tellstick.test;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalEventConfig;
 import se.hal.intf.HalEventController;
 import se.hal.intf.HalEventData;
 import se.hal.plugin.tellstick.TellstickDevice;
-import se.hal.plugin.tellstick.TellstickSerialCommEventTest;
 
 public class TestEventDevice implements TellstickDevice, HalEventConfig {
     public int testData;

plugins/hal-tellstick/test/se/hal/plugin/tellstick/test/TestSensorDevice.java

@@ -1,11 +1,9 @@
 package se.hal.plugin.tellstick.test;
 
-import se.hal.intf.HalDeviceConfig;
 import se.hal.intf.HalSensorConfig;
 import se.hal.intf.HalSensorController;
 import se.hal.intf.HalSensorData;
 import se.hal.plugin.tellstick.TellstickDevice;
-import se.hal.plugin.tellstick.TellstickSerialCommSensorTest;
 
 public class TestSensorDevice implements HalSensorConfig, TellstickDevice {
     public int testData;

plugins/hal-zigbee-deconz/src/se/hal/plugin/zigbee/deconz/zigbee/deconz/rest/DeConzRestRules.java

@@ -3,7 +3,8 @@ package se.hal.plugin.zigbee.deconz.zigbee.deconz.rest;
 import zutil.net.ws.WSInterface.WSPath;
 import zutil.net.ws.WSInterface.WSRequestType;
 
-import static zutil.net.ws.WSInterface.RequestType.*;
+import static zutil.net.ws.WSInterface.RequestType.DELETE;
+import static zutil.net.ws.WSInterface.RequestType.GET;
 
 /**
  * Rules provide the ability to trigger actions of lights or groups when a specific sensor condition is met.

plugins/hal-zigbee-deconz/src/se/hal/plugin/zigbee/deconz/zigbee/deconz/rest/DeConzRestTouchlink.java

@@ -3,7 +3,8 @@ package se.hal.plugin.zigbee.deconz.zigbee.deconz.rest;
 import zutil.net.ws.WSInterface.WSPath;
 import zutil.net.ws.WSInterface.WSRequestType;
 
-import static zutil.net.ws.WSInterface.RequestType.*;
+import static zutil.net.ws.WSInterface.RequestType.GET;
+import static zutil.net.ws.WSInterface.RequestType.POST;
 
 /**
  * The touchlink endpoint allows to communicate with near by located devices.

plugins/hal-zigbee/src/se/hal/plugin/zigbee/HalZigbeeController.java

@@ -2,7 +2,6 @@ package se.hal.plugin.zigbee;
 
 
 import com.zsmartsystems.zigbee.*;
-import com.zsmartsystems.zigbee.app.basic.ZigBeeBasicServerExtension;
 import com.zsmartsystems.zigbee.app.discovery.ZigBeeDiscoveryExtension;
 import com.zsmartsystems.zigbee.app.iasclient.ZigBeeIasCieExtension;
 import com.zsmartsystems.zigbee.app.otaserver.ZigBeeOtaUpgradeExtension;
@@ -12,20 +11,19 @@ import com.zsmartsystems.zigbee.dongle.xbee.ZigBeeDongleXBee;
 import com.zsmartsystems.zigbee.security.ZigBeeKey;
 import com.zsmartsystems.zigbee.serialization.DefaultDeserializer;
 import com.zsmartsystems.zigbee.serialization.DefaultSerializer;
-import com.zsmartsystems.zigbee.transport.*;
+import com.zsmartsystems.zigbee.transport.TransportConfig;
+import com.zsmartsystems.zigbee.transport.TransportConfigOption;
+import com.zsmartsystems.zigbee.transport.ZigBeePort;
+import com.zsmartsystems.zigbee.transport.ZigBeeTransportTransmit;
 import com.zsmartsystems.zigbee.zcl.clusters.*;
-import com.zsmartsystems.zigbee.zdo.command.NetworkAddressRequest;
 import com.zsmartsystems.zigbee.zdo.field.NodeDescriptor;
 import se.hal.HalContext;
 import se.hal.intf.*;
-import se.hal.intf.HalAbstractDevice;
 import zutil.log.LogUtil;
 
-import java.nio.channels.Channel;
+import java.util.HashSet;
-import java.util.*;
+import java.util.List;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  *

plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigBeeJSerialCommPort.java

@@ -24,12 +24,11 @@
 
 package se.hal.plugin.zigbee;
 
+import com.fazecast.jSerialComm.SerialPort;
 import com.zsmartsystems.zigbee.transport.ZigBeePort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fazecast.jSerialComm.SerialPort;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

plugins/hal-zwave/src/se/hal/plugin/zwave/HalZWaveController.java

@@ -3,7 +3,6 @@ package se.hal.plugin.zwave;
 import org.zwave4j.*;
 import se.hal.HalContext;
 import se.hal.intf.*;
-import se.hal.intf.HalAbstractDevice;
 import zutil.log.LogUtil;
 
 import java.util.List;

settings.gradle

@@ -1,4 +1,4 @@
-import static groovy.io.FileType.*
+import static groovy.io.FileType.DIRECTORIES
 
 rootProject.name = "Hal"