Merge pull request #81 from casework/uco-issue-393

(UCO Issue 393) Update message.json to use CO instead of OLO
casework · Jul 22, 2022 · 4b0c90a · 4b0c90a
2 parents 1113eed + 81095d1
commit 4b0c90a
Showing 1 changed file with 69 additions and 21 deletions.
diff --git 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": [
@@ -154,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"
@@ -165,25 +168,60 @@
                             "@id": "kb:message3"
                         }
                     ],
-                    "draft:visibility": "PRIVATE",
-                    "messages": {
-                        "olo:length": 3,
-                        "olo:slot": [
+                    "uco-observable:messageThread": {
+                        "@type": "uco-types:Thread",
+                        "co:size": {
+                            "@type": "xsd:nonNegativeInteger",
+                            "@value": "3"
+                        },
+                        "co:element": [
+                            {
+                                "@id": "kb:message1"
+                            },
+                            {
+                                "@id": "kb:message2"
+                            },
+                            {
+                                "@id": "kb:message3"
+                            }
+                        ],
+                        "co:item": [
                             {
-                                "olo:index": 1,
-                                "olo:item": {
+                                "@id": "kb:thread-item-32450b5a-bb4d-4c12-9435-ab00b25aa7b8",
+                                "@type": "uco-types:ThreadItem",
+                                "co:index": {
+                                    "@type": "xsd:positiveInteger",
+                                    "@value": "1"
+                                },
+                                "co:itemContent": {
                                     "@id": "kb:message1"
+                                },
+                                "uco-types:threadNextItem": {
+                                    "@id": "kb:thread-item-34eb880e-8ce6-4bc1-a78f-cc95653c11a2"
                                 }
                             },
                             {
-                                "olo:index": 2,
-                                "olo:item": {
+                                "@id": "kb:thread-item-34eb880e-8ce6-4bc1-a78f-cc95653c11a2",
+                                "@type": "uco-types:ThreadItem",
+                                "co:index": {
+                                    "@type": "xsd:positiveInteger",
+                                    "@value": "2"
+                                },
+                                "co:itemContent": {
                                     "@id": "kb:message2"
+                                },
+                                "uco-types:threadNextItem": {
+                                    "@id": "kb:thread-item-ffbf758a-b71f-4185-9f0f-9b6cb649da87"
                                 }
                             },
                             {
-                                "olo:index": 3,
-                                "olo:item": {
+                                "@id": "kb:thread-item-ffbf758a-b71f-4185-9f0f-9b6cb649da87",
+                                "@type": "uco-types:ThreadItem",
+                                "co:index": {
+                                    "@type": "xsd:positiveInteger",
+                                    "@value": "3"
+                                },
+                                "co:itemContent": {
                                     "@id": "kb:message3"
                                 }
                             }
@@ -208,18 +246,28 @@
                     "@type": "uco-observable:MessageThreadFacet",
                     "identifier": "twitter_public",
                     "uco-observable:displayName": "Argle-bargle",
-                    "uco-observable:message": [
-                        {
-                            "@id": "kb:post1"
-                        }
-                    ],
                     "draft:visibility": "PUBLIC",
-                    "messages": {
-                        "olo:length": 1,
-                        "olo:slot": [
+                    "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": {
+                            "@type": "xsd:nonNegativeInteger",
+                            "@value": "1"
+                        },
+                        "co:element": {
+                            "@id": "kb:post1"
+                        },
+                        "co:item": [
                             {
-                                "olo:index": 1,
-                                "olo:item": {
+                                "@type": "uco-types:ThreadItem",
+                                "co:index": {
+                                    "@type": "xsd:positiveInteger",
+                                    "@value": "1"
+                                },
+                                "co:itemContent": {
                                     "@id": "kb:post1"
                                 }
                             }