diff --git a/context/hypermedia-context.jsonld b/context/hypermedia-context.jsonld index 256a6c4a4..edba7b125 100644 --- a/context/hypermedia-context.jsonld +++ b/context/hypermedia-context.jsonld @@ -33,6 +33,7 @@ "unobserveallproperties": "td:unobserveAllProperties", "invokeaction": "td:invokeAction", "queryaction": "td:queryAction", + "queryallactions": "td:queryAllActions", "cancelaction": "td:cancelAction", "subscribeevent": "td:subscribeEvent", "subscribeallevents": "td:subscribeAllEvents", diff --git a/context/td-context-1.1.jsonld b/context/td-context-1.1.jsonld index bfe09dccc..885befe4a 100644 --- a/context/td-context-1.1.jsonld +++ b/context/td-context-1.1.jsonld @@ -405,6 +405,7 @@ "unobserveallproperties": "td:unobserveAllProperties", "invokeaction": "td:invokeAction", "queryaction": "td:queryAction", + "queryallactions": "td:queryAllActions", "cancelaction": "td:cancelAction", "subscribeevent": "td:subscribeEvent", "subscribeallevents": "td:subscribeAllEvents", @@ -499,6 +500,7 @@ "unobserveallproperties": "td:unobserveAllProperties", "invokeaction": "td:invokeAction", "queryaction": "td:queryAction", + "queryallactions": "td:queryAllActions", "cancelaction": "td:cancelAction", "subscribeevent": "td:subscribeEvent", "subscribeallevents": "td:subscribeAllEvents", diff --git a/context/td-context.ttl b/context/td-context.ttl index 1751d7914..c56ade0c7 100644 --- a/context/td-context.ttl +++ b/context/td-context.ttl @@ -692,6 +692,10 @@ _:hasForm-context _:hasForm-queryactio _:hasForm-queryaction . _:hasForm-queryaction "queryaction" . _:hasForm-queryaction . +_:hasForm-context _:hasForm-queryallactions . +_:hasForm-queryallactions . +_:hasForm-queryallactions "queryallactions" . +_:hasForm-queryallactions . _:hasForm-context _:hasForm-cancelaction . _:hasForm-cancelaction . _:hasForm-cancelaction "cancelaction" . @@ -868,6 +872,10 @@ _:hasLink-context _:hasLink-queryactio _:hasLink-queryaction . _:hasLink-queryaction "queryaction" . _:hasLink-queryaction . +_:hasLink-context _:hasLink-queryallactions . +_:hasLink-queryallactions . +_:hasLink-queryallactions "queryallactions" . +_:hasLink-queryallactions . _:hasLink-context _:hasLink-cancelaction . _:hasLink-cancelaction . _:hasLink-cancelaction "cancelaction" . diff --git a/index.html b/index.html index 54225c6d2..c5051c9a3 100644 --- a/index.html +++ b/index.html @@ -1326,7 +1326,8 @@

Core Vocabulary Definitions

writeallproperties, readmultipleproperties, writemultipleproperties, observeallproperties, - unobserveallproperties, subscribeallevents, or + unobserveallproperties, queryallactions, + subscribeallevents, or unsubscribeallevents. (See an example for an usage of form in a Thing instance.)

@@ -2140,7 +2141,7 @@

Hypermedia Controls Vocabulary Definitions

the correct form for the operation required. op can be assigned one or more interaction verb(s) each representing a semantic intention of an - operation.optionalstring or Array of string (one of readproperty, writeproperty, observeproperty, unobserveproperty, invokeaction, queryaction, cancelaction, subscribeevent, unsubscribeevent, readallproperties, writeallproperties, readmultipleproperties, writemultipleproperties, observeallproperties, unobserveallproperties, subscribeallevents, or unsubscribeallevents)

Possible values for the contentCoding + operation.optionalstring or Array of string (one of readproperty, writeproperty, observeproperty, unobserveproperty, invokeaction, queryaction, cancelaction, subscribeevent, unsubscribeevent, readallproperties, writeallproperties, readmultipleproperties, writemultipleproperties, observeallproperties, unobserveallproperties, subscribeallevents, unsubscribeallevents, or queryallactions)

Possible values for the contentCoding property can be found, e.g., in the IANA HTTP content coding registry.

@@ -7020,6 +7021,7 @@

JSON Schema for TD Instance Validation

"writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] @@ -7035,6 +7037,7 @@

JSON Schema for TD Instance Validation

"writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] @@ -8013,7 +8016,7 @@

