From 3d06ee103ab4b2ba2d2eb77f8c8216baa837f965 Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Sun, 24 Jun 2018 16:20:05 -0700 Subject: [PATCH 01/10] changing Identity id from URI format to plain string --- .../experience/campaign/experienceevent.example.click.json | 4 ++-- schemas/context/experienceevent.example.1.json | 6 +++--- schemas/context/experienceevent.example.2.json | 2 +- schemas/context/experienceevent.example.3.json | 2 +- schemas/context/identity.example.1.json | 2 +- schemas/context/identity.example.2.json | 6 ++++++ schemas/context/identity.schema.json | 3 +-- schemas/context/profile.example.1.json | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 schemas/context/identity.example.2.json diff --git a/extensions/adobe/experience/campaign/experienceevent.example.click.json b/extensions/adobe/experience/campaign/experienceevent.example.click.json index fd5ea0e3ee..cce2ac4baa 100644 --- a/extensions/adobe/experience/campaign/experienceevent.example.click.json +++ b/extensions/adobe/experience/campaign/experienceevent.example.click.json @@ -8,14 +8,14 @@ "xdm:channel": "https://ns.adobe.com/xdm/channels/email", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "@id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" } }, "https://ns.adobe.com/experience/campaign": { - "@id": "https://data.adobe.io/entities/identity/1234567", + "xdm:id": "https://data.adobe.io/entities/identity/1234567", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/2756", "xdm:code": "CPGN" diff --git a/schemas/context/experienceevent.example.1.json b/schemas/context/experienceevent.example.1.json index 4aa7f31a51..480a2d3bc2 100644 --- a/schemas/context/experienceevent.example.1.json +++ b/schemas/context/experienceevent.example.1.json @@ -7,19 +7,19 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "@id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", "xdm:namespace": { "xdm:code": "ECID" } }, "https://ns.adobe.com/experience/aaid": { - "@id": "https://data.adobe.io/entities/identity/2394509340-30453470347", + "xdm:id": "https://data.adobe.io/entities/identity/2394509340-30453470347", "xdm:namespace": { "xdm:code": "AVID" } }, "https://ns.adobe.com/experience/tntid": { - "@id": + "xdm:id": "https://data.adobe.io/entities/identity/1233ce17-20e0-4a2c-8198-2a77fd60cf4d", "xdm:namespace": { "xdm:code": "tnt0051" diff --git a/schemas/context/experienceevent.example.2.json b/schemas/context/experienceevent.example.2.json index e62c2ca0cc..c43e917094 100644 --- a/schemas/context/experienceevent.example.2.json +++ b/schemas/context/experienceevent.example.2.json @@ -7,7 +7,7 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "@id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" diff --git a/schemas/context/experienceevent.example.3.json b/schemas/context/experienceevent.example.3.json index 61c8e47a57..cb680de47c 100644 --- a/schemas/context/experienceevent.example.3.json +++ b/schemas/context/experienceevent.example.3.json @@ -7,7 +7,7 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "@id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" diff --git a/schemas/context/identity.example.1.json b/schemas/context/identity.example.1.json index 3e33fe746b..2694b9881c 100644 --- a/schemas/context/identity.example.1.json +++ b/schemas/context/identity.example.1.json @@ -1,5 +1,5 @@ { - "@id": "https://data.adobe.io/entities/identity/id123", + "xdm:id": "https://data.adobe.io/entities/identity/id123", "xdm:namespace": { "xdm:code": "AA12345" } diff --git a/schemas/context/identity.example.2.json b/schemas/context/identity.example.2.json new file mode 100644 index 0000000000..6d4eb18486 --- /dev/null +++ b/schemas/context/identity.example.2.json @@ -0,0 +1,6 @@ +{ + "xdm:id": "ISBN13#978-0765382030", + "xdm:namespace": { + "xdm:code": "BOOKS" + } +} diff --git a/schemas/context/identity.schema.json b/schemas/context/identity.schema.json index 843bc8d6c4..f831e53404 100644 --- a/schemas/context/identity.schema.json +++ b/schemas/context/identity.schema.json @@ -15,10 +15,9 @@ "definitions": { "identity": { "properties": { - "@id": { + "xdm:id": { "title": "Identifier", "type": "string", - "format": "uri", "description": "Identity of the consumer in the related namespace." }, "xdm:namespace": { diff --git a/schemas/context/profile.example.1.json b/schemas/context/profile.example.1.json index 641ccb0efd..15a451db1a 100644 --- a/schemas/context/profile.example.1.json +++ b/schemas/context/profile.example.1.json @@ -1,7 +1,7 @@ { "xdm:identities": [ { - "@id": "https://data.adobe.io/entities/identity/id123", + "xdm:id": "https://data.adobe.io/entities/identity/id123", "xdm:namespace": { "xdm:code": "AA111" } From b5eeebb4450b598720a892b4d7f48315de4ed9ec Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:29:09 -0700 Subject: [PATCH 02/10] Update experienceevent.example.click.json --- .../experience/campaign/experienceevent.example.click.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/adobe/experience/campaign/experienceevent.example.click.json b/extensions/adobe/experience/campaign/experienceevent.example.click.json index cce2ac4baa..e7beeb8b21 100644 --- a/extensions/adobe/experience/campaign/experienceevent.example.click.json +++ b/extensions/adobe/experience/campaign/experienceevent.example.click.json @@ -8,14 +8,14 @@ "xdm:channel": "https://ns.adobe.com/xdm/channels/email", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" } }, "https://ns.adobe.com/experience/campaign": { - "xdm:id": "https://data.adobe.io/entities/identity/1234567", + "xdm:id": "1234567", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/2756", "xdm:code": "CPGN" From a493a28c3edd32e65288f69be9f70bd21072e25c Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:29:54 -0700 Subject: [PATCH 03/10] Update experienceevent.example.1.json --- schemas/context/experienceevent.example.1.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/context/experienceevent.example.1.json b/schemas/context/experienceevent.example.1.json index 480a2d3bc2..ae47e5b425 100644 --- a/schemas/context/experienceevent.example.1.json +++ b/schemas/context/experienceevent.example.1.json @@ -7,20 +7,20 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "92312748749128", "xdm:namespace": { "xdm:code": "ECID" } }, "https://ns.adobe.com/experience/aaid": { - "xdm:id": "https://data.adobe.io/entities/identity/2394509340-30453470347", + "xdm:id": "2394509340-30453470347", "xdm:namespace": { "xdm:code": "AVID" } }, "https://ns.adobe.com/experience/tntid": { "xdm:id": - "https://data.adobe.io/entities/identity/1233ce17-20e0-4a2c-8198-2a77fd60cf4d", + "1233ce17-20e0-4a2c-8198-2a77fd60cf4d", "xdm:namespace": { "xdm:code": "tnt0051" } From acbac04c2ac38a1edce8ed5b52783cdd888eea10 Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:30:17 -0700 Subject: [PATCH 04/10] Update experienceevent.example.2.json --- schemas/context/experienceevent.example.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/context/experienceevent.example.2.json b/schemas/context/experienceevent.example.2.json index c43e917094..eb86db7dcd 100644 --- a/schemas/context/experienceevent.example.2.json +++ b/schemas/context/experienceevent.example.2.json @@ -7,7 +7,7 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" From 72ff30bcfbcfc31aa7abc2dd4b434c8086c71e5a Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:30:34 -0700 Subject: [PATCH 05/10] Update experienceevent.example.3.json --- schemas/context/experienceevent.example.3.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/context/experienceevent.example.3.json b/schemas/context/experienceevent.example.3.json index cb680de47c..b7ec331c0c 100644 --- a/schemas/context/experienceevent.example.3.json +++ b/schemas/context/experienceevent.example.3.json @@ -7,7 +7,7 @@ "xdm:timestamp": "2017-09-26T15:52:25+00:00", "xdm:endUserIDs": { "https://ns.adobe.com/experience/mcid": { - "xdm:id": "https://data.adobe.io/entities/identity/92312748749128", + "xdm:id": "92312748749128", "xdm:namespace": { "@id": "https://data.adobe.io/entities/namespace/4", "xdm:code": "ECID" From 8477808fbaa24a59f8d9797e1679dfa012bdffa7 Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:32:03 -0700 Subject: [PATCH 06/10] Update profile.example.1.json --- schemas/context/profile.example.1.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/schemas/context/profile.example.1.json b/schemas/context/profile.example.1.json index 15a451db1a..9317001e23 100644 --- a/schemas/context/profile.example.1.json +++ b/schemas/context/profile.example.1.json @@ -5,6 +5,12 @@ "xdm:namespace": { "xdm:code": "AA111" } + }, + { + "xdm:id": "123-456", + "xdm:namespace": { + "xdm:code": "BB111" + } } ], "xdm:person": { From 9f7b2f9f6aa0864380bb1715c7f7b391e947f483 Mon Sep 17 00:00:00 2001 From: Kevin Streeter Date: Tue, 26 Jun 2018 12:32:32 -0700 Subject: [PATCH 07/10] Update identity.example.1.json --- schemas/context/identity.example.1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/context/identity.example.1.json b/schemas/context/identity.example.1.json index 2694b9881c..e5a73ac312 100644 --- a/schemas/context/identity.example.1.json +++ b/schemas/context/identity.example.1.json @@ -1,5 +1,5 @@ { - "xdm:id": "https://data.adobe.io/entities/identity/id123", + "xdm:id": "id123", "xdm:namespace": { "xdm:code": "AA12345" } From 4a5e62268148b11a3dc1796aebc67c5d2e3429f2 Mon Sep 17 00:00:00 2001 From: cdegroot-adobe Date: Thu, 12 Jul 2018 18:59:43 -0400 Subject: [PATCH 08/10] Updated Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5606b4c6f5..0f6799a090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,3 +53,5 @@ ## Release 0.9.3 [Planned for June 29, 2018](https://github.com/adobe/xdm/releases/tag/v0.9.3) + +* Change `Identity` Schema `@id` property renamed to `xdm:id` #420 From 5dc5cc99cb7222175c6a619f8a0be0ef026bcd8d Mon Sep 17 00:00:00 2001 From: cdegroot-adobe Date: Fri, 13 Jul 2018 10:24:32 -0400 Subject: [PATCH 09/10] Improved example to use a endUser case. --- schemas/context/identity.example.2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/context/identity.example.2.json b/schemas/context/identity.example.2.json index 6d4eb18486..f00b097945 100644 --- a/schemas/context/identity.example.2.json +++ b/schemas/context/identity.example.2.json @@ -1,6 +1,6 @@ { - "xdm:id": "ISBN13#978-0765382030", + "xdm:id": "someone@example.com", "xdm:namespace": { - "xdm:code": "BOOKS" + "xdm:code": "Email" } } From 24c6d7d2ed6b5556b50e28934e5a7bec3b5f8d1f Mon Sep 17 00:00:00 2001 From: cdegroot-adobe Date: Fri, 13 Jul 2018 10:26:26 -0400 Subject: [PATCH 10/10] Simplified Identity example, before it contained a URL and this is a contencious topic. --- schemas/context/profile.example.1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/context/profile.example.1.json b/schemas/context/profile.example.1.json index 9317001e23..3bd562a254 100644 --- a/schemas/context/profile.example.1.json +++ b/schemas/context/profile.example.1.json @@ -1,9 +1,9 @@ { "xdm:identities": [ { - "xdm:id": "https://data.adobe.io/entities/identity/id123", + "xdm:id": "someone@example.com", "xdm:namespace": { - "xdm:code": "AA111" + "xdm:code": "Email" } }, {