added support for version 0.3

Signed-off-by: Clemens Vasters <[email protected]>

Author: Clemens Vasters

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests/bin/Debug/netcoreapp2.1/CloudNative.CloudEvents.UnitTests.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests",
+            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ,]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests/CloudNative.CloudEvents.UnitTests.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

CloudEvents.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=datacontentencoding/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

samples/HttpSend/Program.cs

@@ -32,7 +32,7 @@ async Task OnExecuteAsync()
         {
             var cloudEvent = new CloudEvent(this.Type, new Uri(this.Source))
             {
-                ContentType = new ContentType(MediaTypeNames.Application.Json),
+                DataContentType = new ContentType(MediaTypeNames.Application.Json),
                 Data = JsonConvert.SerializeObject("hey there!")
             };
 

src/CloudNative.CloudEvents.Amqp/AmqpClientExtensions.cs

@@ -68,8 +68,10 @@ public static CloudEvent ToCloudEvent(this Message message,
                         ? CloudEventsSpecVersion.V0_1
                         : message.ApplicationProperties.Map.ContainsKey(SpecVersionAmqpHeader2)
                             ? (message.ApplicationProperties.Map[SpecVersionAmqpHeader2] as string == "0.2"
-                                ? CloudEventsSpecVersion.V0_2
-                                : CloudEventsSpecVersion.Default)
+                                ? CloudEventsSpecVersion.V0_2 :
+                                (message.ApplicationProperties.Map[SpecVersionAmqpHeader2] as string == "0.3"
+                                    ? CloudEventsSpecVersion.V0_3
+                                : CloudEventsSpecVersion.Default))
                             : CloudEventsSpecVersion.Default, extensions);
                 var attributes = cloudEvent.GetAttributes();
                 foreach (var prop in message.ApplicationProperties.Map)
@@ -96,7 +98,7 @@ public static CloudEvent ToCloudEvent(this Message message,
                     }
                 }
 
-                cloudEvent.ContentType = message.Properties.ContentType != null
+                cloudEvent.DataContentType = message.Properties.ContentType != null
                     ? new ContentType(message.Properties.ContentType)
                     : null;
                 cloudEvent.Data = message.Body;

src/CloudNative.CloudEvents.Amqp/AmqpCloudEventMessage.cs

@@ -47,7 +47,7 @@ public AmqpCloudEventMessage(CloudEvent cloudEvent, ContentMode contentMode, ICl
                 this.BodySection = new AmqpValue() { Value = cloudEvent.Data };
             }
 
-            this.Properties = new Properties() { ContentType = cloudEvent.ContentType?.MediaType };
+            this.Properties = new Properties() { ContentType = cloudEvent.DataContentType?.MediaType };
             this.ApplicationProperties = new ApplicationProperties();
             MapHeaders(cloudEvent);
         }
