Merge branch 'master' into NewConnectors3.1

Conflicts:
	src/main/java/com/bwssystems/HABridge/BridgeSettings.java

src/main/java/com/bwssystems/HABridge/BridgeSettings.java

@@ -46,6 +46,7 @@ public class BridgeSettings extends BackupHandler {
 	public void buildSettings() {
         String addressString = null;
         String theVeraAddress = null;
+        String theSomfyAddress = null;
         String theHarmonyAddress = null;
         String configFileProperty = System.getProperty("config.file");
         if(configFileProperty == null) {
@@ -103,6 +104,23 @@ public class BridgeSettings extends BackupHandler {
 		        }
 	        }
 	        theBridgeSettings.setHarmonyAddress(theHarmonyList);
+
+			theSomfyAddress = System.getProperty("somfy.address");
+			IpList theSomfyList = null;
+			if(theSomfyAddress != null) {
+				try {
+					theSomfyList = new Gson().fromJson(theSomfyAddress, IpList.class);
+				} catch (Exception e) {
+					try {
+						theSomfyList = new Gson().fromJson("{devices:[{name:default,ip:" + theSomfyAddress + "}]}", IpList.class);
+					} catch (Exception et) {
+						log.error("Cannot parse somfy.address, not set with message: " + e.getMessage(), e);
+						theSomfyList = null;
+					}
+				}
+			}
+			theBridgeSettings.setSomfyAddress(theSomfyList);
+
 	        theBridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
 	        theBridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
 	        theBridgeSettings.setButtonsleep(Integer.parseInt(System.getProperty("button.sleep", Configuration.DEFAULT_BUTTON_SLEEP)));
@@ -148,6 +166,7 @@ public class BridgeSettings extends BackupHandler {
         theBridgeSettings.setMqttconfigured(theBridgeSettings.isValidMQTT());
         theBridgeSettings.setHassconfigured(theBridgeSettings.isValidHass());
         theBridgeSettings.setDomoticzconfigured(theBridgeSettings.isValidDomoticz());
+		theBridgeSettings.setSomfyconfigured(theBridgeSettings.isValidSomfy());
         // Lifx is either configured or not, so it does not need an update.
        if(serverPortOverride != null)
         	theBridgeSettings.setServerPort(serverPortOverride);

src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java

@@ -49,6 +49,9 @@ public class BridgeSettingsDescriptor {
 	private String hubversion;
 	private IpList domoticzaddress;
 	private boolean domoticzconfigured;
+	private IpList somfyaddress;
+	private boolean somfyconfigured;
+
 	private boolean lifxconfigured;
 	
 	public BridgeSettingsDescriptor() {
@@ -57,6 +60,7 @@ public class BridgeSettingsDescriptor {
 		this.traceupnp = false;
 		this.nestconfigured = false;
 		this.veraconfigured = false;
+		this.somfyconfigured = false;
 		this.harmonyconfigured = false;
 		this.hueconfigured = false;
 		this.halconfigured = false;
@@ -102,9 +106,15 @@ public class BridgeSettingsDescriptor {
 	public IpList getVeraAddress() {
 		return veraaddress;
 	}
+	public IpList getSomfyAddress() {
+		return somfyaddress;
+	}
 	public void setVeraAddress(IpList veraAddress) {
 		this.veraaddress = veraAddress;
 	}
+	public void setSomfyAddress(IpList somfyAddress) {
+		this.somfyaddress = somfyAddress;
+	}
 	public IpList getHarmonyAddress() {
 		return harmonyaddress;
 	}
@@ -138,9 +148,15 @@ public class BridgeSettingsDescriptor {
 	public boolean isVeraconfigured() {
 		return veraconfigured;
 	}
+	public boolean isSomfyconfigured() {
+		return somfyconfigured;
+	}
 	public void setVeraconfigured(boolean veraconfigured) {
 		this.veraconfigured = veraconfigured;
 	}
+	public void setSomfyconfigured(boolean somfyconfigured) {
+		this.somfyconfigured = somfyconfigured;
+	}
 	public boolean isHarmonyconfigured() {
 		return harmonyconfigured;
 	}
@@ -344,6 +360,14 @@ public class BridgeSettingsDescriptor {
 			return false;
 		return true;
 	}
+	public Boolean isValidSomfy() {
+		if(this.getSomfyAddress() == null || this.getSomfyAddress().getDevices().size() <= 0)
+			return false;
+		List<NamedIP> devicesList = this.getSomfyAddress().getDevices();
+		if(devicesList.get(0).getIp().contains(Configuration.DEFAULT_ADDRESS))
+			return false;
+		return true;
+	}
 	public Boolean isValidLifx() {
 		return this.isLifxconfigured();
 	}

src/main/java/com/bwssystems/HABridge/DeviceMapTypes.java

@@ -1,84 +1,86 @@
-package com.bwssystems.HABridge;
-
-import java.util.ArrayList;
-
-public class DeviceMapTypes {
-
-	public final static String[] CUSTOM_DEVICE = { "custom", "Custom"};
-	public final static String[] VERA_DEVICE = { "veraDevice", "Vera Device"};
-	public final static String[] VERA_SCENE = { "veraScene", "Vera Scene"};
-	public final static String[] HARMONY_ACTIVITY = { "harmonyActivity", "Harmony Activity"};
-	public final static String[] HARMONY_BUTTON = { "harmonyButton", "Harmony Button"};
-	public final static String[] NEST_HOMEAWAY = { "nestHomeAway", "Nest Home Status"};
-	public final static String[] NEST_THERMO_SET = { "nestThermoSet", "Nest Thermostat"};
-	public final static String[] HUE_DEVICE = { "hueDevice", "Hue Device"};
-	public final static String[] HAL_DEVICE = { "halDevice", "HAL Device"};
-	public final static String[] HAL_BUTTON = { "halButton", "HAL Button"};
-	public final static String[] HAL_HOME = { "halHome", "HAL Home Status"};
-	public final static String[] HAL_THERMO_SET = { "halThermoSet", "HAL Thermostat"};
-	public final static String[] MQTT_MESSAGE = { "mqttMessage", "MQTT Message"};
-	public final static String[] EXEC_DEVICE_COMPAT = { "exec", "Execute Script/Program"};
-	public final static String[] CMD_DEVICE = { "cmdDevice", "Execute Command/Script/Program"};
-	public final static String[] HASS_DEVICE = { "hassDevice", "HomeAssistant Device"};
-	public final static String[] TCP_DEVICE = { "tcpDevice", "TCP Device"};
-	public final static String[] TCP_DEVICE_COMPAT = { "TCP", "TCP Device"};
-	public final static String[] UDP_DEVICE = { "udpDevice", "UDP Device"};
-	public final static String[] UDP_DEVICE_COMPAT = { "UDP", "UDP Device"};
-	public final static String[] HTTP_DEVICE = { "httpDevice", "HTTP Device"};
-	public final static String[] DOMOTICZ_DEVICE = { "domoticzDevice", "Domoticz Device"};
-	public final static String[] LIFX_DEVICE = { "lifxDevice", "LIFX Device"};
-
-	public final static int typeIndex = 0;
-	public final static int displayIndex = 1;
-
-	ArrayList<String[]> deviceMapTypes;
-	
-	public DeviceMapTypes() {
-		super();
-		deviceMapTypes = new ArrayList<String[]>();
-		deviceMapTypes.add(CMD_DEVICE);
-		deviceMapTypes.add(DOMOTICZ_DEVICE);
-		deviceMapTypes.add(HAL_DEVICE);
-		deviceMapTypes.add(HAL_HOME);
-		deviceMapTypes.add(HAL_THERMO_SET);
-		deviceMapTypes.add(HAL_BUTTON);
-		deviceMapTypes.add(HARMONY_ACTIVITY);
-		deviceMapTypes.add(HARMONY_BUTTON);
-		deviceMapTypes.add(HASS_DEVICE);
-		deviceMapTypes.add(HTTP_DEVICE);
-		deviceMapTypes.add(HUE_DEVICE);
-		deviceMapTypes.add(LIFX_DEVICE);
-		deviceMapTypes.add(MQTT_MESSAGE);
-		deviceMapTypes.add(NEST_HOMEAWAY);
-		deviceMapTypes.add(NEST_THERMO_SET);
-		deviceMapTypes.add(TCP_DEVICE);
-		deviceMapTypes.add(UDP_DEVICE);
-		deviceMapTypes.add(VERA_DEVICE);
-		deviceMapTypes.add(VERA_SCENE);
-	}
-	public static int getTypeIndex() {
-		return typeIndex;
-	}
-	public static int getDisplayIndex() {
-		return displayIndex;
-	}
-	public ArrayList<String[]> getDeviceMapTypes() {
-		return deviceMapTypes;
-	}
-	
-	public Boolean validateType(String type) {
-		if(type == null || type.trim().isEmpty())
-			return false;
-		for(String[] mapType : deviceMapTypes) {
-			if(type.trim().contentEquals(mapType[typeIndex]))
-				return true;
-		}
-		if(type.trim().contentEquals(EXEC_DEVICE_COMPAT[typeIndex]))
-			return true;
-		if(type.trim().contentEquals(TCP_DEVICE_COMPAT[typeIndex]))
-			return true;
-		if(type.trim().contentEquals(UDP_DEVICE_COMPAT[typeIndex]))
-			return true;
-		return false;
-	}
+package com.bwssystems.HABridge;
+
+import java.util.ArrayList;
+
+public class DeviceMapTypes {
+
+	public final static String[] CUSTOM_DEVICE = { "custom", "Custom"};
+	public final static String[] VERA_DEVICE = { "veraDevice", "Vera Device"};
+	public final static String[] VERA_SCENE = { "veraScene", "Vera Scene"};
+	public final static String[] HARMONY_ACTIVITY = { "harmonyActivity", "Harmony Activity"};
+	public final static String[] HARMONY_BUTTON = { "harmonyButton", "Harmony Button"};
+	public final static String[] NEST_HOMEAWAY = { "nestHomeAway", "Nest Home Status"};
+	public final static String[] NEST_THERMO_SET = { "nestThermoSet", "Nest Thermostat"};
+	public final static String[] HUE_DEVICE = { "hueDevice", "Hue Device"};
+	public final static String[] HAL_DEVICE = { "halDevice", "HAL Device"};
+	public final static String[] HAL_BUTTON = { "halButton", "HAL Button"};
+	public final static String[] HAL_HOME = { "halHome", "HAL Home Status"};
+	public final static String[] HAL_THERMO_SET = { "halThermoSet", "HAL Thermostat"};
+	public final static String[] MQTT_MESSAGE = { "mqttMessage", "MQTT Message"};
+	public final static String[] EXEC_DEVICE_COMPAT = { "exec", "Execute Script/Program"};
+	public final static String[] CMD_DEVICE = { "cmdDevice", "Execute Command/Script/Program"};
+	public final static String[] HASS_DEVICE = { "hassDevice", "HomeAssistant Device"};
+	public final static String[] TCP_DEVICE = { "tcpDevice", "TCP Device"};
+	public final static String[] TCP_DEVICE_COMPAT = { "TCP", "TCP Device"};
+	public final static String[] UDP_DEVICE = { "udpDevice", "UDP Device"};
+	public final static String[] UDP_DEVICE_COMPAT = { "UDP", "UDP Device"};
+	public final static String[] HTTP_DEVICE = { "httpDevice", "HTTP Device"};
+	public final static String[] DOMOTICZ_DEVICE = { "domoticzDevice", "Domoticz Device"};
+	public final static String[] SOMFY_DEVICE = { "somfyDevice", "Somfy Device"};
+	public final static String[] LIFX_DEVICE = { "lifxDevice", "LIFX Device"};
+
+	public final static int typeIndex = 0;
+	public final static int displayIndex = 1;
+
+	ArrayList<String[]> deviceMapTypes;
+	
+	public DeviceMapTypes() {
+		super();
+		deviceMapTypes = new ArrayList<String[]>();
+		deviceMapTypes.add(CMD_DEVICE);
+		deviceMapTypes.add(DOMOTICZ_DEVICE);
+		deviceMapTypes.add(HAL_DEVICE);
+		deviceMapTypes.add(HAL_HOME);
+		deviceMapTypes.add(HAL_THERMO_SET);
+		deviceMapTypes.add(HAL_BUTTON);
+		deviceMapTypes.add(HARMONY_ACTIVITY);
+		deviceMapTypes.add(HARMONY_BUTTON);
+		deviceMapTypes.add(HASS_DEVICE);
+		deviceMapTypes.add(HTTP_DEVICE);
+		deviceMapTypes.add(HUE_DEVICE);
+		deviceMapTypes.add(LIFX_DEVICE);
+		deviceMapTypes.add(MQTT_MESSAGE);
+		deviceMapTypes.add(NEST_HOMEAWAY);
+		deviceMapTypes.add(NEST_THERMO_SET);
+		deviceMapTypes.add(TCP_DEVICE);
+		deviceMapTypes.add(UDP_DEVICE);
+		deviceMapTypes.add(VERA_DEVICE);
+		deviceMapTypes.add(VERA_SCENE);
+		deviceMapTypes.add(SOMFY_DEVICE);
+	}
+	public static int getTypeIndex() {
+		return typeIndex;
+	}
+	public static int getDisplayIndex() {
+		return displayIndex;
+	}
+	public ArrayList<String[]> getDeviceMapTypes() {
+		return deviceMapTypes;
+	}
+	
+	public Boolean validateType(String type) {
+		if(type == null || type.trim().isEmpty())
+			return false;
+		for(String[] mapType : deviceMapTypes) {
+			if(type.trim().contentEquals(mapType[typeIndex]))
+				return true;
+		}
+		if(type.trim().contentEquals(EXEC_DEVICE_COMPAT[typeIndex]))
+			return true;
+		if(type.trim().contentEquals(TCP_DEVICE_COMPAT[typeIndex]))
+			return true;
+		if(type.trim().contentEquals(UDP_DEVICE_COMPAT[typeIndex]))
+			return true;
+		return false;
+	}
 }

src/main/java/com/bwssystems/HABridge/HomeManager.java

@@ -15,6 +15,7 @@ import com.bwssystems.HABridge.plugins.http.HTTPHome;
 import com.bwssystems.HABridge.plugins.hue.HueHome;
 import com.bwssystems.HABridge.plugins.lifx.LifxHome;
 import com.bwssystems.HABridge.plugins.mqtt.MQTTHome;
+import com.bwssystems.HABridge.plugins.somfy.SomfyHome;
 import com.bwssystems.HABridge.plugins.tcp.TCPHome;
 import com.bwssystems.HABridge.plugins.udp.UDPHome;
 import com.bwssystems.HABridge.plugins.vera.VeraHome;
@@ -88,6 +89,10 @@ public class HomeManager {
 		aHome = new DomoticzHome(bridgeSettings);
 		homeList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
 		resourceList.put(DeviceMapTypes.DOMOTICZ_DEVICE[DeviceMapTypes.typeIndex], aHome);
+		//setup the Somfy configuration if available
+		aHome = new SomfyHome(bridgeSettings);
+		homeList.put(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex], aHome);
+		resourceList.put(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex], aHome);
         //setup the Lifx configuration if available
 		aHome = new LifxHome(bridgeSettings);
 		resourceList.put(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex], aHome);

src/main/java/com/bwssystems/HABridge/devicemanagmeent/DeviceResource.java

@@ -260,7 +260,13 @@ public class DeviceResource {
 	      	return homeManager.findResource(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.LIFX_DEVICE[DeviceMapTypes.typeIndex]);
 	    }, new JsonTransformer());
 
-    	get (API_CONTEXT + "/map/types", "application/json", (request, response) -> {
+		get (API_CONTEXT + "/somfy/devices", "application/json", (request, response) -> {
+			log.debug("Get somfy devices");
+			response.status(HttpStatus.SC_OK);
+			return homeManager.findResource(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex]).getItems(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex]);
+		}, new JsonTransformer());
+
+		get (API_CONTEXT + "/map/types", "application/json", (request, response) -> {
 	    	log.debug("Get map types");
 	      	return new DeviceMapTypes().getDeviceMapTypes();
 	    }, new JsonTransformer());

src/main/java/com/bwssystems/HABridge/plugins/somfy/SomfyDevice.java

@@ -0,0 +1,67 @@
+package com.bwssystems.HABridge.plugins.somfy;
+
+public class SomfyDevice {
+    private String id;
+    private String room;
+    private String category;
+    private String somfyname;
+    private String name;
+    private String deviceUrl;
+    private String deviceType;
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setRoom(String room) {
+        this.room = room;
+    }
+
+    public String getRoom() {
+        return room;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setSomfyname(String somfyname) {
+        this.somfyname = somfyname;
+    }
+
+    public String getSomfyname() {
+        return somfyname;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setDeviceUrl(String deviceUrl) {
+        this.deviceUrl = deviceUrl;
+    }
+
+    public String getDeviceUrl() {
+        return deviceUrl;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+}

src/main/java/com/bwssystems/HABridge/plugins/somfy/SomfyHome.java

@@ -0,0 +1,118 @@
+package com.bwssystems.HABridge.plugins.somfy;
+
+import com.bwssystems.HABridge.BridgeSettingsDescriptor;
+import com.bwssystems.HABridge.DeviceMapTypes;
+import com.bwssystems.HABridge.Home;
+import com.bwssystems.HABridge.NamedIP;
+import com.bwssystems.HABridge.api.CallItem;
+import com.bwssystems.HABridge.dao.DeviceDescriptor;
+import com.bwssystems.HABridge.hue.MultiCommandUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * Support for Somfy Tahoma hub which allows control of IO Homecontrol devices such as Velux windows.
+ * Currently supports 'turn on' for open window, and 'turn off' for close.
+ * 
+ * Known issues:
+ * //TODO - Fix bug on UI where bulk update seems to add the single device twice if 'update' is clicked (this is a general bug with Vera too I think)
+ * Enhancements:
+ * //TODO - support 'dimming' for partial window opening.
+ *
+ */
+public class SomfyHome implements Home  {
+    private static final Logger log = LoggerFactory.getLogger(SomfyHome.class);
+	private Map<String, SomfyInfo> somfys;
+	private Boolean validSomfy;
+
+	public SomfyHome(BridgeSettingsDescriptor bridgeSettings) {
+		createHome(bridgeSettings);
+
+	}
+
+	public SomfyInfo getSomfyHandler(String somfyName) {
+		return  somfys.get(somfyName);
+	}
+
+	public List<SomfyDevice> getDevices() {
+		log.debug("consolidating devices for somfy");
+		Iterator<String> keys = somfys.keySet().iterator();
+		ArrayList<SomfyDevice> deviceList = new ArrayList<>();
+		while(keys.hasNext()) {
+			String key = keys.next();
+			List<SomfyDevice> devices = somfys.get(key).getSomfyDevices();
+			deviceList.addAll(devices);
+		}
+		return deviceList;
+	}
+
+	@Override
+	public Object getItems(String type) {
+		if(validSomfy) {
+			if(type.equalsIgnoreCase(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex]))
+				return getDevices();
+		}
+		return null;
+	}
+
+	@Override
+	public String deviceHandler(CallItem anItem, MultiCommandUtil aMultiUtil, String lightId, int intensity, Integer targetBri, Integer targetBriInc, DeviceDescriptor device, String body) {
+		String responseString = null;
+		if (!validSomfy) {
+			log.warn("Should not get here, no somfy hub available");
+			responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
+					+ "\",\"description\": \"Should not get here, no somfy hub available\", \"parameter\": \"/lights/"
+					+ lightId + "state\"}}]";
+		} else {
+			if (anItem.getType() != null && anItem.getType().trim().equalsIgnoreCase(DeviceMapTypes.SOMFY_DEVICE[DeviceMapTypes.typeIndex])) {
+
+				log.debug("executing HUE api request to change activity to Somfy: " + anItem.getItem().toString());
+				String jsonToPost = anItem.getItem().toString();
+				
+				SomfyInfo somfyHandler = getSomfyHandler(device.getTargetDevice());
+				if(somfyHandler == null) {
+					log.warn("Should not get here, no Somfy configured");
+					responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
+							+ "\",\"description\": \"Should not get here, no somfy configured\", \"parameter\": \"/lights/"
+							+ lightId + "state\"}}]";
+				} else {
+					try {
+						somfyHandler.execApply(jsonToPost);
+					} catch (Exception e) {
+						log.warn("Error posting request to Somfy");
+						responseString = "[{\"error\":{\"type\": 6, \"address\": \"/lights/" + lightId
+								+ "\",\"description\": \"Error posting request to SomfyTahoma\", \"parameter\": \"/lights/" + lightId + "state\"}}]";
+					}
+
+				}
+			}
+		}
+		return responseString;
+	}
+
+	@Override
+	public Home createHome(BridgeSettingsDescriptor bridgeSettings) {
+		validSomfy = bridgeSettings.isValidSomfy();
+		log.info("Somfy Home created." + (validSomfy ? "" : " No Somfys configured."));
+		if(validSomfy) {
+			somfys = new HashMap<>();
+			Iterator<NamedIP> theList = bridgeSettings.getSomfyAddress().getDevices().iterator();
+			while (theList.hasNext()) {
+				NamedIP aSomfy = theList.next();
+				somfys.put(aSomfy.getName(), new SomfyInfo(aSomfy, aSomfy.getName()));
+			}
+		}
+		return this;
+	}
+
+	@Override
+	public void closeHome() {
+		somfys = null;
+	}
+}

src/main/java/com/bwssystems/HABridge/plugins/somfy/SomfyInfo.java

@@ -0,0 +1,116 @@
+package com.bwssystems.HABridge.plugins.somfy;
+
+import com.bwssystems.HABridge.NamedIP;
+import com.bwssystems.HABridge.api.NameValue;
+import com.bwssystems.HABridge.plugins.http.HTTPHandler;
+import com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup.Device;
+import com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup.GetSetup;
+import com.google.gson.Gson;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.message.BasicNameValuePair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SomfyInfo {
+    private static final Logger log = LoggerFactory.getLogger(SomfyInfo.class);
+	private final String somfyName;
+	private final NamedIP namedIP;
+	private HTTPHandler httpClient;
+	private static final String CONNECT_HOST = "https://www.tahomalink.com/";
+	private static final String BASE_URL = CONNECT_HOST + "enduser-mobile-web/externalAPI/";
+	private static final String BASE_URL_ENDUSER = CONNECT_HOST + "enduser-mobile-web/enduserAPI/";
+
+	public SomfyInfo(NamedIP namedIP, String somfyName) {
+		super();
+		this.somfyName = somfyName;
+		this.namedIP = namedIP;
+	}
+
+	private void initHttpClient() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException {
+		if(httpClient==null) {
+			httpClient = new HTTPHandler();
+		}
+	}
+
+	
+
+	public List<SomfyDevice> getSomfyDevices() {
+
+		List<SomfyDevice> somfyDevices = new ArrayList<>();
+		try {
+			login(namedIP.getUsername(), namedIP.getPassword());
+			GetSetup setupData = getSetup();
+			for(Device device : setupData.getSetup().getDevices()) {
+				somfyDevices.add(mapDeviceToSomfyDevice(device));
+			}
+		} catch (Exception e) {
+			log.error("Could not get Somfy devices", e);
+		}
+		return somfyDevices;
+	}
+
+
+	public void login(String username, String password) throws Exception {
+
+		initHttpClient();
+		NameValue[] httpHeader = getHttpHeaders();
+		List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+		nvps.add(new BasicNameValuePair("userId", username));
+		nvps.add(new BasicNameValuePair("userPassword", password));
+		log.debug("Making SOMFY http login call");
+		UrlEncodedFormEntity urlEncodedFormEntity = new UrlEncodedFormEntity(nvps);
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		urlEncodedFormEntity.writeTo(bos);
+		String body = bos.toString();
+		String response = httpClient.doHttpRequest(BASE_URL + "json/login",HttpPost.METHOD_NAME, "application/x-www-form-urlencoded", body,httpHeader);
+		log.debug(response);
+	}
+
+	private NameValue[] getHttpHeaders() {
+		NameValue userAgentHeader = new NameValue();
+		userAgentHeader.setName("User-Agent");
+		userAgentHeader.setValue("mine");
+		return new NameValue[]{userAgentHeader};
+	}
+
+	public GetSetup getSetup() throws IOException {
+		NameValue[] httpHeader = getHttpHeaders();
+		log.info("Making SOMFY http setup call");
+		String response = httpClient.doHttpRequest(BASE_URL + "json/getSetup", HttpGet.METHOD_NAME, "", "", httpHeader );
+		log.debug(response);
+		GetSetup setupData = new Gson().fromJson(response, GetSetup.class);
+		return setupData;
+	}
+
+	public void execApply(String jsonToPost) throws Exception {
+		login(namedIP.getUsername(), namedIP.getPassword());
+		log.info("Making SOMFY http exec call");
+		String response = httpClient.doHttpRequest(BASE_URL_ENDUSER + "exec/apply", HttpPost.METHOD_NAME, "application/json;charset=UTF-8", jsonToPost, getHttpHeaders());
+		log.info(response);
+	}
+
+
+	protected SomfyDevice mapDeviceToSomfyDevice(Device device) {
+		SomfyDevice somfyDevice = new SomfyDevice();
+		somfyDevice.setId(device.getOid());
+		somfyDevice.setCategory(device.getUiClass());
+		somfyDevice.setRoom("");
+		somfyDevice.setSomfyname(somfyName);
+		somfyDevice.setName(device.getLabel());
+		somfyDevice.setDeviceUrl(device.getDeviceURL());
+		somfyDevice.setDeviceType(device.getWidget());
+		return somfyDevice;
+	}
+
+}

src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Device.java

@@ -0,0 +1,69 @@
+
+package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
+
+import java.util.List;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class Device {
+    
+    @SerializedName("label")
+    @Expose
+    private String label;
+    @SerializedName("deviceURL")
+    @Expose
+    private String deviceURL;
+    @SerializedName("widget")
+    @Expose
+    private String widget;
+    @SerializedName("oid")
+    @Expose
+    private String oid;
+    @SerializedName("uiClass")
+    @Expose
+    private String uiClass;
+
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getDeviceURL() {
+        return deviceURL;
+    }
+
+    public void setDeviceURL(String deviceURL) {
+        this.deviceURL = deviceURL;
+    }
+    
+    
+    public String getWidget() {
+        return widget;
+    }
+
+    public void setWidget(String widget) {
+        this.widget = widget;
+    }
+
+
+    public String getOid() {
+        return oid;
+    }
+
+    public void setOid(String oid) {
+        this.oid = oid;
+    }
+
+    public String getUiClass() {
+        return uiClass;
+    }
+
+    public void setUiClass(String uiClass) {
+        this.uiClass = uiClass;
+    }
+
+}

src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/GetSetup.java

@@ -0,0 +1,21 @@
+
+package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
+
+import java.util.List;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class GetSetup {
+
+    @SerializedName("setup")
+    @Expose
+    private Setup setup;
+
+    public Setup getSetup() {
+        return setup;
+    }
+
+    public void setSetup(Setup setup) {
+        this.setup = setup;
+    }
+}

src/main/java/com/bwssystems/HABridge/plugins/somfy/jsonschema2pojo/getsetup/Setup.java

@@ -0,0 +1,35 @@
+
+package com.bwssystems.HABridge.plugins.somfy.jsonschema2pojo.getsetup;
+
+import java.util.List;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class Setup {
+    
+    @SerializedName("id")
+    @Expose
+    private String id;
+    @SerializedName("devices")
+    @Expose
+    private List<Device> devices = null;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<Device> getDevices() {
+        return devices;
+    }
+
+    public void setDevices(List<Device> devices) {
+        this.devices = devices;
+    }
+
+
+
+}