Add location while creating thing (#1765)

Signed-off-by: Aoun Bukhari <[email protected]>
eclipse-archived · Jun 29, 2016 · 3d99d66 · 3d99d66
1 parent 42ab1e8
commit 3d99d66
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...se.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistry.java b/...se.smarthome.core.thing/src/main/java/org/eclipse/smarthome/core/thing/ThingRegistry.java
@@ -97,6 +97,6 @@ public interface ThingRegistry extends Registry<Thing, ThingUID> {
      *            the configuration
      * @return the created thing
      */
-	Thing createThingOfType(ThingTypeUID thingTypeUID, ThingUID thingUIDObject, ThingUID bridgeUID, String label,
-			Configuration configuration);
+    Thing createThingOfType(ThingTypeUID thingTypeUID, ThingUID thingUIDObject, ThingUID bridgeUID, String label,
+            String location, Configuration configuration);
 }
diff --git a/...core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryImpl.java b/...core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryImpl.java
@@ -36,7 +36,7 @@
  * @author Chris Jackson - ensure thing added event is sent before linked events
  * @auther Thomas Höfer - Added config description validation exception to updateConfiguration operation
  */
-public class ThingRegistryImpl extends AbstractRegistry<Thing, ThingUID>implements ThingRegistry {
+public class ThingRegistryImpl extends AbstractRegistry<Thing, ThingUID> implements ThingRegistry {
 
     private Logger logger = LoggerFactory.getLogger(ThingRegistryImpl.class.getName());
 
@@ -241,11 +241,14 @@ private void notifyTrackerAboutAllThingsRemoved(ThingTracker thingTracker) {
 
     @Override
     public Thing createThingOfType(ThingTypeUID thingTypeUID, ThingUID thingUID, ThingUID bridgeUID, String label,
-            Configuration configuration) {
+            String location, Configuration configuration) {
         logger.debug("Creating thing for type '{}'.", thingTypeUID);
         for (ThingHandlerFactory thingHandlerFactory : thingHandlerFactories) {
             if (thingHandlerFactory.supportsThingType(thingTypeUID)) {
                 Thing thing = thingHandlerFactory.createThing(thingTypeUID, configuration, thingUID, bridgeUID);
+                if (location != null) {
+                    thing.setLocation(location);
+                }
                 thing.setLabel(label);
                 return thing;
             }

diff --git a/...io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTO.java b/...io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTO.java
@@ -33,6 +33,7 @@ public EnrichedThingDTO(ThingDTO thingDTO, ThingStatusInfo statusInfo, Map<Strin
         if (thingDTO.label != null) {
             this.label = thingDTO.label;
         }
+        this.location = thingDTO.location;
         this.thingTypeUID = thingDTO.thingTypeUID;
         this.bridgeUID = thingDTO.bridgeUID;
         this.channels = new ArrayList<>();

diff --git a/...me.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/ThingResource.java b/...me.io.rest.core/src/main/java/org/eclipse/smarthome/io/rest/core/thing/ThingResource.java
@@ -152,7 +152,7 @@ public Response create(@HeaderParam(HttpHeaders.ACCEPT_LANGUAGE) @ApiParam(value
         Configuration configuration = new Configuration(normalizeConfiguration(thingBean.configuration, thingTypeUID));
 
         Thing thing = thingRegistry.createThingOfType(thingTypeUID, thingUID, bridgeUID, thingBean.label,
-                configuration);
+                thingBean.location, configuration);
 
         if (thing != null) {
             if (thingBean.properties != null) {
@@ -418,7 +418,7 @@ public Response update(@HeaderParam(HttpHeaders.ACCEPT_LANGUAGE) @ApiParam(value
     public Response updateConfiguration(@HeaderParam(HttpHeaders.ACCEPT_LANGUAGE) String language,
             @PathParam("thingUID") @ApiParam(value = "thing") String thingUID,
             @ApiParam(value = "configuration parameters") Map<String, Object> configurationParameters)
-                    throws IOException {
+            throws IOException {
         final Locale locale = LocaleUtil.getLocale(language);
 
         ThingUID thingUIDObject = new ThingUID(thingUID);