@@ -57,7 +57,7 @@ void MapHeaders(CloudEvent cloudEvent)
             foreach (var attribute in cloudEvent.GetAttributes())
             {
                 if (!attribute.Key.Equals(CloudEventAttributes.DataAttributeName(cloudEvent.SpecVersion)) &&
-                    !attribute.Key.Equals(CloudEventAttributes.ContentTypeAttributeName(cloudEvent.SpecVersion)))
+                    !attribute.Key.Equals(CloudEventAttributes.DataContentTypeAttributeName(cloudEvent.SpecVersion)))
                 {
                     if (attribute.Value is Uri)
                     {

src/CloudNative.CloudEvents/CloudEvent.cs

@@ -26,7 +26,7 @@ public class CloudEvent
         /// <param name="time">'time' of the CloudEvent</param>
         /// <param name="extensions">Extensions to be added to this CloudEvents</param>
         public CloudEvent(string type, Uri source, string id = null, DateTime? time = null,
-            params ICloudEventExtension[] extensions) : this(CloudEventsSpecVersion.V0_2, type, source, id, time, extensions)
+            params ICloudEventExtension[] extensions) : this(CloudEventsSpecVersion.Default, type, source, id, time, extensions)
         {
         }
 
@@ -48,6 +48,22 @@ public CloudEvent(CloudEventsSpecVersion specVersion, string type, Uri source, s
             Time = time ?? DateTime.UtcNow;
         }
 
+        /// <summary>
+        /// Create a new CloudEvent instance.
+        /// </summary>
+        /// <param name="specVersion">CloudEvents specification version</param>
+        /// <param name="type">'type' of the CloudEvent</param>
+        /// <param name="source">'source' of the CloudEvent</param>
+        /// <param name="subject">'subject' of the CloudEvent</param>
+        /// <param name="id">'id' of the CloudEvent</param>
+        /// <param name="time">'time' of the CloudEvent</param>
+        /// <param name="extensions">Extensions to be added to this CloudEvents</param>
+        public CloudEvent(CloudEventsSpecVersion specVersion, string type, Uri source, string subject, string id = null, DateTime? time = null,
+            params ICloudEventExtension[] extensions) : this(specVersion, type, source, id, time, extensions)
+        {
+            Subject = subject;
+        }
+
         /// <summary>
         /// Create a new CloudEvent instance
         /// </summary>
@@ -68,15 +84,32 @@ internal CloudEvent(CloudEventsSpecVersion specVersion, IEnumerable<ICloudEventE
         }
 
         /// <summary>
-        /// CloudEvent 'contenttype' attribute. Content type of the 'data' attribute value.
+        /// CloudEvent 'datacontenttype' attribute. Content type of the 'data' attribute value.
         /// This attribute enables the data attribute to carry any type of content, whereby
         /// format and encoding might differ from that of the chosen event format.
         /// </summary>
-        /// <see cref="https://github.com/cloudevents/spec/blob/master/spec.md#contenttype"/>
+        /// <see cref="https://github.com/cloudevents/spec/blob/master/spec.md#datacontenttype"/>
+        public ContentType DataContentType
+        {
+            get => attributes[CloudEventAttributes.DataContentTypeAttributeName(attributes.SpecVersion)] as ContentType;
+            set => attributes[CloudEventAttributes.DataContentTypeAttributeName(attributes.SpecVersion)] = value;
+        }
+
+        /// <summary>
+        /// CloudEvent 'datacontentencoding' attribute.
+        /// </summary>
+        /// <see cref="https://github.com/cloudevents/spec/blob/master/spec.md#datacontentencoding"/>
+        public string DataContentEncoding
+        {
+            get => attributes[CloudEventAttributes.DataContentEncodingAttributeName(attributes.SpecVersion)] as string;
+            set => attributes[CloudEventAttributes.DataContentEncodingAttributeName(attributes.SpecVersion)] = value;
+        }
+
+        [Obsolete("Cloud events 0.1 and 0.2 name replaced by 'DataContentType1'. Will be removed in an upcoming release.")]
         public ContentType ContentType
         {
-            get => attributes[CloudEventAttributes.ContentTypeAttributeName(attributes.SpecVersion)] as ContentType;
-            set => attributes[CloudEventAttributes.ContentTypeAttributeName(attributes.SpecVersion)] = value;
+            get => DataContentType;
+            set => DataContentType = value;
         }
 
         /// <summary>
@@ -119,6 +152,16 @@ public Uri SchemaUrl
             set => attributes[CloudEventAttributes.SchemaUrlAttributeName(attributes.SpecVersion)] = value;
         }
 
+        /// <summary>
+        /// CloudEvents 'subject' attribute. 
+        /// </summary>
+        /// <see cref="https://github.com/cloudevents/spec/blob/master/spec.md#subject"/>
+        public string Subject
+        {
+            get => attributes[CloudEventAttributes.SubjectAttributeName(attributes.SpecVersion)] as string;
+            set => attributes[CloudEventAttributes.SubjectAttributeName(attributes.SpecVersion)] = value;
+        }
+
         /// <summary>
         /// CloudEvents 'source' attribute. This describes the event producer. Often this
         /// will include information such as the type of the event source, the

src/CloudNative.CloudEvents/CloudEventAttributes.cs

