diff --git a/src/StronglyTypedIds.Templates/guid-full.typedid b/src/StronglyTypedIds.Templates/guid-full.typedid index 5a0bd951..c1603dd1 100644 --- a/src/StronglyTypedIds.Templates/guid-full.typedid +++ b/src/StronglyTypedIds.Templates/guid-full.typedid @@ -88,9 +88,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/src/StronglyTypedIds.Templates/int-full.typedid b/src/StronglyTypedIds.Templates/int-full.typedid index 43f47209..ec8031bb 100644 --- a/src/StronglyTypedIds.Templates/int-full.typedid +++ b/src/StronglyTypedIds.Templates/int-full.typedid @@ -87,9 +87,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(int) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/src/StronglyTypedIds.Templates/long-full.typedid b/src/StronglyTypedIds.Templates/long-full.typedid index 4ce1aaff..c63c34af 100644 --- a/src/StronglyTypedIds.Templates/long-full.typedid +++ b/src/StronglyTypedIds.Templates/long-full.typedid @@ -87,9 +87,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(long) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/src/StronglyTypedIds.Templates/newid-full.typedid b/src/StronglyTypedIds.Templates/newid-full.typedid index d55f9753..582457b0 100644 --- a/src/StronglyTypedIds.Templates/newid-full.typedid +++ b/src/StronglyTypedIds.Templates/newid-full.typedid @@ -93,9 +93,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || typeToConvert == typeof(global::System.Guid) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (global::MassTransit.NewId.FromGuid(reader.GetGuid())); diff --git a/src/StronglyTypedIds.Templates/nullablestring-full.typedid b/src/StronglyTypedIds.Templates/nullablestring-full.typedid index 6c06d57c..78142c58 100644 --- a/src/StronglyTypedIds.Templates/nullablestring-full.typedid +++ b/src/StronglyTypedIds.Templates/nullablestring-full.typedid @@ -92,9 +92,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetString()); diff --git a/src/StronglyTypedIds.Templates/string-full.typedid b/src/StronglyTypedIds.Templates/string-full.typedid index be8e396f..acb39ca6 100644 --- a/src/StronglyTypedIds.Templates/string-full.typedid +++ b/src/StronglyTypedIds.Templates/string-full.typedid @@ -94,9 +94,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetString()!); diff --git a/src/StronglyTypedIds/EmbeddedSources.Guid.cs b/src/StronglyTypedIds/EmbeddedSources.Guid.cs index 2eaa0942..d143fd5b 100644 --- a/src/StronglyTypedIds/EmbeddedSources.Guid.cs +++ b/src/StronglyTypedIds/EmbeddedSources.Guid.cs @@ -90,9 +90,6 @@ public override bool CanConvertTo(global::System.ComponentModel.ITypeDescriptorC public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/src/StronglyTypedIds/EmbeddedSources.Int.cs b/src/StronglyTypedIds/EmbeddedSources.Int.cs index 691aece6..06b6c398 100644 --- a/src/StronglyTypedIds/EmbeddedSources.Int.cs +++ b/src/StronglyTypedIds/EmbeddedSources.Int.cs @@ -89,9 +89,6 @@ public override bool CanConvertTo(global::System.ComponentModel.ITypeDescriptorC public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(int) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/src/StronglyTypedIds/EmbeddedSources.Long.cs b/src/StronglyTypedIds/EmbeddedSources.Long.cs index d354a398..fe0cf17a 100644 --- a/src/StronglyTypedIds/EmbeddedSources.Long.cs +++ b/src/StronglyTypedIds/EmbeddedSources.Long.cs @@ -89,9 +89,6 @@ public override bool CanConvertTo(global::System.ComponentModel.ITypeDescriptorC public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(long) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt64()); diff --git a/src/StronglyTypedIds/EmbeddedSources.String.cs b/src/StronglyTypedIds/EmbeddedSources.String.cs index 30d260a4..5852d3ab 100644 --- a/src/StronglyTypedIds/EmbeddedSources.String.cs +++ b/src/StronglyTypedIds/EmbeddedSources.String.cs @@ -96,9 +96,6 @@ public override bool CanConvertTo(global::System.ComponentModel.ITypeDescriptorC public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetString()!); diff --git a/test/StronglyTypedIds.IntegrationTests/GuidIdTests.cs b/test/StronglyTypedIds.IntegrationTests/GuidIdTests.cs index 13a1619a..6cdca8ec 100644 --- a/test/StronglyTypedIds.IntegrationTests/GuidIdTests.cs +++ b/test/StronglyTypedIds.IntegrationTests/GuidIdTests.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Dapper; using Microsoft.Data.Sqlite; @@ -14,7 +15,7 @@ namespace StronglyTypedIds.IntegrationTests { - public class GuidIdTests + public partial class GuidIdTests { [Fact] public void SameValuesAreEqual() @@ -114,6 +115,24 @@ public void CanSerializeToGuid_WithSystemTextJsonProvider() Assert.Equal(serializedFoo, serializedGuid); } + [Fact] + public void CanRoundTripWhenInRecord() + { + var foo = new ToSerialize() + { + Id = GuidId1.New(), + }; + + var serialized = SystemTextJsonSerializer.Serialize(foo); + var deserialized = SystemTextJsonSerializer.Deserialize(serialized); + Assert.Equal(foo, deserialized); +#if NET6_0_OR_GREATER + serialized = SystemTextJsonSerializer.Serialize(foo, SystemTextJsonSerializerContext.Custom.GuidIdTests); + deserialized = SystemTextJsonSerializer.Deserialize(serialized, SystemTextJsonSerializerContext.Custom.GuidIdTests); + Assert.Equal(foo, deserialized); +#endif + } + [Fact] public void CanDeserializeFromGuid_WithSystemTextJsonProvider() { @@ -590,5 +609,14 @@ internal class EntityWithNullableId2 { public ConvertersGuidId2? Id { get; set; } } + + internal record ToSerialize + { + public GuidId1 Id { get; set; } + public Guid Guid { get; set; } = Guid.NewGuid(); + public long Long { get; set; } = 123; + public int Int { get; set; } = 456; + public string String { get; set; } = "Something"; + } } } \ No newline at end of file diff --git a/test/StronglyTypedIds.IntegrationTests/IntIdTests.cs b/test/StronglyTypedIds.IntegrationTests/IntIdTests.cs index 277b9954..dd73bae7 100644 --- a/test/StronglyTypedIds.IntegrationTests/IntIdTests.cs +++ b/test/StronglyTypedIds.IntegrationTests/IntIdTests.cs @@ -4,6 +4,7 @@ using System.Data.SqlClient; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Dapper; using Microsoft.Data.Sqlite; @@ -15,7 +16,7 @@ namespace StronglyTypedIds.IntegrationTests; -public class IntIdTests +public partial class IntIdTests { [Fact] public void SameValuesAreEqual() @@ -370,6 +371,25 @@ public void CanSerializeToInt_WithMultiTemplates_WithSystemTextJsonProvider() Assert.Equal(serializedFoo, serializedInt); } + [Fact] + public void CanRoundTripWhenInRecord() + { + var foo = new ToSerialize() + { + Id = new ConvertersIntId(123), + }; + + var serialized = SystemTextJsonSerializer.Serialize(foo); + var deserialized = SystemTextJsonSerializer.Deserialize(serialized); + Assert.Equal(foo, deserialized); + +#if NET6_0_OR_GREATER + serialized = SystemTextJsonSerializer.Serialize(foo, SystemTextJsonSerializerContext.Custom.IntIdTests); + deserialized = SystemTextJsonSerializer.Deserialize(serialized, SystemTextJsonSerializerContext.Custom.IntIdTests); + Assert.Equal(foo, deserialized); +#endif + } + [Fact] public void CanDeserializeFromInt_WithMultiTemplates_WithNewtonsoftJsonProvider() { @@ -568,4 +588,13 @@ internal class TypeWithDictionaryKeys { public Dictionary Values { get; set; } } + + internal record ToSerialize + { + public ConvertersIntId Id { get; set; } + public Guid Guid { get; set; } = Guid.NewGuid(); + public long Long { get; set; } = 123; + public int Int { get; set; } = 456; + public string String { get; set; } = "Something"; + } } \ No newline at end of file diff --git a/test/StronglyTypedIds.IntegrationTests/LongIdTests.cs b/test/StronglyTypedIds.IntegrationTests/LongIdTests.cs index f2e18289..45805b94 100644 --- a/test/StronglyTypedIds.IntegrationTests/LongIdTests.cs +++ b/test/StronglyTypedIds.IntegrationTests/LongIdTests.cs @@ -4,6 +4,7 @@ using System.Data.SqlClient; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Dapper; using Microsoft.Data.Sqlite; @@ -15,7 +16,7 @@ namespace StronglyTypedIds.IntegrationTests { - public class LongIdTests + public partial class LongIdTests { [Fact] public void SameValuesAreEqual() @@ -367,6 +368,25 @@ public void CanSerializeToLong_WithMultiTemplates_WithSystemTextJsonProvider() Assert.Equal(serializedFoo, serializedLong); } + [Fact] + public void CanRoundTripWhenInRecord() + { + var foo = new ToSerialize() + { + Id = new ConvertersLongId(123), + }; + + var serialized = SystemTextJsonSerializer.Serialize(foo); + var deserialized = SystemTextJsonSerializer.Deserialize(serialized); + Assert.Equal(foo, deserialized); + +#if NET6_0_OR_GREATER + serialized = SystemTextJsonSerializer.Serialize(foo, SystemTextJsonSerializerContext.Custom.LongIdTests); + deserialized = SystemTextJsonSerializer.Deserialize(serialized, SystemTextJsonSerializerContext.Custom.LongIdTests); + Assert.Equal(foo, deserialized); +#endif + } + [Fact] public void CanDeserializeFromLong_WithMultiTemplates_WithNewtonsoftJsonProvider() { @@ -550,5 +570,14 @@ internal class TypeWithDictionaryKeys { public Dictionary Values { get; set; } } + + internal record ToSerialize + { + public ConvertersLongId Id { get; set; } + public Guid Guid { get; set; } = Guid.NewGuid(); + public long Long { get; set; } = 123; + public int Int { get; set; } = 456; + public string String { get; set; } = "Something"; + } } } \ No newline at end of file diff --git a/test/StronglyTypedIds.IntegrationTests/StringIdTests.cs b/test/StronglyTypedIds.IntegrationTests/StringIdTests.cs index 9cc6e3ea..4a2e3494 100644 --- a/test/StronglyTypedIds.IntegrationTests/StringIdTests.cs +++ b/test/StronglyTypedIds.IntegrationTests/StringIdTests.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading.Tasks; using Dapper; using Microsoft.Data.Sqlite; @@ -211,6 +212,26 @@ public void CanSerializeToString_WithSystemTextJsonProvider() Assert.Equal(serializedFoo, serializedString); } + + [Fact] + public void CanRoundTripWhenInRecord() + { + var foo = new ToSerialize() + { + Id = new ConvertersStringId("123"), + }; + + var serialized = SystemTextJsonSerializer.Serialize(foo); + var deserialized = SystemTextJsonSerializer.Deserialize(serialized); + Assert.Equal(foo, deserialized); + +#if NET6_0_OR_GREATER + serialized = SystemTextJsonSerializer.Serialize(foo, SystemTextJsonSerializerContext.Custom.StringIdTests); + deserialized = SystemTextJsonSerializer.Deserialize(serialized, SystemTextJsonSerializerContext.Custom.StringIdTests); + Assert.Equal(foo, deserialized); +#endif + } + [Fact] public void CanDeserializeFromString_WithNewtonsoftJsonProvider() { @@ -540,5 +561,14 @@ internal class TypeWithDictionaryKeys { public Dictionary Values { get; set; } } + + internal record ToSerialize + { + public ConvertersStringId Id { get; set; } + public Guid Guid { get; set; } = Guid.NewGuid(); + public long Long { get; set; } = 123; + public int Int { get; set; } = 456; + public string String { get; set; } = "Something"; + } } } \ No newline at end of file diff --git a/test/StronglyTypedIds.IntegrationTests/SystemTextJsonSerializerContext.cs b/test/StronglyTypedIds.IntegrationTests/SystemTextJsonSerializerContext.cs index 7a388704..5107c993 100644 --- a/test/StronglyTypedIds.IntegrationTests/SystemTextJsonSerializerContext.cs +++ b/test/StronglyTypedIds.IntegrationTests/SystemTextJsonSerializerContext.cs @@ -9,6 +9,10 @@ namespace StronglyTypedIds.IntegrationTests; [JsonSerializable(typeof(ConvertersGuidId))] [JsonSerializable(typeof(ConvertersGuidId2))] [JsonSerializable(typeof(GuidIdTests.TypeWithDictionaryKeys))] +[JsonSerializable(typeof(GuidIdTests.ToSerialize), TypeInfoPropertyName = "GuidIdTests")] +[JsonSerializable(typeof(IntIdTests.ToSerialize), TypeInfoPropertyName = "IntIdTests")] +[JsonSerializable(typeof(LongIdTests.ToSerialize), TypeInfoPropertyName = "LongIdTests")] +[JsonSerializable(typeof(StringIdTests.ToSerialize), TypeInfoPropertyName = "StringIdTests")] internal partial class SystemTextJsonSerializerContext : JsonSerializerContext { internal static SystemTextJsonSerializerContext Custom @@ -19,6 +23,9 @@ internal static SystemTextJsonSerializerContext Custom new GuidId1.GuidId1SystemTextJsonConverter(), new ConvertersGuidId.ConvertersGuidIdSystemTextJsonConverter(), new ConvertersGuidId2.ConvertersGuidId2SystemTextJsonConverter(), + new ConvertersIntId.ConvertersIntIdSystemTextJsonConverter(), + new ConvertersLongId.ConvertersLongIdSystemTextJsonConverter(), + new ConvertersStringId.ConvertersStringIdSystemTextJsonConverter(), } }); @@ -32,6 +39,9 @@ internal static SystemTextJsonSerializerContext Web new GuidId1.GuidId1SystemTextJsonConverter(), new ConvertersGuidId.ConvertersGuidIdSystemTextJsonConverter(), new ConvertersGuidId2.ConvertersGuidId2SystemTextJsonConverter(), + new ConvertersIntId.ConvertersIntIdSystemTextJsonConverter(), + new ConvertersLongId.ConvertersLongIdSystemTextJsonConverter(), + new ConvertersStringId.ConvertersStringIdSystemTextJsonConverter(), } }); } diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateDefaultIdInGlobalNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateDefaultIdInGlobalNamespace.verified.txt index 1987a762..b1660f0b 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateDefaultIdInGlobalNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateDefaultIdInGlobalNamespace.verified.txt @@ -100,9 +100,6 @@ public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateForCustomTemplate.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateForCustomTemplate.verified.txt index 45ad8e8f..77c49255 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateForCustomTemplate.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateForCustomTemplate.verified.txt @@ -108,9 +108,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || typeToConvert == typeof(global::System.Guid) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (global::MassTransit.NewId.FromGuid(reader.GetGuid())); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt index 51832749..bc454f40 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt @@ -106,9 +106,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInFileScopedNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInFileScopedNamespace.verified.txt index 56fb72a0..30fdbf87 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInFileScopedNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInFileScopedNamespace.verified.txt @@ -102,9 +102,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInNamespace.verified.txt index 56fb72a0..30fdbf87 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateIdInNamespace.verified.txt @@ -102,9 +102,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleIdsWithSameName.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleIdsWithSameName.verified.txt index 3a7a4096..2dc64e02 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleIdsWithSameName.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleIdsWithSameName.verified.txt @@ -102,9 +102,6 @@ namespace MyContracts.V1 public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); @@ -337,9 +334,6 @@ namespace MyContracts.V2 public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleTemplatesWithBuiltIn.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleTemplatesWithBuiltIn.verified.txt index d3e7c2cf..673d6926 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleTemplatesWithBuiltIn.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateMultipleTemplatesWithBuiltIn.verified.txt @@ -159,9 +159,6 @@ public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt index b145f90a..f68c9472 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt @@ -104,9 +104,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNonDefaultIdInNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNonDefaultIdInNamespace.verified.txt index 33f670a3..a527f220 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNonDefaultIdInNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateNonDefaultIdInNamespace.verified.txt @@ -101,9 +101,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(int) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt index 1d67d2fc..79ebbdc6 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt @@ -108,9 +108,6 @@ namespace SomeNamespace public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithCustomTemplateUsingGlobalAttribute.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithCustomTemplateUsingGlobalAttribute.verified.txt index c97b21e5..35f3fc37 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithCustomTemplateUsingGlobalAttribute.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithCustomTemplateUsingGlobalAttribute.verified.txt @@ -106,9 +106,6 @@ public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || typeToConvert == typeof(global::System.Guid) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (global::MassTransit.NewId.FromGuid(reader.GetGuid())); diff --git a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithTemplateUsingGlobalAttribute.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithTemplateUsingGlobalAttribute.verified.txt index b51c929d..7157a5a2 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithTemplateUsingGlobalAttribute.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/StronglyTypedIdGeneratorTests.CanOverrideDefaultsWithTemplateUsingGlobalAttribute.verified.txt @@ -99,9 +99,6 @@ public partial class MyIdSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(int) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override MyId Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Guid.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Guid.verified.txt index b71fddfb..583bd228 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Guid.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Guid.verified.txt @@ -95,9 +95,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(global::System.Guid) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetGuid()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Int.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Int.verified.txt index fd1dcc93..bc1b4c6e 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Int.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Int.verified.txt @@ -94,9 +94,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(int) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Long.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Long.verified.txt index 46805531..db876051 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Long.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_Long.verified.txt @@ -94,9 +94,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(long) || typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetInt32()); diff --git a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_String.verified.txt b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_String.verified.txt index b17b9514..f1b9b89f 100644 --- a/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_String.verified.txt +++ b/test/StronglyTypedIds.Tests/Snapshots/UnknownTemplateCodeFixProviderUnitTests.UsesBuiltInTemplates_String.verified.txt @@ -104,9 +104,6 @@ public partial class PLACEHOLDERIDSystemTextJsonConverter : global::System.Text.Json.Serialization.JsonConverter { - public override bool CanConvert(global::System.Type typeToConvert) - => typeToConvert == typeof(string) || base.CanConvert(typeToConvert); - public override PLACEHOLDERID Read(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options) => new (reader.GetString()!);