From aa4a980d7fc53787f190a7aa480146aa483158a9 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 30 Jun 2022 09:50:06 -0400 Subject: [PATCH 1/4] Update message example to use CO instead of OLO This is the minimal set of changes needed to confirm conformace with the current state of UCO Issue 393's implementation. A follow-on patch will add list ordering. No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/393 Signed-off-by: Alex Nelson --- examples/illustrations/message/message.json | 37 ++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index 15386971..c2d88456 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -3,11 +3,12 @@ "@vocab": "http://example.org/local#", "kb": "http://example.org/kb/", "draft": "http://example.org/draft#", - "olo": "http://purl.org/ontology/olo/core#", + "co": "http://purl.org/co/", "uco-core": "https://ontology.unifiedcyberontology.org/uco/core/", "uco-identity": "https://ontology.unifiedcyberontology.org/uco/identity/", "uco-location": "https://ontology.unifiedcyberontology.org/uco/location/", "uco-observable": "https://ontology.unifiedcyberontology.org/uco/observable/", + "uco-types": "https://ontology.unifiedcyberontology.org/uco/types/", "xsd": "http://www.w3.org/2001/XMLSchema#" }, "@graph": [ @@ -166,24 +167,28 @@ } ], "draft:visibility": "PRIVATE", - "messages": { - "olo:length": 3, - "olo:slot": [ + "uco-observable:messageThread": { + "@type": "uco-types:Thread", + "co:size": 3, + "co:item": [ { - "olo:index": 1, - "olo:item": { + "@type": "uco-types:ThreadItem", + "co:index": 1, + "co:itemContent": { "@id": "kb:message1" } }, { - "olo:index": 2, - "olo:item": { + "@type": "uco-types:ThreadItem", + "co:index": 2, + "co:itemContent": { "@id": "kb:message2" } }, { - "olo:index": 3, - "olo:item": { + "@type": "uco-types:ThreadItem", + "co:index": 3, + "co:itemContent": { "@id": "kb:message3" } } @@ -214,12 +219,14 @@ } ], "draft:visibility": "PUBLIC", - "messages": { - "olo:length": 1, - "olo:slot": [ + "uco-observable:messageThread": { + "@type": "uco-types:Thread", + "co:size": 1, + "co:item": [ { - "olo:index": 1, - "olo:item": { + "@type": "uco-types:ThreadItem", + "co:index": 1, + "co:itemContent": { "@id": "kb:post1" } } From d52cca30142f4d5b669edb659248943ab6f28c30 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 30 Jun 2022 09:54:06 -0400 Subject: [PATCH 2/4] Add thread ordering No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/393 Signed-off-by: Alex Nelson --- examples/illustrations/message/message.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index c2d88456..fe6907e4 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -172,20 +172,29 @@ "co:size": 3, "co:item": [ { + "@id": "kb:thread-item-32450b5a-bb4d-4c12-9435-ab00b25aa7b8", "@type": "uco-types:ThreadItem", "co:index": 1, "co:itemContent": { "@id": "kb:message1" + }, + "uco-types:threadNextItem": { + "@id": "kb:thread-item-34eb880e-8ce6-4bc1-a78f-cc95653c11a2" } }, { + "@id": "kb:thread-item-34eb880e-8ce6-4bc1-a78f-cc95653c11a2", "@type": "uco-types:ThreadItem", "co:index": 2, "co:itemContent": { "@id": "kb:message2" + }, + "uco-types:threadNextItem": { + "@id": "kb:thread-item-ffbf758a-b71f-4185-9f0f-9b6cb649da87" } }, { + "@id": "kb:thread-item-ffbf758a-b71f-4185-9f0f-9b6cb649da87", "@type": "uco-types:ThreadItem", "co:index": 3, "co:itemContent": { From d073078f39a203f9de93d2c1a57cd85103bfa6ef Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 21 Jul 2022 21:34:46 -0400 Subject: [PATCH 3/4] Supplement observable:message with co:element `observable:message` will be deleted in UCO 0.10.0. This patch prepares its unordered replacement property, `co:element`. A follow-on patch will regenerate Make-managed files. References: https://github.com/ucoProject/UCO/issues/393 Signed-off-by: Alex Nelson --- examples/illustrations/message/message.json | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index fe6907e4..a5e304c7 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -155,6 +155,8 @@ "@type": "uco-observable:MessageThreadFacet", "identifier": "billy~sarah@whatsapp.gs.net", "uco-observable:displayName": "Best Friend Chat!!", + "draft:visibility": "PRIVATE", + "rdfs:comment": "TODO: On release of UCO 0.10.0, remove uco-observable:message.", "uco-observable:message": [ { "@id": "kb:message1" @@ -166,10 +168,20 @@ "@id": "kb:message3" } ], - "draft:visibility": "PRIVATE", "uco-observable:messageThread": { "@type": "uco-types:Thread", "co:size": 3, + "co:element": [ + { + "@id": "kb:message1" + }, + { + "@id": "kb:message2" + }, + { + "@id": "kb:message3" + } + ], "co:item": [ { "@id": "kb:thread-item-32450b5a-bb4d-4c12-9435-ab00b25aa7b8", @@ -222,15 +234,17 @@ "@type": "uco-observable:MessageThreadFacet", "identifier": "twitter_public", "uco-observable:displayName": "Argle-bargle", - "uco-observable:message": [ - { - "@id": "kb:post1" - } - ], "draft:visibility": "PUBLIC", + "rdfs:comment": "TODO: On release of UCO 0.10.0, remove uco-observable:message.", + "uco-observable:message": { + "@id": "kb:post1" + }, "uco-observable:messageThread": { "@type": "uco-types:Thread", "co:size": 1, + "co:element": { + "@id": "kb:post1" + }, "co:item": [ { "@type": "uco-types:ThreadItem", From 81095d1af5ad48e8e1f23175a36e07cf23e1fd41 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Thu, 21 Jul 2022 21:43:26 -0400 Subject: [PATCH 4/4] Use datatypes required by CO Effects were observed on Make-managed files from the prior patch were removed by this patch. References: https://github.com/ucoProject/UCO/issues/389 Signed-off-by: Alex Nelson --- examples/illustrations/message/message.json | 30 ++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/examples/illustrations/message/message.json b/examples/illustrations/message/message.json index a5e304c7..448382b3 100644 --- a/examples/illustrations/message/message.json +++ b/examples/illustrations/message/message.json @@ -170,7 +170,10 @@ ], "uco-observable:messageThread": { "@type": "uco-types:Thread", - "co:size": 3, + "co:size": { + "@type": "xsd:nonNegativeInteger", + "@value": "3" + }, "co:element": [ { "@id": "kb:message1" @@ -186,7 +189,10 @@ { "@id": "kb:thread-item-32450b5a-bb4d-4c12-9435-ab00b25aa7b8", "@type": "uco-types:ThreadItem", - "co:index": 1, + "co:index": { + "@type": "xsd:positiveInteger", + "@value": "1" + }, "co:itemContent": { "@id": "kb:message1" }, @@ -197,7 +203,10 @@ { "@id": "kb:thread-item-34eb880e-8ce6-4bc1-a78f-cc95653c11a2", "@type": "uco-types:ThreadItem", - "co:index": 2, + "co:index": { + "@type": "xsd:positiveInteger", + "@value": "2" + }, "co:itemContent": { "@id": "kb:message2" }, @@ -208,7 +217,10 @@ { "@id": "kb:thread-item-ffbf758a-b71f-4185-9f0f-9b6cb649da87", "@type": "uco-types:ThreadItem", - "co:index": 3, + "co:index": { + "@type": "xsd:positiveInteger", + "@value": "3" + }, "co:itemContent": { "@id": "kb:message3" } @@ -241,14 +253,20 @@ }, "uco-observable:messageThread": { "@type": "uco-types:Thread", - "co:size": 1, + "co:size": { + "@type": "xsd:nonNegativeInteger", + "@value": "1" + }, "co:element": { "@id": "kb:post1" }, "co:item": [ { "@type": "uco-types:ThreadItem", - "co:index": 1, + "co:index": { + "@type": "xsd:positiveInteger", + "@value": "1" + }, "co:itemContent": { "@id": "kb:post1" }