@@ -25,7 +25,9 @@ internal CloudEventAttributes(CloudEventsSpecVersion specVersion, IEnumerable<IC
         {
             this.extensions = extensions;
             this.specVersion = specVersion;
-            dict[SpecVersionAttributeName(specVersion)] = specVersion == CloudEventsSpecVersion.V0_1 ? "0.1" : "0.2";
+            dict[SpecVersionAttributeName(specVersion)] =
+                specVersion == CloudEventsSpecVersion.V0_1 ? "0.1" :
+                specVersion == CloudEventsSpecVersion.V0_2 ? "0.2" : "0.3";
         }
 
         int ICollection<KeyValuePair<string, object>>.Count => dict.Count;
@@ -42,9 +44,12 @@ public CloudEventsSpecVersion SpecVersion
             {
                 object val;
                 if (dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_1), out val) ||
-                    dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_2), out val))
+                    dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_2), out val) ||
+                    dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_3), out val))
                 {
-                    return (val as string) == "0.1" ? CloudEventsSpecVersion.V0_1 : CloudEventsSpecVersion.V0_2;
+                    return (val as string) == "0.1" ? CloudEventsSpecVersion.V0_1 :
+                        (val as string) == "0.2" ? CloudEventsSpecVersion.V0_2 :
+                        CloudEventsSpecVersion.V0_3;
                 }
 
                 return CloudEventsSpecVersion.Default;
@@ -60,27 +65,40 @@ public CloudEventsSpecVersion SpecVersion
                         return;
                     }
                 }
-                else if ( dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_2), out val))
+                else if (dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_2), out val))
                 {
                     if (value == CloudEventsSpecVersion.V0_2 && (val as string) == "0.2")
                     {
                         return;
                     }
                 }
+                else if (dict.TryGetValue(SpecVersionAttributeName(CloudEventsSpecVersion.V0_3), out val))
+                {
+                    if (value == CloudEventsSpecVersion.V0_3 && (val as string) == "0.3")
+                    {
+                        return;
+                    }
+                }
 
                 // transform to new version
                 var copy = new Dictionary<string, object>(dict);
                 dict.Clear();
-                dict[SpecVersionAttributeName(value)] = value == CloudEventsSpecVersion.V0_1 ? "0.1" : "0.2";
+                dict[SpecVersionAttributeName(value)] =
+                    value == CloudEventsSpecVersion.V0_1 ? "0.1" :
+                    value == CloudEventsSpecVersion.V0_2 ? "0.2" : "0.3";
                 foreach (var kv in copy)
                 {
                     if (SpecVersionAttributeName(currentSpecVersion).Equals(kv.Key))
                     {
                         continue;
                     }
-                    if (ContentTypeAttributeName(currentSpecVersion).Equals(kv.Key))
+                    if (DataContentTypeAttributeName(currentSpecVersion).Equals(kv.Key))
+                    {
+                        dict[DataContentTypeAttributeName(value)] = kv.Value;
+                    }
+                    if (DataContentEncodingAttributeName(currentSpecVersion).Equals(kv.Key))
                     {
-                        dict[ContentTypeAttributeName(value)] = kv.Value;
+                        dict[DataContentEncodingAttributeName(value)] = kv.Value;
                     }
                     else if (DataAttributeName(currentSpecVersion).Equals(kv.Key))
                     {
@@ -98,6 +116,10 @@ public CloudEventsSpecVersion SpecVersion
                     {
                         dict[SourceAttributeName(value)] = kv.Value;
                     }
+                    else if (SubjectAttributeName(currentSpecVersion).Equals(kv.Key))
+                    {
+                        dict[SubjectAttributeName(value)] = kv.Value;
+                    }
                     else if (TimeAttributeName(currentSpecVersion).Equals(kv.Key))
                     {
                         dict[TimeAttributeName(value)] = kv.Value;
@@ -110,7 +132,7 @@ public CloudEventsSpecVersion SpecVersion
                     {
                         dict[kv.Key] = kv.Value;
                     }
-                }              
+                }
             }
         }
 
@@ -124,9 +146,16 @@ public object this[string key]
             }
         }
 