Changes from First Public Working Draft 24 November 2
  • In section :
    • A new term additionalResponses was added. It can be used to define error responses.
      • -
    • queryaction, cancelaction, observeallproperties, unobserveallproperties, subscribeallevents and unsubscribeallevents were added to the definition of op.
      • +
    • queryaction, cancelaction, observeallproperties, unobserveallproperties, queryallactions, subscribeallevents and unsubscribeallevents were added to the definition of op.
    • Type definitions for terms contentType, contentCoding, security, op were changed.
    • A paragraph was added to describe how a Consumer can behave given multiple form choices.
    diff --git a/index.template.html b/index.template.html index 5b2699135..3b4ea51b7 100644 --- a/index.template.html +++ b/index.template.html @@ -5712,7 +5712,7 @@

    Changes from First Public Working Draft 24 November 2
  • In section :
    • A new term additionalResponses was added. It can be used to define error responses.
      • -
    • queryaction, cancelaction, observeallproperties, unobserveallproperties, subscribeallevents and unsubscribeallevents were added to the definition of op.
      • +
    • queryaction, cancelaction, observeallproperties, unobserveallproperties, queryallactions, subscribeallevents and unsubscribeallevents were added to the definition of op.
    • Type definitions for terms contentType, contentCoding, security, op were changed.
    • A paragraph was added to describe how a Consumer can behave given multiple form choices.
    diff --git a/ontology/td.html b/ontology/td.html index dd71526e2..87d6858b7 100644 --- a/ontology/td.html +++ b/ontology/td.html @@ -101,7 +101,7 @@

    Terminology

    Axiomatization

    Classes

    ActionAffordance

    IRI: https://www.w3.org/2019/wot/td#ActionAffordance

    An Interaction Affordance that allows to invoke a function of the Thing, which manipulates state (e.g., toggling a lamp on or off) or triggers a process on the Thing (e.g., dim a lamp over time).
    Sub-class oftd:InteractionAffordance
    In the domain oftd:hasInputSchema
    td:hasOutputSchema
    td:isIdempotent
    td:isSafe
    In the range oftd:hasActionAffordance

    EventAffordance

    IRI: https://www.w3.org/2019/wot/td#EventAffordance

    An Interaction Affordance that describes an event source, which asynchronously pushes event data to Consumers (e.g., overheating alerts).
    Sub-class oftd:InteractionAffordance
    In the domain oftd:hasCancellationSchema
    td:hasNotificationSchema
    td:hasSubscriptionSchema
    In the range oftd:hasEventAffordance

    InteractionAffordance

    IRI: https://www.w3.org/2019/wot/td#InteractionAffordance

    Metadata of a Thing that shows the possible choices to Consumers, thereby suggesting how Consumers may interact with the Thing. There are many types of potential affordances, but W3C WoT defines three types of Interaction Affordances: Properties, Actions, and Events.
    Super-class oftd:ActionAffordance
    td:EventAffordance
    td:PropertyAffordance
    In the domain oftd:hasForm
    td:hasUriTemplateSchema
    td:name
    In the range oftd:hasInteractionAffordance
    -

    OperationType

    IRI: https://www.w3.org/2019/wot/td#OperationType

    Enumeration of well-known operation types necessary to implement the WoT interaction model
    Enumeration memberstd:cancelAction
    td:invokeAction
    td:observeAllProperties
    td:observeProperty
    td:queryAction
    td:readAllProperties
    td:readMultipleProperties
    td:readProperty
    td:subscribeAllEvents
    td:subscribeEvent
    td:unobserveAllProperties
    td:unobserveProperty
    td:unsubscribeAllEvents
    td:unsubscribeEvent
    td:writeAllProperties
    td:writeMultipleProperties
    td:writeProperty
    +

    OperationType

    IRI: https://www.w3.org/2019/wot/td#OperationType

    Enumeration of well-known operation types necessary to implement the WoT interaction model
    Enumeration memberstd:cancelAction
    td:invokeAction
    td:observeAllProperties
    td:observeProperty
    td:queryAction
    td:queryAllActions
    td:readAllProperties
    td:readMultipleProperties
    td:readProperty
    td:subscribeAllEvents
    td:subscribeEvent
    td:unobserveAllProperties
    td:unobserveProperty
    td:unsubscribeAllEvents
    td:unsubscribeEvent
    td:writeAllProperties
    td:writeMultipleProperties
    td:writeProperty

    PropertyAffordance

    IRI: https://www.w3.org/2019/wot/td#PropertyAffordance

    An Interaction Affordance that exposes state of the Thing. This state can then be retrieved (read) and optionally updated (write). Things can also choose to make Properties observable by pushing the new state after a change.
    Sub-class oftd:InteractionAffordance
    In the domain oftd:isObservable
    In the range oftd:hasPropertyAffordance

    Thing

    IRI: https://www.w3.org/2019/wot/td#Thing

    An abstraction of a physical or a virtual entity whose metadata and interfaces are described by a WoT Thing Description, whereas a virtual entity is the composition of one or more Things.
    In the domain oftd:hasForm
    td:hasInteractionAffordance
    td:hasSecurityConfiguration

    Object Properties

    hasActionAffordance

    IRI: https://www.w3.org/2019/wot/td#hasActionAffordance

    All Action-based interaction affordance of the Thing.
    Range includestd:ActionAffordance

    hasCancellationSchema

    IRI: https://www.w3.org/2019/wot/td#hasCancellationSchema

    Defines any data that needs to be passed to cancel a subscription, e.g., a specific message to remove a Webhook
    Domain includestd:EventAffordance
    @@ -123,6 +123,7 @@

    Terminology

    observeAllProperties

    IRI: https://www.w3.org/2019/wot/td#observeAllProperties

    Operation type of forms used to observe all property values
    Instance oftd:OperationType

    observeProperty

    IRI: https://www.w3.org/2019/wot/td#observeProperty

    Operation type of forms used to observe a property value
    Instance oftd:OperationType

    queryAction

    IRI: https://www.w3.org/2019/wot/td#queryAction

    Operation type of forms used to query the status of an action
    Instance oftd:OperationType
    +

    queryAllActions

    IRI: https://www.w3.org/2019/wot/td#queryAllActions

    Operation type of forms used to query the status of all actions
    Instance oftd:OperationType

    readAllProperties

    IRI: https://www.w3.org/2019/wot/td#readAllProperties

    Operation type of forms used to read all property values
    Instance oftd:OperationType

    readMultipleProperties

    IRI: https://www.w3.org/2019/wot/td#readMultipleProperties

    Operation type of forms used to read a property value
    Instance oftd:OperationType

    readProperty

    IRI: https://www.w3.org/2019/wot/td#readProperty

    Operation type of forms used to read a property value
    Instance oftd:OperationType
    diff --git a/ontology/td.ttl b/ontology/td.ttl index 028578a9d..36783dffd 100644 --- a/ontology/td.ttl +++ b/ontology/td.ttl @@ -249,7 +249,6 @@ rdfs:comment """Operation type of forms used to unobserve all property value"""@en ; rdfs:isDefinedBy : . - :invokeAction rdf:type :OperationType ; rdfs:label "invokeAction" ; rdfs:comment """Operation type of forms used to read a property value"""@en ; @@ -265,6 +264,11 @@ rdfs:comment """Operation type of forms used to cancel an action"""@en ; rdfs:isDefinedBy : . +:queryAllActions rdf:type :OperationType ; + rdfs:label "queryAllActions" ; + rdfs:comment """Operation type of forms used to query the status of all actions"""@en ; + rdfs:isDefinedBy : . + :subscribeEvent rdf:type :OperationType ; rdfs:label "subscribeEvent" ; rdfs:comment """Operation type of forms used to read a property value"""@en ; diff --git a/validation/ext-td-json-schema-validation.json b/validation/ext-td-json-schema-validation.json index 05e821ccf..d2116d7ef 100644 --- a/validation/ext-td-json-schema-validation.json +++ b/validation/ext-td-json-schema-validation.json @@ -521,6 +521,7 @@ "writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] @@ -536,6 +537,7 @@ "writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] diff --git a/validation/td-json-schema-validation.json b/validation/td-json-schema-validation.json index faca346ef..4f478e4c3 100644 --- a/validation/td-json-schema-validation.json +++ b/validation/td-json-schema-validation.json @@ -448,6 +448,7 @@ "writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] @@ -463,6 +464,7 @@ "writemultipleproperties", "observeallproperties", "unobserveallproperties", + "queryallactions", "subscribeallevents", "unsubscribeallevents" ] diff --git a/validation/td-validation.ttl b/validation/td-validation.ttl index b8308be6a..6a7cbf5ed 100644 --- a/validation/td-validation.ttl +++ b/validation/td-validation.ttl @@ -318,7 +318,8 @@ writeallproperties, readmultipleproperties, writemultipleproperties, observeallproperties, - unobserveallproperties, subscribeallevents, or + unobserveallproperties, queryallactions, + subscribeallevents, or unsubscribeallevents. (See an example for an usage of form in a Thing instance.)

    @@ -649,6 +650,7 @@ td:unobserveAllProperties td:subscribeAllEvents td:unsubscribeAllEvents + td:queryAllActions ); sh:datatype xsd:string ; sh:order 1 ;