It is now possible to specify service name.

gdombiak · gdombiak · commit 310c8d9b1b1b · 2016-08-02T09:20:45.000-07:00
diff --git a/src/main/java/com/beowulfe/hap/impl/characteristics/common/Name.java b/src/main/java/com/beowulfe/hap/impl/characteristics/common/Name.java
@@ -1,13 +1,12 @@
 package com.beowulfe.hap.impl.characteristics.common;
 
-import com.beowulfe.hap.HomekitAccessory;
 import com.beowulfe.hap.characteristics.StaticStringCharacteristic;
 
 public class Name extends StaticStringCharacteristic {
 	
-	public Name(HomekitAccessory accessory) {
+	public Name(String label) {
 		super("00000023-0000-1000-8000-0026BB765291",
 				"Name of the accessory",
-				accessory.getLabel());
+				label);
 	}
 }
diff --git a/src/main/java/com/beowulfe/hap/impl/services/AbstractServiceImpl.java b/src/main/java/com/beowulfe/hap/impl/services/AbstractServiceImpl.java
@@ -16,18 +16,6 @@ abstract class AbstractServiceImpl implements Service {
 	private final String type;
 	private final List<Characteristic> characteristics = new LinkedList<>();
 
-	/**
-	 * This constructor has been deprecated and replaced with {@link #AbstractServiceImpl(String, HomekitAccessory)}.
-	 * Usages of this constructor will need to manually configure {@link Name} characteristic and
-	 * {@link BatteryLevelCharacteristic} if needed.
-	 *
-	 * @param type unique UUID of the service. This information can be obtained from HomeKit Accessory Simulator.
-     */
-	@Deprecated
-	public AbstractServiceImpl(String type) {
-		this(type, null);
-	}
-
 	/**
 	 * <p>Creates a new instance of this class with the specified UUID and {@link HomekitAccessory}.
 	 * Download and install <i>HomeKit Accessory Simulator</i> to discover the corresponding UUID for
@@ -39,13 +27,14 @@ public AbstractServiceImpl(String type) {
 	 *
 	 * @param type unique UUID of the service. This information can be obtained from HomeKit Accessory Simulator.
 	 * @param accessory HomeKit accessory exposed as a service.
+	 * @param serviceName name of the service. This information is usually the name of the accessory.
      */
-	public AbstractServiceImpl(String type, HomekitAccessory accessory) {
+	public AbstractServiceImpl(String type, HomekitAccessory accessory, String serviceName) {
 		this.type = type;
 
 		if (accessory != null) {
 			// Add name characteristic
-			addCharacteristic(new Name(accessory));
+			addCharacteristic(new Name(serviceName));
 
 			// If battery operated accessory then add BatteryLevelCharacteristic
 			if (accessory instanceof BatteryAccessory) {
diff --git a/src/main/java/com/beowulfe/hap/impl/services/AccessoryInformationService.java b/src/main/java/com/beowulfe/hap/impl/services/AccessoryInformationService.java
@@ -9,7 +9,11 @@
 public class AccessoryInformationService extends AbstractServiceImpl {
 
 	public AccessoryInformationService(HomekitAccessory accessory) throws Exception {
-		super("0000003E-0000-1000-8000-0026BB765291", accessory);
+		this(accessory, accessory.getLabel());
+	}
+
+	public AccessoryInformationService(HomekitAccessory accessory, String serviceName) throws Exception {
+		super("0000003E-0000-1000-8000-0026BB765291", accessory, serviceName);
 		addCharacteristic(new Manufacturer(accessory));
 		addCharacteristic(new Model(accessory));
 		addCharacteristic(new SerialNumber(accessory));
diff --git a/src/main/java/com/beowulfe/hap/impl/services/CarbonMonoxideSensorService.java b/src/main/java/com/beowulfe/hap/impl/services/CarbonMonoxideSensorService.java
@@ -6,7 +6,11 @@
 public class CarbonMonoxideSensorService extends AbstractServiceImpl {
 
     public CarbonMonoxideSensorService(CarbonMonoxideSensor carbonMonoxideSensor) {
-        super("0000007F-0000-1000-8000-0026BB765291", carbonMonoxideSensor);
+        this(carbonMonoxideSensor, carbonMonoxideSensor.getLabel());
+    }
+
+    public CarbonMonoxideSensorService(CarbonMonoxideSensor carbonMonoxideSensor, String serviceName) {
+        super("0000007F-0000-1000-8000-0026BB765291", carbonMonoxideSensor, serviceName);
         addCharacteristic(new CarbonMonoxideDetectedCharacteristic(carbonMonoxideSensor));
     }
 }
diff --git a/src/main/java/com/beowulfe/hap/impl/services/ContactSensorService.java b/src/main/java/com/beowulfe/hap/impl/services/ContactSensorService.java
@@ -6,7 +6,11 @@
 public class ContactSensorService extends AbstractServiceImpl {
 
     public ContactSensorService(ContactSensor contactSensor) {
-        super("00000080-0000-1000-8000-0026BB765291", contactSensor);
+        this(contactSensor, contactSensor.getLabel());
+    }
+
+    public ContactSensorService(ContactSensor contactSensor, String serviceName) {
+        super("00000080-0000-1000-8000-0026BB765291", contactSensor, serviceName);
         addCharacteristic(new ContactSensorStateCharacteristic(contactSensor));
     }
 }
diff --git a/src/main/java/com/beowulfe/hap/impl/services/FanService.java b/src/main/java/com/beowulfe/hap/impl/services/FanService.java
@@ -8,7 +8,11 @@
 public class FanService extends AbstractServiceImpl {
 
 	public FanService(Fan fan) {
-		super("00000040-0000-1000-8000-0026BB765291", fan);
+		this(fan, fan.getLabel());
+	}
+
+	public FanService(Fan fan, String serviceName) {
+		super("00000040-0000-1000-8000-0026BB765291", fan, serviceName);
 		addCharacteristic(new PowerStateCharacteristic(
 				() -> fan.getFanPower(),
 				v -> fan.setFanPower(v),
diff --git a/src/main/java/com/beowulfe/hap/impl/services/GarageDoorService.java b/src/main/java/com/beowulfe/hap/impl/services/GarageDoorService.java
@@ -8,7 +8,11 @@
 public class GarageDoorService extends AbstractServiceImpl {
 
 	public GarageDoorService(GarageDoor door) {
-		super("00000041-0000-1000-8000-0026BB765291", door);
+		this(door, door.getLabel());
+	}
+
+	public GarageDoorService(GarageDoor door, String serviceName) {
+		super("00000041-0000-1000-8000-0026BB765291", door, serviceName);
 		addCharacteristic(new CurrentDoorStateCharacteristic(door));
 		addCharacteristic(new TargetDoorStateCharacteristic(door));
 		addCharacteristic(new ObstructionDetectedCharacteristic(() -> door.getObstructionDetected(),
diff --git a/src/main/java/com/beowulfe/hap/impl/services/HumiditySensorService.java b/src/main/java/com/beowulfe/hap/impl/services/HumiditySensorService.java
@@ -6,7 +6,11 @@
 public class HumiditySensorService extends AbstractServiceImpl {
 	
 	public HumiditySensorService(HumiditySensor sensor) {
-		super("00000082-0000-1000-8000-0026BB765291", sensor);
+		this(sensor, sensor.getLabel());
+	}
+
+	public HumiditySensorService(HumiditySensor sensor, String serviceName) {
+		super("00000082-0000-1000-8000-0026BB765291", sensor, serviceName);
 		addCharacteristic(new CurrentRelativeHumidityCharacteristic(sensor));
 	}
 
diff --git a/src/main/java/com/beowulfe/hap/impl/services/LightbulbService.java b/src/main/java/com/beowulfe/hap/impl/services/LightbulbService.java
@@ -11,7 +11,11 @@
 public class LightbulbService extends AbstractServiceImpl {
 
 	public LightbulbService(Lightbulb lightbulb) {
-		super("00000043-0000-1000-8000-0026BB765291", lightbulb);
+		this(lightbulb, lightbulb.getLabel());
+	}
+
+	public LightbulbService(Lightbulb lightbulb, String serviceName) {
+		super("00000043-0000-1000-8000-0026BB765291", lightbulb, serviceName);
 		addCharacteristic(new PowerStateCharacteristic(
 				() -> lightbulb.getLightbulbPowerState(),
 				v -> lightbulb.setLightbulbPowerState(v),
diff --git a/src/main/java/com/beowulfe/hap/impl/services/LockMechanismService.java b/src/main/java/com/beowulfe/hap/impl/services/LockMechanismService.java
@@ -8,7 +8,11 @@
 public class LockMechanismService extends AbstractServiceImpl {
 
 	public LockMechanismService(LockMechanism lock) {
-		super("00000045-0000-1000-8000-0026BB765291", lock);
+		this(lock, lock.getLabel());
+	}
+
+	public LockMechanismService(LockMechanism lock, String serviceName) {
+		super("00000045-0000-1000-8000-0026BB765291", lock, serviceName);
 		addCharacteristic(new CurrentLockMechanismStateCharacteristic(lock));
 		
 		if (lock instanceof LockableLockMechanism) {
diff --git a/src/main/java/com/beowulfe/hap/impl/services/MotionSensorService.java b/src/main/java/com/beowulfe/hap/impl/services/MotionSensorService.java
@@ -6,7 +6,11 @@
 public class MotionSensorService extends AbstractServiceImpl {
 
     public MotionSensorService(MotionSensor motionSensor) {
-        super("00000085-0000-1000-8000-0026BB765291", motionSensor);
+        this(motionSensor, motionSensor.getLabel());
+    }
+
+    public MotionSensorService(MotionSensor motionSensor, String serviceName) {
+        super("00000085-0000-1000-8000-0026BB765291", motionSensor, serviceName);
         addCharacteristic(new MotionDetectedStateCharacteristic(motionSensor));
     }
 }
diff --git a/src/main/java/com/beowulfe/hap/impl/services/OutletService.java b/src/main/java/com/beowulfe/hap/impl/services/OutletService.java
@@ -7,7 +7,11 @@
 public class OutletService extends AbstractServiceImpl {
 
 	public OutletService(Outlet outlet) {
-		super("00000047-0000-1000-8000-0026BB765291", outlet);
+		this(outlet, outlet.getLabel());
+	}
+
+	public OutletService(Outlet outlet, String serviceName) {
+		super("00000047-0000-1000-8000-0026BB765291", outlet, serviceName);
 		addCharacteristic(new PowerStateCharacteristic(
 				() -> outlet.getPowerState(),
 				v -> outlet.setPowerState(v),
diff --git a/src/main/java/com/beowulfe/hap/impl/services/SecuritySystemService.java b/src/main/java/com/beowulfe/hap/impl/services/SecuritySystemService.java
@@ -8,7 +8,11 @@
 public class SecuritySystemService extends AbstractServiceImpl {
 
     public SecuritySystemService(SecuritySystem securitySystem) {
-        super("0000007E-0000-1000-8000-0026BB765291", securitySystem);
+        this(securitySystem, securitySystem.getLabel());
+    }
+
+    public SecuritySystemService(SecuritySystem securitySystem, String serviceName) {
+        super("0000007E-0000-1000-8000-0026BB765291", securitySystem, serviceName);
         addCharacteristic(new CurrentSecuritySystemStateCharacteristic(securitySystem));
         addCharacteristic(new TargetSecuritySystemStateCharacteristic(securitySystem));
         addCharacteristic(new SecuritySystemAlarmTypeCharacteristic(securitySystem));
diff --git a/src/main/java/com/beowulfe/hap/impl/services/SmokeSensorService.java b/src/main/java/com/beowulfe/hap/impl/services/SmokeSensorService.java
@@ -6,7 +6,11 @@
 public class SmokeSensorService extends AbstractServiceImpl {
 
     public SmokeSensorService(SmokeSensor smokeSensor) {
-        super("00000087-0000-1000-8000-0026BB765291", smokeSensor);
+        this(smokeSensor, smokeSensor.getLabel());
+    }
+
+    public SmokeSensorService(SmokeSensor smokeSensor, String serviceName) {
+        super("00000087-0000-1000-8000-0026BB765291", smokeSensor, serviceName);
         addCharacteristic(new SmokeDetectedCharacteristic(smokeSensor));
     }
 }
diff --git a/src/main/java/com/beowulfe/hap/impl/services/SwitchService.java b/src/main/java/com/beowulfe/hap/impl/services/SwitchService.java
@@ -6,7 +6,11 @@
 public class SwitchService extends AbstractServiceImpl {
 
 	public SwitchService(Switch switchAccessory) {
-		super("00000049-0000-1000-8000-0026BB765291", switchAccessory);
+		this(switchAccessory, switchAccessory.getLabel());
+	}
+
+	public SwitchService(Switch switchAccessory, String serviceName) {
+		super("00000049-0000-1000-8000-0026BB765291", switchAccessory, serviceName);
 		addCharacteristic(new PowerStateCharacteristic(
 				() -> switchAccessory.getSwitchState(),
 				v -> switchAccessory.setSwitchState(v),
diff --git a/src/main/java/com/beowulfe/hap/impl/services/TemperatureSensorService.java b/src/main/java/com/beowulfe/hap/impl/services/TemperatureSensorService.java
@@ -6,7 +6,11 @@
 public class TemperatureSensorService extends AbstractServiceImpl {
 	
 	public TemperatureSensorService(TemperatureSensor sensor) {
-		super("0000008A-0000-1000-8000-0026BB765291", sensor);
+		this(sensor, sensor.getLabel());
+	}
+
+	public TemperatureSensorService(TemperatureSensor sensor, String serviceName) {
+		super("0000008A-0000-1000-8000-0026BB765291", sensor, serviceName);
 		addCharacteristic(new CurrentTemperatureCharacteristic(sensor));
 	}
 
diff --git a/src/main/java/com/beowulfe/hap/impl/services/ThermostatService.java b/src/main/java/com/beowulfe/hap/impl/services/ThermostatService.java
@@ -8,7 +8,11 @@
 public class ThermostatService extends AbstractServiceImpl {
 
 	public ThermostatService(BasicThermostat thermostat) {
-		super("0000004A-0000-1000-8000-0026BB765291", thermostat);
+		this(thermostat, thermostat.getLabel());
+	}
+
+	public ThermostatService(BasicThermostat thermostat, String serviceName) {
+		super("0000004A-0000-1000-8000-0026BB765291", thermostat, serviceName);
 		addCharacteristic(new CurrentHeatingCoolingModeCharacteristic(thermostat));
 		addCharacteristic(new CurrentTemperatureCharacteristic(thermostat));
 		addCharacteristic(new TargetHeatingCoolingModeCharacteristic(thermostat));
diff --git a/src/main/java/com/beowulfe/hap/impl/services/WindowCoveringService.java b/src/main/java/com/beowulfe/hap/impl/services/WindowCoveringService.java
@@ -9,15 +9,19 @@
 public class WindowCoveringService extends AbstractServiceImpl {
 
 	public WindowCoveringService(WindowCovering windowCovering) {
-		super("0000008C-0000-1000-8000-0026BB765291", windowCovering);
+		this(windowCovering, windowCovering.getLabel());
+	}
+
+	public WindowCoveringService(WindowCovering windowCovering, String serviceName) {
+		super("0000008C-0000-1000-8000-0026BB765291", windowCovering, serviceName);
 		addCharacteristic(new CurrentPositionCharacteristic(windowCovering));
 		addCharacteristic(new HoldPositionCharacteristic(windowCovering));
 		addCharacteristic(new PositionStateCharacteristic(windowCovering));
 		addCharacteristic(new TargetPositionCharacteristic(windowCovering));
 		addCharacteristic(new ObstructionDetectedCharacteristic(() -> windowCovering.getObstructionDetected(),
 				c -> windowCovering.subscribeObstructionDetected(c),
 				() -> windowCovering.unsubscribeObstructionDetected()));
-		
+
 		if (windowCovering instanceof HorizontalTiltingWindowCovering) {
 			addCharacteristic(new CurrentHorizontalTiltAngleCharacteristic(
 					(HorizontalTiltingWindowCovering) windowCovering));
@@ -31,5 +35,4 @@ public WindowCoveringService(WindowCovering windowCovering) {
 					(VerticalTiltingWindowCovering) windowCovering));
 		}
 	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,12 @@`
`1`	`1`	`package com.beowulfe.hap.impl.characteristics.common;`
`2`	`2`
`3`		`-import com.beowulfe.hap.HomekitAccessory;`
`4`	`3`	`import com.beowulfe.hap.characteristics.StaticStringCharacteristic;`
`5`	`4`
`6`	`5`	`public class Name extends StaticStringCharacteristic {`
`7`	`6`
`8`		`- public Name(HomekitAccessory accessory) {`
	`7`	`+ public Name(String label) {`
`9`	`8`	`super("00000023-0000-1000-8000-0026BB765291",`
`10`	`9`	`"Name of the accessory",`
`11`		`- accessory.getLabel());`
	`10`	`+ label);`
`12`	`11`	`}`
`13`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@`
`6`	`6`	`public class CarbonMonoxideSensorService extends AbstractServiceImpl {`
`7`	`7`
`8`	`8`	`public CarbonMonoxideSensorService(CarbonMonoxideSensor carbonMonoxideSensor) {`
`9`		`- super("0000007F-0000-1000-8000-0026BB765291", carbonMonoxideSensor);`
	`9`	`+ this(carbonMonoxideSensor, carbonMonoxideSensor.getLabel());`
	`10`	`+ }`
	`11`	`+`
	`12`	`+ public CarbonMonoxideSensorService(CarbonMonoxideSensor carbonMonoxideSensor, String serviceName) {`
	`13`	`+ super("0000007F-0000-1000-8000-0026BB765291", carbonMonoxideSensor, serviceName);`
`10`	`14`	`addCharacteristic(new CarbonMonoxideDetectedCharacteristic(carbonMonoxideSensor));`
`11`	`15`	`}`
`12`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,11 @@`
`6`	`6`	`public class ContactSensorService extends AbstractServiceImpl {`
`7`	`7`
`8`	`8`	`public ContactSensorService(ContactSensor contactSensor) {`
`9`		`- super("00000080-0000-1000-8000-0026BB765291", contactSensor);`
	`9`	`+ this(contactSensor, contactSensor.getLabel());`
	`10`	`+ }`
	`11`	`+`
	`12`	`+ public ContactSensorService(ContactSensor contactSensor, String serviceName) {`
	`13`	`+ super("00000080-0000-1000-8000-0026BB765291", contactSensor, serviceName);`
`10`	`14`	`addCharacteristic(new ContactSensorStateCharacteristic(contactSensor));`
`11`	`15`	`}`
`12`	`16`	`}`