Rely on singletons

inputfalken · inputfalken · commit bc6b81c6e100 · 2025-06-28T15:29:54.000+02:00
diff --git a/src/DynamoDBGenerator/Converters/Internal/BoolConverter.cs b/src/DynamoDBGenerator/Converters/Internal/BoolConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class BoolConverter : IValueTypeConverter<bool>
+internal sealed class BoolConverter : IValueTypeConverter<bool>, IStaticSingleton<BoolConverter>
 {
     private static AttributeValue True { get; } = new() { BOOL = true };
     private static AttributeValue False { get; } = new() { BOOL = false };
diff --git a/src/DynamoDBGenerator/Converters/Internal/ByteConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ByteConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ByteConverter : IValueTypeConverter<byte>
+internal sealed class ByteConverter : IValueTypeConverter<byte>, IStaticSingleton<ByteConverter>
 {
     public byte? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/CharConverter.cs b/src/DynamoDBGenerator/Converters/Internal/CharConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class CharConverter : IValueTypeConverter<char>
+internal sealed class CharConverter : IValueTypeConverter<char>, IStaticSingleton<CharConverter>
 {
     public char? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/DecimalConverter.cs b/src/DynamoDBGenerator/Converters/Internal/DecimalConverter.cs
@@ -1,9 +1,10 @@
 using System.Globalization;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class DecimalConverter : IValueTypeConverter<decimal>
+internal sealed class DecimalConverter : IValueTypeConverter<decimal>, IStaticSingleton<DecimalConverter>
 {
     public decimal? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/DoubleConverter.cs b/src/DynamoDBGenerator/Converters/Internal/DoubleConverter.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Globalization;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class DoubleConverter : IValueTypeConverter<double>
+internal sealed class DoubleConverter : IValueTypeConverter<double>, IStaticSingleton<DoubleConverter>
 {
     public double? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/FloatConverter.cs b/src/DynamoDBGenerator/Converters/Internal/FloatConverter.cs
@@ -1,9 +1,10 @@
 using System.Globalization;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class FloatConverter : IValueTypeConverter<float>
+internal sealed class FloatConverter : IValueTypeConverter<float>, IStaticSingleton<FloatConverter>
 {
     public float? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/GuidConverter.cs b/src/DynamoDBGenerator/Converters/Internal/GuidConverter.cs
@@ -1,9 +1,10 @@
 using System;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class GuidConverter : IValueTypeConverter<Guid>
+internal sealed class GuidConverter : IValueTypeConverter<Guid>, IStaticSingleton<GuidConverter>
 {
     public Guid? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ISO8601DateOnlyConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ISO8601DateOnlyConverter.cs
@@ -1,9 +1,10 @@
 using System;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ISO8601DateOnlyConverter : IValueTypeConverter<DateOnly>
+internal sealed class ISO8601DateOnlyConverter : IValueTypeConverter<DateOnly>, IStaticSingleton<ISO8601DateOnlyConverter>
 {
     public DateOnly? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ISO8601DateTimeConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ISO8601DateTimeConverter.cs
@@ -1,9 +1,10 @@
 using System;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ISO8601DateTimeConverter : IValueTypeConverter<DateTime>
+internal sealed class ISO8601DateTimeConverter : IValueTypeConverter<DateTime>, IStaticSingleton<ISO8601DateTimeConverter>
 {
     public DateTime? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ISO8601DateTimeOffsetConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ISO8601DateTimeOffsetConverter.cs
@@ -1,9 +1,10 @@
 using System;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ISO8601DateTimeOffsetConverter : IValueTypeConverter<DateTimeOffset>
+internal sealed class ISO8601DateTimeOffsetConverter : IValueTypeConverter<DateTimeOffset>, IStaticSingleton<ISO8601DateTimeOffsetConverter>
 {
     public DateTimeOffset? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ISO8601TimeOnlyConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ISO8601TimeOnlyConverter.cs
@@ -1,9 +1,10 @@
 using System;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal class ISO8601TimeOnlyConverter: IValueTypeConverter<TimeOnly>
+internal class ISO8601TimeOnlyConverter: IValueTypeConverter<TimeOnly>, IStaticSingleton<ISO8601TimeOnlyConverter>
 {
     public TimeOnly? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ISO8601TimeSpanConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ISO8601TimeSpanConverter.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Xml;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ISO8601TimeSpanConverter : IValueTypeConverter<TimeSpan>
+internal sealed class ISO8601TimeSpanConverter : IValueTypeConverter<TimeSpan>, IStaticSingleton<ISO8601TimeSpanConverter>
 {
     public TimeSpan? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/Int32Converter.cs b/src/DynamoDBGenerator/Converters/Internal/Int32Converter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class Int32Converter : IValueTypeConverter<int>
+internal sealed class Int32Converter : IValueTypeConverter<int>, IStaticSingleton<Int32Converter>
 {
     public int? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/LongConverter.cs b/src/DynamoDBGenerator/Converters/Internal/LongConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class LongConverter : IValueTypeConverter<long>
+internal sealed class LongConverter : IValueTypeConverter<long>, IStaticSingleton<LongConverter>
 {
     public long? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/MemoryStreamConverter.cs b/src/DynamoDBGenerator/Converters/Internal/MemoryStreamConverter.cs
@@ -1,9 +1,10 @@
 using System.IO;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class MemoryStreamConverter : IReferenceTypeConverter<MemoryStream>
+internal sealed class MemoryStreamConverter : IReferenceTypeConverter<MemoryStream>, IStaticSingleton<MemoryStreamConverter>
 {
     public MemoryStream? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/SByteConverter.cs b/src/DynamoDBGenerator/Converters/Internal/SByteConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class SByteConverter : IValueTypeConverter<sbyte>
+internal sealed class SByteConverter : IValueTypeConverter<sbyte>, IStaticSingleton<SByteConverter>
 {
     public sbyte? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ShortConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ShortConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ShortConverter : IValueTypeConverter<short>
+internal sealed class ShortConverter : IValueTypeConverter<short>, IStaticSingleton<ShortConverter>
 {
     public short? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/StringConverter.cs b/src/DynamoDBGenerator/Converters/Internal/StringConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class StringConverter : IReferenceTypeConverter<string>
+internal sealed class StringConverter : IReferenceTypeConverter<string>, IStaticSingleton<StringConverter>
 {
     public string? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/UIntConverter.cs b/src/DynamoDBGenerator/Converters/Internal/UIntConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class UIntConverter : IValueTypeConverter<uint>
+internal sealed class UIntConverter : IValueTypeConverter<uint>, IStaticSingleton<UIntConverter>
 {
     public uint? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/ULongConverter.cs b/src/DynamoDBGenerator/Converters/Internal/ULongConverter.cs
@@ -1,8 +1,9 @@
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class ULongConverter : IValueTypeConverter<ulong>
+internal sealed class ULongConverter : IValueTypeConverter<ulong>, IStaticSingleton<ULongConverter>
 {
     public ulong? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/Converters/Internal/UShortConverter.cs b/src/DynamoDBGenerator/Converters/Internal/UShortConverter.cs
@@ -1,8 +1,10 @@
+using System.Reflection.Metadata;
 using Amazon.DynamoDBv2.Model;
+using DynamoDBGenerator.Internal;
 
 namespace DynamoDBGenerator.Converters.Internal;
 
-internal sealed class UShortConverter : IValueTypeConverter<ushort>
+internal sealed class UShortConverter : IValueTypeConverter<ushort>, IStaticSingleton<UShortConverter>
 {
     public ushort? Read(AttributeValue attributeValue)
     {
diff --git a/src/DynamoDBGenerator/DynamoDBGenerator.csproj b/src/DynamoDBGenerator/DynamoDBGenerator.csproj
@@ -4,7 +4,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
-        <LangVersion>10.0</LangVersion>
         <PackageVersion>0.0.0</PackageVersion>
         <Title>DynamoDBGenerator</Title>
         <Authors>Robert Andersson</Authors>
diff --git a/src/DynamoDBGenerator/Internal/Singleton.cs b/src/DynamoDBGenerator/Internal/Singleton.cs
@@ -0,0 +1,12 @@
+namespace DynamoDBGenerator.Internal;
+
+internal interface IStaticSingleton<out T> where T : new()
+{
+    private static T? _backingField;
+    internal static virtual T Singleton => _backingField ??= new T();
+}
+
+internal static class Singleton
+{
+    public static T Static<T>() where T : IStaticSingleton<T>, new() => T.Singleton;
+}
diff --git a/src/DynamoDBGenerator/Options/AttributeValueConverters.cs b/src/DynamoDBGenerator/Options/AttributeValueConverters.cs

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using Amazon.DynamoDBv2.Model;`
	`2`	`+using DynamoDBGenerator.Internal;`
`2`	`3`
`3`	`4`	`namespace DynamoDBGenerator.Converters.Internal;`
`4`	`5`
`5`		`-internal sealed class BoolConverter : IValueTypeConverter<bool>`
	`6`	`+internal sealed class BoolConverter : IValueTypeConverter<bool>, IStaticSingleton<BoolConverter>`
`6`	`7`	`{`
`7`	`8`	`private static AttributeValue True { get; } = new() { BOOL = true };`
`8`	`9`	`private static AttributeValue False { get; } = new() { BOOL = false };`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using System.Globalization;`
`2`	`2`	`using Amazon.DynamoDBv2.Model;`
	`3`	`+using DynamoDBGenerator.Internal;`
`3`	`4`
`4`	`5`	`namespace DynamoDBGenerator.Converters.Internal;`
`5`	`6`
`6`		`-internal sealed class DecimalConverter : IValueTypeConverter<decimal>`
	`7`	`+internal sealed class DecimalConverter : IValueTypeConverter<decimal>, IStaticSingleton<DecimalConverter>`
`7`	`8`	`{`
`8`	`9`	`public decimal? Read(AttributeValue attributeValue)`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Globalization;`
`3`	`3`	`using Amazon.DynamoDBv2.Model;`
	`4`	`+using DynamoDBGenerator.Internal;`
`4`	`5`
`5`	`6`	`namespace DynamoDBGenerator.Converters.Internal;`
`6`	`7`
`7`		`-internal sealed class DoubleConverter : IValueTypeConverter<double>`
	`8`	`+internal sealed class DoubleConverter : IValueTypeConverter<double>, IStaticSingleton<DoubleConverter>`
`8`	`9`	`{`
`9`	`10`	`public double? Read(AttributeValue attributeValue)`
`10`	`11`	`{`