-        public static string ContentTypeAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
+        public static string DataContentTypeAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
         {
-            return version == CloudEventsSpecVersion.V0_1 ? "contentType" : "contenttype";
+            return version == CloudEventsSpecVersion.V0_1 ? "contentType" : 
+                   version == CloudEventsSpecVersion.V0_2 ? "contenttype" : 
+                   "datacontenttype";
+        }
+
+        public static string DataContentEncodingAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
+        {
+            return "datacontentencoding";
         }
 
         public static string DataAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
@@ -149,6 +178,11 @@ public static string SourceAttributeName(CloudEventsSpecVersion version = CloudE
             return "source";
         }
 
+        public static string SubjectAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
+        {
+            return "subject";
+        }
+
         public static string SpecVersionAttributeName(CloudEventsSpecVersion version = CloudEventsSpecVersion.Default)
         {
             return version == CloudEventsSpecVersion.V0_1 ? "cloudEventsVersion" : "specversion";
@@ -288,6 +322,15 @@ internal virtual bool ValidateAndNormalize(string key, ref object value)
 
                 throw new InvalidOperationException(Strings.ErrorSchemaUrlIsNotAUri);
             }
+            else if (key.Equals(SubjectAttributeName(this.SpecVersion)))
+            {
+                if (value is null || value is string)
+                {
+                    return true;
+                }
+
+                throw new InvalidOperationException(Strings.ErrorSchemaUrlIsNotAUri);
+            }
             else if (key.Equals(SchemaUrlAttributeName(this.SpecVersion)))
             {
                 if (value is null || value is Uri)
@@ -306,7 +349,7 @@ internal virtual bool ValidateAndNormalize(string key, ref object value)
 
                 throw new InvalidOperationException(Strings.ErrorSchemaUrlIsNotAUri);
             }
-            else if (key.Equals(ContentTypeAttributeName(this.SpecVersion)))
+            else if (key.Equals(DataContentTypeAttributeName(this.SpecVersion)))
             {
                 if (value is null || value is ContentType)
                 {
@@ -328,6 +371,14 @@ internal virtual bool ValidateAndNormalize(string key, ref object value)
 
                 throw new InvalidOperationException(Strings.ErrorContentTypeIsNotRFC2046);
             }
+            else if (key.Equals(DataContentEncodingAttributeName(this.SpecVersion)))
+            {
+                if (value is null || value is string)
+                {
+                    return true;
+                }
+                throw new InvalidOperationException(Strings.ErrorDataContentEncodingIsNotAString);
+            }
             else if (key.Equals(DataAttributeName(this.SpecVersion)))
             {
                 return true;

src/CloudNative.CloudEvents/CloudEventContent.cs

@@ -55,7 +55,7 @@ public CloudEventContent(CloudEvent cloudEvent, ContentMode contentMode, ICloudE
                     cloudEvent.Data, cloudEvent.Extensions.Values));
             }
 
-            Headers.ContentType = new MediaTypeHeaderValue(cloudEvent.ContentType?.MediaType);
+            Headers.ContentType = new MediaTypeHeaderValue(cloudEvent.DataContentType?.MediaType);
             MapHeaders(cloudEvent);
         }
 
@@ -80,7 +80,7 @@ void MapHeaders(CloudEvent cloudEvent)
             foreach (var attribute in cloudEvent.GetAttributes())
             {
                 if (!(attribute.Key.Equals(CloudEventAttributes.DataAttributeName(cloudEvent.SpecVersion)) ||
-                      attribute.Key.Equals(CloudEventAttributes.ContentTypeAttributeName(cloudEvent.SpecVersion))))
+                      attribute.Key.Equals(CloudEventAttributes.DataContentTypeAttributeName(cloudEvent.SpecVersion))))
                 {
                     if (attribute.Value is string)
                     {

src/CloudNative.CloudEvents/CloudEventsSpecVersion.cs

@@ -8,6 +8,7 @@ public enum CloudEventsSpecVersion
     {
         V0_1,
         V0_2,
-        Default = V0_2
+        V0_3,
+        Default = V0_3
     }
 }