Skip to content

Commit

Permalink
Update Core Context
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-fox committed Jan 8, 2025
1 parent 04829ac commit d1c78cb
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
26 changes: 13 additions & 13 deletions README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ Context Broker は `@context` で示されているすべてのファイルを

`Content-Type: application/ld+json` なので、`@context` はリクエストのボディで提供されます。すべての **NGSI-LD**
相互作用と同様に、core **NGSI-LD** `@context`
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld))
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld))
も暗黙的に含まれています。

つまり、実際の `@context` は次のとおりです:
Expand All @@ -408,7 +408,7 @@ Context Broker は `@context` で示されているすべてのファイルを
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}
```
Expand Down Expand Up @@ -532,7 +532,7 @@ curl -G -X GET \
#### レスポンス:

リクエストで明示的な `@context` が送信されなかったため、レスポンスはデフォルト
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`) で core `@context` を返し、
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`) で core `@context` を返し、
すべての属性は可能な限り展開されます。

- `id`, `type`, `location` および `name` は core context で定義され、展開されません
Expand All @@ -544,7 +544,7 @@ curl -G -X GET \
```json
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:farm001",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -580,7 +580,7 @@ curl -G -X GET \
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:barn002",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -656,7 +656,7 @@ Core `@context` が含まれることは常に暗示されることに注意し
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand Down Expand Up @@ -728,7 +728,7 @@ curl -G -X GET \
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand All @@ -751,7 +751,7 @@ curl -G -X GET \
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -805,7 +805,7 @@ curl -G -X GET \
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -880,7 +880,7 @@ curl -G -X GET \
{
"@context": [
"http://context/alternate-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Gebäude",
Expand Down Expand Up @@ -935,7 +935,7 @@ curl -G -X GET \
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -987,7 +987,7 @@ curl -G -X GET 'http://localhost:1026/ngsi-ld/v1/entities/' \
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand All @@ -1010,7 +1010,7 @@ curl -G -X GET 'http://localhost:1026/ngsi-ld/v1/entities/' \
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ The first request will take some time, as the context broker must navigate and l

Since the `Content-Type: application/ld+json` the `@context` is supplied in the body of the request. As with all
**NGSI-LD** interactions, the core **NGSI-LD** `@context`
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld))
([`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`](https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld))
is implicitly included as well.

This means that the actual `@context` is:
Expand All @@ -425,7 +425,7 @@ This means that the actual `@context` is:
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
]
}
```
Expand Down Expand Up @@ -542,7 +542,7 @@ curl -G -X GET \
#### Response:

Since no explicit `@context` was sent in the request, the response returns the Core `@context` by default
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld`) and all attributes are expanded whenever possible.
(`https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld`) and all attributes are expanded whenever possible.

- `id`, `type`, `location` and `name` are defined in the core context and are not expanded.
- `address` has been mapped to `http://schema.org/address`
Expand All @@ -554,7 +554,7 @@ be displayed.
```json
[
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:farm001",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -587,7 +587,7 @@ be displayed.
}
},
{
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld",
"@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld",
"id": "urn:ngsi-ld:Building:barn002",
"type": "https://uri.fiware.org/ns/dataModels#Building",
"https://schema.org/address": {
Expand Down Expand Up @@ -658,7 +658,7 @@ files explicitly as element in the array of `@context` sent. The response is nor
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand Down Expand Up @@ -725,7 +725,7 @@ used as the `@context` returned in the response.
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand All @@ -745,7 +745,7 @@ used as the `@context` returned in the response.
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -794,7 +794,7 @@ The use of the `Link` header and the `options=keyValues` parameter reduces the r
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -864,7 +864,7 @@ directly but would require an additional **JSON-LD** expansion/compaction operat
{
"@context": [
"http://context/alternate-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Gebäude",
Expand Down Expand Up @@ -914,7 +914,7 @@ The response is returned in JSON-LD format with short form attribute names:
{
"@context": [
"http://context/ngsi-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down Expand Up @@ -961,7 +961,7 @@ Use of the `Link` header and the `options=keyValues` parameter reduces the respo
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:farm001",
"type": "Building",
Expand All @@ -981,7 +981,7 @@ Use of the `Link` header and the `options=keyValues` parameter reduces the respo
{
"@context": [
"http://context/json-context.jsonld",
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
"https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"
],
"id": "urn:ngsi-ld:Building:barn002",
"type": "Building",
Expand Down
2 changes: 1 addition & 1 deletion services
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SCORPIO="http://scorpio:9090/"
ORION="http://orion:1026/version"
STELLIO="http://stellio:8080/actuator/health"
CONTEXT="http://context/user-context.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld"
CORE_CONTEXT="https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld"

dockerCmd="docker compose"
if (( $# == 2 )); then
Expand Down

0 comments on commit d1c78cb

Please sign in to comment.