Merge pull request #147 from earocorn/axis-configurable-uid

Add configurable UID extension to Axis camera driver

Author: drewbotts

sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraConfig.java

@@ -38,7 +38,10 @@ Developer are Copyright (C) 2014 the Initial Developer. All Rights Reserved.
  * @since October 30, 2014
  */
 public class AxisCameraConfig extends SensorConfig {
-	
+
+    @DisplayInfo(label="UID Extension", desc="ID to be attached to tail of this system's UID. Driver must be reinitialized to be configured after start")
+    public String uidExtension = "";
+
     @DisplayInfo(label="HTTP", desc="HTTP configuration")
     public HTTPConfig http = new HTTPConfig();
 

sensors/video/sensorhub-driver-axis/src/main/java/org/sensorhub/impl/sensor/axis/AxisCameraDriver.java

@@ -95,7 +95,7 @@ public void setConfiguration(final AxisCameraConfig config) {
 
         // compute full host URL
         hostUrl = "http://" + config.http.remoteHost + ":" + config.http.remotePort + VAPIX_API_BASE_URL;
-    };
+    }
 
 
     @Override
@@ -195,8 +195,8 @@ else if (tokens[0].trim().equalsIgnoreCase("root.Properties.API.HTTP.Version"))
         connection.waitForConnection();
 
         // generate identifiers
-        generateUniqueID("urn:axis:cam:", serialNumber);
-        generateXmlID("AXIS_CAM_", serialNumber);
+        generateUniqueID("urn:axis:cam:", config.uidExtension.isBlank() ? serialNumber : serialNumber.trim() + ":" + config.uidExtension);
+        generateXmlID("AXIS_CAM_", config.uidExtension.isBlank() ? serialNumber : serialNumber.trim() + "_" + config.uidExtension);
 
         // create I/O objects
         String videoOutName = "video";