Merge pull request #1837 from telefonicaid/feature/17675_type_in_loca…

…tion_header Feature/17675 type in location header
telefonicaid · Feb 24, 2016 · 2963365 · 2963365
2 parents 8dcef50 + 1cfd803
commit 2963365
Show file tree

Hide file tree

Showing 159 changed files with 320 additions and 311 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -29,3 +29,4 @@
 - Add: orderBy URI param in NGSIv1 queries to sort entities by attribute (Issue #1103)
 - Fix: Returning 422 InvalidModification instead of 404 NotFound when POSTing entity (Issue #1817)
 - Add implemented new operation: POST /v2/op/update (Issue #1715)
+- Add: ?type URL parameter in Location header upon entity creation in NGSIv2 (Issue #1765)
diff --git a/doc/apiary/v2/fiware-ngsiv2-cookbook.apib b/doc/apiary/v2/fiware-ngsiv2-cookbook.apib
@@ -450,7 +450,7 @@ This resource allows you to obtain a list of subresources published by the API:
 
     + Headers
 
-            Location: /v2/entities/Bcn-Welt
+            Location: /v2/entities/Bcn-Welt?type=Room
 
 
 ### Create a new entity. Error [POST /v2/entities]

diff --git a/doc/apiary/v2/fiware-ngsiv2-reference.apib b/doc/apiary/v2/fiware-ngsiv2-reference.apib
@@ -768,7 +768,7 @@ Response:
 
     + Headers
 
-            Location: /v2/entities/Bcn-Welt
+            Location: /v2/entities/Bcn-Welt?type=Room
 
 
 ## Entity by ID [/v2/entities/{entityId}{?type,attrs,options}]

diff --git a/src/lib/serviceRoutinesV2/postEntities.cpp b/src/lib/serviceRoutinesV2/postEntities.cpp
@@ -108,6 +108,14 @@ std::string postEntities
   if (rhttpcode == SccOk || rhttpcode == SccNone)
   {
     std::string location = "/v2/entities/" + eP->id;
+    if (eP->type != "" )
+    {
+      location += "?type=" + eP->type;
+    }
+    else
+    {
+      location += "?type=none";
+    }
 
     ciP->httpHeader.push_back("Location");
     ciP->httpHeaderValue.push_back(location);

diff --git a/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test b/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test
@@ -134,7 +134,7 @@ echo
 =======================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T
 Date: REGEX(.*)
 
 
@@ -143,7 +143,7 @@ Date: REGEX(.*)
 ========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T
 Date: REGEX(.*)
 
 
@@ -152,7 +152,7 @@ Date: REGEX(.*)
 =======================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E3
+Location: /v2/entities/E3?type=T
 Date: REGEX(.*)
 
 
@@ -161,7 +161,7 @@ Date: REGEX(.*)
 ========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E4
+Location: /v2/entities/E4?type=T
 Date: REGEX(.*)
 
 
@@ -170,7 +170,7 @@ Date: REGEX(.*)
 =======================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E5
+Location: /v2/entities/E5?type=T
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test
@@ -146,7 +146,7 @@ Date: REGEX(.*)
 =====================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -234,7 +234,7 @@ Date: REGEX(.*)
 ===================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T1
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test
@@ -119,7 +119,7 @@ echo
 ==========================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -128,7 +128,7 @@ Date: REGEX(.*)
 ===========================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T2
 Date: REGEX(.*)
 
 
@@ -137,7 +137,7 @@ Date: REGEX(.*)
 ==========================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E3
+Location: /v2/entities/E3?type=T3
 Date: REGEX(.*)
 
 
@@ -146,7 +146,7 @@ Date: REGEX(.*)
 ===========================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E4
+Location: /v2/entities/E4?type=T4
 Date: REGEX(.*)
 
 
@@ -155,7 +155,7 @@ Date: REGEX(.*)
 ==========================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E5
+Location: /v2/entities/E5?type=T5
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test
@@ -76,7 +76,7 @@ echo
 ===================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/8787GHY
+Location: /v2/entities/8787GHY?type=Car
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test
@@ -115,7 +115,7 @@ Date: REGEX(.*)
 =======================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test
@@ -104,7 +104,7 @@ echo
 ==========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -113,7 +113,7 @@ Date: REGEX(.*)
 ==========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T2
 Date: REGEX(.*)
 
 
@@ -122,7 +122,7 @@ Date: REGEX(.*)
 ==========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T3
 Date: REGEX(.*)
 
 
@@ -131,7 +131,7 @@ Date: REGEX(.*)
 ==========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T4
 Date: REGEX(.*)
 
 
@@ -140,7 +140,7 @@ Date: REGEX(.*)
 ==========================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T5
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test b/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test
@@ -99,7 +99,7 @@ echo
 ===========================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -108,7 +108,7 @@ Date: REGEX(.*)
 ===========================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T2
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test
@@ -118,7 +118,7 @@ Date: REGEX(.*)
 ==================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -168,7 +168,7 @@ Date: REGEX(.*)
 =================================================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T1
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test
@@ -118,7 +118,7 @@ echo
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -127,7 +127,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T2
 Date: REGEX(.*)
 
 
@@ -136,7 +136,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E3
+Location: /v2/entities/E3?type=T3
 Date: REGEX(.*)
 
 
@@ -145,7 +145,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E4
+Location: /v2/entities/E4?type=T4
 Date: REGEX(.*)
 
 
@@ -154,7 +154,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E5
+Location: /v2/entities/E5?type=T5
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test
@@ -79,7 +79,7 @@ Date: REGEX(.*)
 ==================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test
@@ -119,7 +119,7 @@ echo
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -128,7 +128,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T1
 Date: REGEX(.*)
 
 
@@ -137,7 +137,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E3
+Location: /v2/entities/E3?type=T2
 Date: REGEX(.*)
 
 
@@ -146,7 +146,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T3
 Date: REGEX(.*)
 
 
@@ -155,7 +155,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T3
 Date: REGEX(.*)
 
 

diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test
@@ -117,7 +117,7 @@ echo
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T1
 Date: REGEX(.*)
 
 
@@ -126,7 +126,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T1
 Date: REGEX(.*)
 
 
@@ -135,7 +135,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E3
+Location: /v2/entities/E3?type=T2
 Date: REGEX(.*)
 
 
@@ -144,7 +144,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E1
+Location: /v2/entities/E1?type=T3
 Date: REGEX(.*)
 
 
@@ -153,7 +153,7 @@ Date: REGEX(.*)
 =====================================
 HTTP/1.1 201 Created
 Content-Length: 0
-Location: /v2/entities/E2
+Location: /v2/entities/E2?type=T3
 Date: REGEX(.*)
-Original file line number
+Diff line change
@@ Expand Up @@
         + Headers
-                Location: /v2/entities/Bcn-Welt
+                Location: /v2/entities/Bcn-Welt?type=Room
     ### Create a new entity. Error [POST /v2/entities]
@@ Expand Down @@