[tplinksmarthome] Added configuring devices by deviceId

addons/binding/org.openhab.binding.tplinksmarthome.test/org.openhab.binding.tplinksmarthome.test.launch

@@ -34,7 +34,7 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
 <booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gson@default:default,com.google.guava@default:default,javax.measure.unit-api@default:default,javax.transaction@default:false,javax.xml@default:default,net.bytebuddy.byte-buddy-agent@default:default,net.bytebuddy.byte-buddy@default:default,org.apache.ant@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.smarthome.config.core@default:default,org.eclipse.smarthome.config.discovery@default:default,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.thing@default:default,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.io.console@default:default,org.eclipse.smarthome.test@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core@default:default,org.objenesis@default:default,org.slf4j.api@default:default,tec.uom.lib.uom-lib-common@default:default,tec.uom.se@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gson@default:default,com.google.guava@default:default,javax.measure.unit-api@default:default,javax.servlet@default:default,javax.transaction@default:false,javax.xml@default:default,net.bytebuddy.byte-buddy-agent@default:default,net.bytebuddy.byte-buddy@default:default,org.apache.ant@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.smarthome.config.core@default:default,org.eclipse.smarthome.config.discovery@default:default,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.thing@default:default,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.io.console@default:default,org.eclipse.smarthome.test@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core@default:default,org.objenesis@default:default,org.slf4j.api@default:default,tec.uom.lib.uom-lib-common@default:default,tec.uom.se@default:default"/>
 <stringAttribute key="selected_workspace_plugins" value="org.openhab.binding.tplinksmarthome.test@default:false,org.openhab.binding.tplinksmarthome@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>

addons/binding/org.openhab.binding.tplinksmarthome.test/src/test/java/org/openhab/binding/tplinksmarthome/internal/handler/SmartHomeHandlerTest.java

@@ -24,7 +24,6 @@
 import org.eclipse.smarthome.core.thing.Thing;
 import org.eclipse.smarthome.core.thing.ThingStatus;
 import org.eclipse.smarthome.core.thing.ThingStatusInfo;
-import org.eclipse.smarthome.core.thing.binding.ThingHandler;
 import org.eclipse.smarthome.core.thing.binding.ThingHandlerCallback;
 import org.eclipse.smarthome.core.types.RefreshType;
 import org.eclipse.smarthome.core.types.State;
@@ -37,6 +36,7 @@
 import org.openhab.binding.tplinksmarthome.internal.Commands;
 import org.openhab.binding.tplinksmarthome.internal.Connection;
 import org.openhab.binding.tplinksmarthome.internal.TPLinkSmartHomeConfiguration;
+import org.openhab.binding.tplinksmarthome.internal.TPLinkSmartHomeDiscoveryService;
 import org.openhab.binding.tplinksmarthome.internal.device.SmartHomeDevice;
 import org.openhab.binding.tplinksmarthome.internal.model.ModelTestUtil;
 
