Update Requests to use pick and format

Author: jason-fox

README.ja.md

@@ -613,7 +613,8 @@ NGSI-LD [仕様](https://cim.etsi.org/NGSI-LD/official/front-page.html) では
 #### 3️⃣ リクエスト:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -682,7 +683,8 @@ curl -L -X POST 'http://localhost:4041/iot/devices' \
 #### 4️⃣ リクエスト:
 
 ```console
-curl -L -X POST 'http://localhost:7896/iot/json?k=4jggokgpepnvsb2uv4s40d59ov&i=temperature001' \
+curl -L -X POST \
+  'http://localhost:7896/iot/json?k=4jggokgpepnvsb2uv4s40d59ov&i=temperature001' \
     -H 'Content-Type: application/json' \
     --data-raw '{ "t": 3}'
 ```
@@ -703,11 +705,12 @@ Context Broker からエンティティのデータを取得することで、
 #### 5️⃣ リクエスト:
 
 ```console
-curl -G -iX GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:temperature001' \
+curl -G -iX GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:temperature001' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Accept: application/ld+json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
-    -d 'attrs=temperature'
+    -d 'pick=id,type,temperature'
 ```
 
 #### レスポンス:
@@ -755,7 +758,8 @@ curl -iX POST 'http://localhost:7896/iot/json?k=4jggokgpepnvsb2uv4s40d59ov&i=mot
 #### 7️⃣ リクエスト:
 
 ```console
-curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
+curl -L -X GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Accept: application/ld+json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
@@ -806,7 +810,8 @@ curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
 #### 8️⃣ リクエスト:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -845,7 +850,8 @@ Broker によって最終的に呼び出されます。設定をテストする
 #### 9️⃣ リクエスト:
 
 ```console
-curl -L -X PATCH 'http://localhost:4041/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
+curl -L -X PATCH \
+  'http://localhost:4041/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -867,7 +873,8 @@ Irrigation system をオンにするコマンドの結果は、Context Broker 
 #### 1️⃣0️⃣ リクエスト:
 
 ```console
-curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001' \
+curl -L -X GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
     -H 'Accept: application/json'
@@ -916,7 +923,8 @@ curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:wat
 #### 1️⃣1️⃣ リクエスト:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
 -H 'fiware-service: openiot' \
 -H 'fiware-servicepath: /' \
 -H 'Content-Type: application/json' \
@@ -974,7 +982,8 @@ curl -L -X POST 'http://localhost:4041/iot/devices' \
 #### 1️⃣2️⃣ リクエスト:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -1008,7 +1017,8 @@ Tractor からの測定値 (例: `gps`) は、サービス・グループ内で
 #### 1️⃣3️⃣ リクエスト:
 
 ```console
-curl -L -X GET 'http://localhost:4041/iot/devices' \
+curl -L -X GET \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /'
 ```
@@ -1035,7 +1045,8 @@ IoT Agent を IoT デバイスに接続すると、Orion Context Broker にコ
 #### 1️⃣4️⃣ リクエスト:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
 -H 'NGSILD-Tenant: openiot' \
 -H 'Content-Type: application/json' \
 -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
@@ -1060,7 +1071,8 @@ curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:w
 #### 1️⃣5️⃣ リクエスト:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:tractor001/attrs/start' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:tractor001/attrs/start' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Content-Type: application/json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
@@ -1081,7 +1093,8 @@ curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:t
 #### 1️⃣6️⃣ リクエスト:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:filling001/attrs/add' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:filling001/attrs/add' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Content-Type: application/json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \

README.md

@@ -609,7 +609,8 @@ Three types of measurement attributes can be provisioned:
 #### 3️⃣ Request:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -678,7 +679,8 @@ making the following request
 #### 4️⃣ Request:
 
 ```console
-curl -L -X POST 'http://localhost:7896/iot/json?k=4jggokgpepnvsb2uv4s40d59ov&i=temperature001' \
+curl -L -X POST \
+  'http://localhost:7896/iot/json?k=4jggokgpepnvsb2uv4s40d59ov&i=temperature001' \
     -H 'Content-Type: application/json' \
     --data-raw '{ "t": 3}'
 ```
@@ -700,11 +702,12 @@ add the `fiware-service` and `fiware-service-path` headers.
 #### 5️⃣ Request:
 
 ```console
-curl -G -iX GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:temperature001' \
+curl -G -iX GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:temperature001' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Accept: application/ld+json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
-    -d 'attrs=temperature'
+    -d 'pick=id,type,temperature'
 ```
 
 #### Response:
@@ -754,7 +757,8 @@ based on the knowledge of the service group
 #### 7️⃣ Request:
 
 ```console
-curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
+curl -L -X GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/?type=Device' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Accept: application/ld+json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"'
@@ -805,7 +809,8 @@ communications protocol to be used.
 #### 8️⃣ Request:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -846,7 +851,8 @@ command directly as shown:
 #### 9️⃣ Request:
 
 ```console
-curl -L -X PATCH 'http://localhost:4041/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
+curl -L -X PATCH \
+  'http://localhost:4041/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -867,7 +873,8 @@ The result of the command to turn on the irrigation system can be read by queryi
 #### 1️⃣0️⃣ Request:
 
 ```console
-curl -L -X GET 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001' \
+curl -L -X GET \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
     -H 'Accept: application/json'
@@ -914,7 +921,8 @@ both `attributes` and `command` attributes in the body of the request.
 #### 1️⃣1️⃣ Request:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -970,7 +978,8 @@ Similarly, a **Tractor** with two commands (`start` and `stop`) and two attribut
 #### 1️⃣2️⃣ Request:
 
 ```console
-curl -L -X POST 'http://localhost:4041/iot/devices' \
+curl -L -X POST \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /' \
     -H 'Content-Type: application/json' \
@@ -1005,7 +1014,8 @@ The full list of provisioned devices can be obtained by making a GET request to
 #### 1️⃣3️⃣ Request:
 
 ```console
-curl -L -X GET 'http://localhost:4041/iot/devices' \
+curl -L -X GET \
+  'http://localhost:4041/iot/devices' \
     -H 'fiware-service: openiot' \
     -H 'fiware-servicepath: /'
 ```
@@ -1028,7 +1038,8 @@ To invoke the `on` command, the `on` attribute must be updated in the context.
 #### 1️⃣4️⃣ Request:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:water001/attrs/on' \
 -H 'NGSILD-Tenant: openiot' \
 -H 'Content-Type: application/json' \
 -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
@@ -1051,7 +1062,8 @@ To invoke the `start` command, the `start` attribute must be updated in the cont
 #### 1️⃣5️⃣ Request:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:tractor001/attrs/start' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:tractor001/attrs/start' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Content-Type: application/json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \
@@ -1070,7 +1082,8 @@ Change the state of the **Fillling System**, the `add` attribute must be updated
 #### 1️⃣6️⃣ Request:
 
 ```console
-curl -L -X PATCH 'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:filling001/attrs/add' \
+curl -L -X PATCH \
+  'http://localhost:1026/ngsi-ld/v1/entities/urn:ngsi-ld:Device:filling001/attrs/add' \
     -H 'NGSILD-Tenant: openiot' \
     -H 'Content-Type: application/json' \
     -H 'Link: <http://context/user-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' \