Update databus custom serializer sample

kentdr · kentdr · commit 76ab4b1555cb · 2024-08-29T10:27:03.000-04:00
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/ClaimCheck.sln b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/ClaimCheck.sln
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/MessageWithLargePayloadHandler.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/MessageWithLargePayloadHandler.cs
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/Program.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/Program.cs
@@ -3,19 +3,20 @@
 using System;
 using System.Text.Json;
 using System.Threading.Tasks;
+using NServiceBus.ClaimCheck;
 
 class Program
 {
     static async Task Main()
     {
         Console.Title = "Receiver";
         var endpointConfiguration = new EndpointConfiguration("Samples.DataBus.Receiver");
-        var dataBus = endpointConfiguration.UseDataBus<FileShareDataBus, SystemJsonDataBusSerializer>();
-        dataBus.BasePath(@"..\..\..\..\storage");
+        var claimCheck = endpointConfiguration.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>();
+        claimCheck.BasePath(@"..\..\..\..\storage");
 
         //CustomJsonSerializerOptions
         var jsonSerializerOptions = new JsonSerializerOptions();
-        jsonSerializerOptions.Converters.Add(new DatabusPropertyConverterFactory());
+        jsonSerializerOptions.Converters.Add(new ClaimCheckPropertyConverterFactory());
         endpointConfiguration.UseSerialization<SystemJsonSerializer>().Options(jsonSerializerOptions);
 
         endpointConfiguration.UseTransport(new LearningTransport());
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/Receiver.csproj b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Receiver/Receiver.csproj
@@ -5,7 +5,7 @@
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="1.*" />
+    <PackageReference Include="NServiceBus.ClaimCheck" Version="1.0.0-alpha.1" />
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Sender/Program.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Sender/Program.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Text.Json;
 using System.Threading.Tasks;
+using NServiceBus.ClaimCheck;
 
 class Program
 {
@@ -13,14 +14,14 @@ static async Task Main()
 
         #region ConfigureDataBus
 
-        var dataBus = endpointConfiguration.UseDataBus<FileShareDataBus, SystemJsonDataBusSerializer>();
-        dataBus.BasePath(@"..\..\..\..\storage");
+        var claimCheck = endpointConfiguration.UseClaimCheck<FileShareClaimCheck, SystemJsonClaimCheckSerializer>();
+        claimCheck.BasePath(@"..\..\..\..\storage");
 
         #endregion
 
         #region CustomJsonSerializerOptions
         var jsonSerializerOptions = new JsonSerializerOptions();
-        jsonSerializerOptions.Converters.Add(new DatabusPropertyConverterFactory());
+        jsonSerializerOptions.Converters.Add(new ClaimCheckPropertyConverterFactory());
         endpointConfiguration.UseSerialization<SystemJsonSerializer>().Options(jsonSerializerOptions);
         #endregion
 
@@ -51,7 +52,7 @@ static async Task SendMessageLargePayload(IEndpointInstance endpointInstance)
         var message = new MessageWithLargePayload
         {
             SomeProperty = "This message contains a large blob that will be sent on the data bus",
-            LargeBlob = new DataBusProperty<byte[]>(new byte[1024*1024*5]) //5MB
+            LargeBlob = new ClaimCheckProperty<byte[]>(new byte[1024*1024*5]) //5MB
         };
         await endpointInstance.Send("Samples.DataBus.Receiver", message);
 
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Sender/Sender.csproj b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Sender/Sender.csproj
@@ -5,7 +5,7 @@
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="1.*" />
+    <PackageReference Include="NServiceBus.ClaimCheck" Version="1.0.0-alpha.1" />
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/DatabusPropertyConverter.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/DatabusPropertyConverter.cs
@@ -1,31 +1,28 @@
 ﻿using NServiceBus;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using NServiceBus.ClaimCheck;
 
 namespace Shared
 {
     #region DatabusPropertyConverter
-    public class DatabusPropertyConverter<T> : JsonConverter<DataBusProperty<T>> where T : class
+    public class ClaimCheckPropertyConverter<T> : JsonConverter<ClaimCheckProperty<T>> where T : class
     {
-        public DatabusPropertyConverter(JsonSerializerOptions options)
+        public ClaimCheckPropertyConverter(JsonSerializerOptions options)
         {
 
         }
-        public override DataBusProperty<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public override ClaimCheckProperty<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             var sdp = JsonSerializer.Deserialize<SerializableDatabusProperty>(reader.GetString());
-            DataBusProperty<T> databusProp = new DataBusProperty<T>();
+            ClaimCheckProperty<T> databusProp = new ClaimCheckProperty<T>();
             databusProp.HasValue = sdp.HasValue;
             databusProp.Key = sdp.Key;
             return databusProp;
         }
 
-        public override void Write(Utf8JsonWriter writer, DataBusProperty<T> value, JsonSerializerOptions options)
+        public override void Write(Utf8JsonWriter writer, ClaimCheckProperty<T> value, JsonSerializerOptions options)
         {
             SerializableDatabusProperty sdp = new SerializableDatabusProperty();
             sdp.HasValue = value.HasValue;
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/DatabusPropertyConverterFactory.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/DatabusPropertyConverterFactory.cs
@@ -0,0 +1,44 @@
+﻿using NServiceBus.ClaimCheck;
+using System;
+using System.Reflection;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Shared;
+
+#region DatabusPropertyConverterFactory
+
+public class ClaimCheckPropertyConverterFactory : JsonConverterFactory
+{
+    public override bool CanConvert(Type typeToConvert)
+    {
+        if (!typeToConvert.IsGenericType)
+        {
+            return false;
+        }
+
+        if (typeToConvert.GetGenericTypeDefinition() != typeof(ClaimCheckProperty<>))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        Type keyType = typeToConvert.GetGenericArguments()[0];
+
+        JsonConverter converter = (JsonConverter)Activator.CreateInstance(
+            typeof(ClaimCheckPropertyConverter<>).MakeGenericType(
+                new Type[] { keyType }),
+            BindingFlags.Instance | BindingFlags.Public,
+            binder: null,
+            args: new object[] { options },
+            culture: null)!;
+
+        return converter;
+    }
+}
+
+#endregion
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/MessageWithLargePayload.cs b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/MessageWithLargePayload.cs
@@ -1,4 +1,5 @@
 ﻿using NServiceBus;
+using NServiceBus.ClaimCheck;
 
 #region MessageWithLargePayload
 
@@ -8,7 +9,7 @@ public class MessageWithLargePayload :
     ICommand
 {
     public string SomeProperty { get; set; }
-    public DataBusProperty<byte[]> LargeBlob { get; set; }
+    public ClaimCheckProperty<byte[]> LargeBlob { get; set; }
 }
 
 #endregion
diff --git a/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/Shared.csproj b/samples/databus/databus-custom-serializer-converter/ClaimCheck_1/Shared/Shared.csproj
@@ -4,6 +4,6 @@
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NServiceBus.ClaimCheck.DataBus" Version="1.*" />
+    <PackageReference Include="NServiceBus.ClaimCheck" Version="1.0.0-alpha.1" />
   </ItemGroup>
 </Project>
diff --git a/samples/databus/databus-custom-serializer-converter/DataBus_1/Shared/DatabusPropertyConverterFactory.cs b/samples/databus/databus-custom-serializer-converter/DataBus_1/Shared/DatabusPropertyConverterFactory.cs

Original file line number	Diff line number	Diff line change
`@@ -1,31 +1,28 @@`
`1`	`1`	`using NServiceBus;`
`2`	`2`	`using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`	`3`	`using System.Text.Json;`
`7`	`4`	`using System.Text.Json.Serialization;`
`8`		`-using System.Threading.Tasks;`
	`5`	`+using NServiceBus.ClaimCheck;`
`9`	`6`
`10`	`7`	`namespace Shared`
`11`	`8`	`{`
`12`	`9`	`#region DatabusPropertyConverter`
`13`		`- public class DatabusPropertyConverter<T> : JsonConverter<DataBusProperty<T>> where T : class`
	`10`	`+ public class ClaimCheckPropertyConverter<T> : JsonConverter<ClaimCheckProperty<T>> where T : class`
`14`	`11`	`{`
`15`		`- public DatabusPropertyConverter(JsonSerializerOptions options)`
	`12`	`+ public ClaimCheckPropertyConverter(JsonSerializerOptions options)`
`16`	`13`	`{`
`17`	`14`
`18`	`15`	`}`
`19`		`- public override DataBusProperty<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
	`16`	`+ public override ClaimCheckProperty<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`20`	`17`	`{`
`21`	`18`	`var sdp = JsonSerializer.Deserialize<SerializableDatabusProperty>(reader.GetString());`
`22`		`- DataBusProperty<T> databusProp = new DataBusProperty<T>();`
	`19`	`+ ClaimCheckProperty<T> databusProp = new ClaimCheckProperty<T>();`
`23`	`20`	`databusProp.HasValue = sdp.HasValue;`
`24`	`21`	`databusProp.Key = sdp.Key;`
`25`	`22`	`return databusProp;`
`26`	`23`	`}`
`27`	`24`
`28`		`- public override void Write(Utf8JsonWriter writer, DataBusProperty<T> value, JsonSerializerOptions options)`
	`25`	`+ public override void Write(Utf8JsonWriter writer, ClaimCheckProperty<T> value, JsonSerializerOptions options)`
`29`	`26`	`{`
`30`	`27`	`SerializableDatabusProperty sdp = new SerializableDatabusProperty();`
`31`	`28`	`sdp.HasValue = value.HasValue;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using NServiceBus;`
	`2`	`+using NServiceBus.ClaimCheck;`
`2`	`3`
`3`	`4`	`#region MessageWithLargePayload`
`4`	`5`
`@@ -8,7 +9,7 @@ public class MessageWithLargePayload :`
`8`	`9`	`ICommand`
`9`	`10`	`{`
`10`	`11`	`public string SomeProperty { get; set; }`
`11`		`- public DataBusProperty<byte[]> LargeBlob { get; set; }`
	`12`	`+ public ClaimCheckProperty<byte[]> LargeBlob { get; set; }`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`#endregion`