@@ -49,7 +49,7 @@ public class SmartHomeHandlerTest {
 
     private static final String CHANNEL_PREFIX = "binding:tplinksmarthome:1234:";
 
-    private ThingHandler handler;
+    private SmartHomeHandler handler;
 
     @Mock
     private Connection connection;
@@ -59,9 +59,10 @@ public class SmartHomeHandlerTest {
     private Thing thing;
     @Mock
     private SmartHomeDevice smartHomeDevice;
+    @Mock
+    private TPLinkSmartHomeDiscoveryService discoveryService;
 
-    @NonNull
-    private final Configuration configuration = new Configuration();
+    private @NonNull final Configuration configuration = new Configuration();
 
     @Before
     public void setUp() throws IOException {
@@ -72,7 +73,7 @@ public void setUp() throws IOException {
         when(smartHomeDevice.getUpdateCommand()).thenReturn(Commands.getSysinfo());
         when(connection.sendCommand(Commands.getSysinfo()))
                 .thenReturn(ModelTestUtil.readJson("plug_get_sysinfo_response"));
-        handler = new SmartHomeHandler(thing, smartHomeDevice) {
+        handler = new SmartHomeHandler(thing, smartHomeDevice, discoveryService) {
             @Override
             Connection createConnection(TPLinkSmartHomeConfiguration config) {
                 return connection;
@@ -128,4 +129,10 @@ public void testHandleCommandOther() throws InterruptedException {
         verify(callback).stateUpdated(eq(channelUID), stateCaptor.capture());
         assertSame("State of channel switch should be set", OnOffType.ON, stateCaptor.getValue());
     }
+
+    @Test
+    public void testRefreshChannels() {
+        handler.initialize();
+        handler.refreshChannels();
+    }
 }

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/config/config.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<config-description:config-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<config-description:config-descriptions
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:config-description="http://eclipse.org/smarthome/schemas/config-description/v1.0.0"
 	xsi:schemaLocation="http://eclipse.org/smarthome/schemas/config-description/v1.0.0
 		http://eclipse.org/smarthome/schemas/config-description-1.0.0.xsd">
 
 	<config-description uri="thing-type:device:bulb">
-		<parameter name="ipAddress" type="text" required="true">
+		<parameter name="ipAddress" type="text">
 			<context>network-address</context>
 			<label>IP Address</label>
 			<description>IP Address of the device.</description>
 		</parameter>
+		<parameter name="deviceId" type="text">
+			<label>Device Id</label>
+			<description>The id of the device.</description>
+		</parameter>
 		<parameter name="transitionPeriod" type="integer" min="0">
 			<label>Transition period</label>
 			<description>Time the transition to the new state takes in milliseconds.</description>
@@ -25,11 +30,15 @@
 	</config-description>
 
 	<config-description uri="thing-type:device:plug">
-		<parameter name="ipAddress" type="text" required="true">
+		<parameter name="ipAddress" type="text">
 			<context>network-address</context>
 			<label>IP Address</label>
 			<description>IP Address of the device.</description>
 		</parameter>
+		<parameter name="deviceId" type="text">
+			<label>Device Id</label>
+			<description>The id of the device.</description>
+		</parameter>
 		<parameter name="refresh" type="integer" min="1">
 			<label>Refresh rate</label>
 			<description>Refresh of device state in seconds.</description>
@@ -39,11 +48,15 @@
 	</config-description>
 
 	<config-description uri="thing-type:device:switch">
-		<parameter name="ipAddress" type="text" required="true">
+		<parameter name="ipAddress" type="text">
 			<context>network-address</context>
 			<label>IP Address</label>
 			<description>IP Address of the device.</description>
 		</parameter>
+		<parameter name="deviceId" type="text">
+			<label>Device Id</label>
+			<description>The id of the device.</description>
+		</parameter>
 		<parameter name="refresh" type="integer" min="1">
 			<label>Refresh rate</label>
 			<description>Refresh of device state in seconds.</description>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS100.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS105.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS110.xml

@@ -19,6 +19,8 @@
 			<channel id="voltage" typeId="voltage" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS200.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:switch" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS210.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:switch" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/HS220.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:switch" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/KB100.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/KB130.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/KP100.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB100.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB110.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB120.xml

@@ -16,6 +16,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB130.xml

@@ -16,6 +16,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB200.xml

@@ -15,6 +15,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/LB230.xml

@@ -16,6 +16,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:bulb" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/RE270K.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/ESH-INF/thing/RE370K.xml

@@ -14,6 +14,8 @@
 			<channel id="rssi" typeId="rssi" />
 		</channels>
 
+		<representation-property>deviceId</representation-property>
+
 		<config-description-ref uri="thing-type:device:plug" />
 	</thing-type>
 </thing:thing-descriptions>

addons/binding/org.openhab.binding.tplinksmarthome/META-INF/MANIFEST.MF

@@ -12,6 +12,7 @@ Import-Package: com.google.gson,
  com.google.gson.annotations,
  com.google.gson.reflect,
  com.google.gson.stream,
+ org.eclipse.jetty.util,
  org.eclipse.jdt.annotation;resolution:=optional,
  org.eclipse.smarthome.config.core,
  org.eclipse.smarthome.config.core.status,