Change exception

inputfalken · Jun 15, 2024 · c876482 · c876482
1 parent a30d014
commit c876482
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/DynamoDBGenerator.SourceGenerator/Constants.cs b/src/DynamoDBGenerator.SourceGenerator/Constants.cs
@@ -34,7 +34,6 @@ public static class ConversionStrategy
 
         public const string AssemblyName = "DynamoDBGenerator";
         public const string DynamoDBMarshallerFullname = $"{Namespace.AttributesFullName}.{Attribute.DynamoDBMarshaller}";
-
         public const string DynamoDBConverterFullName = $"{AssemblyName}.{Namespace.Options}.{Converter.AttributeValueConverters}";
 
         public static class Namespace
@@ -47,6 +46,7 @@ public static class Namespace
             public const string Converters = "Converters";
             public const string Options = "Options";
         }
+
         public static class Converter
         {
             public const string AttributeValueConverters = "AttributeValueConverters";
@@ -74,10 +74,8 @@ public static class Marshaller
             public const string MarshallMethodName = "Marshall";
         }
 
-
         public const string KeyMarshallerImplementationTypeName = "DynamoDBKeyMarshallerDelegator";
         public const string IndexKeyMarshallerImplementationTypeName = "IndexDynamoDBMarshallerDelegator";
-
 
         public static class AttributeValueUtilityFactory
         {
@@ -94,6 +92,7 @@ public static class AttributeValueUtilityFactory
             public const string ToLookup = $"{ClassName}.ToLookup";
             public const string FromLookup = $"{ClassName}.FromLookup";
         }
+
         public static class ExceptionHelper
         {
             private const string ExceptionHelperClass = "ExceptionHelper";
@@ -105,9 +104,8 @@ public static class ExceptionHelper
             public const string ShouldNeverHappenExceptionMethod = $"{ExceptionHelperClass}.ShouldNeverHappen";
             public const string MissMatchedIndexNameExceptionMethod = $"{ExceptionHelperClass}.MissMatchedIndex";
             public const string NoDynamoDBKeyAttributesExceptionMethod = $"{ExceptionHelperClass}.NoDynamoDBAttributes";
+            public const string InvalidTypeRepresentationExceptionMethod = $"{ExceptionHelperClass}.InvalidTypeRepresentation";
         }
-
-
     }
 
     // ReSharper disable once IdentifierTypo
@@ -133,7 +131,6 @@ public static class Attribute
             public const string DynamoDBGlobalSecondaryIndexHashKey = "DynamoDBGlobalSecondaryIndexHashKeyAttribute";
             public const string DynamoDBGlobalSecondaryIndexRangeKey = "DynamoDBGlobalSecondaryIndexRangeKeyAttribute";
         }
-
     }
 
     public const string NewLine = @"

diff --git a/src/DynamoDBGenerator.SourceGenerator/Generations/UnMarshaller.cs b/src/DynamoDBGenerator.SourceGenerator/Generations/UnMarshaller.cs
@@ -199,7 +199,7 @@ internal static IEnumerable<string> RootSignature(MarshallerOptions options, ITy
         return $"public {typeName} {methodName}(Dictionary<{nameof(String)}, {Constants.AWSSDK_DynamoDBv2.AttributeValue}> entity)".CreateScope(
             "ArgumentNullException.ThrowIfNull(entity);",
             options.IsConvertable(typeSymbol) || typeSymbol.TypeIdentifier() is not UnknownType
-              ? "throw new Exception();"
+              ? $"throw {Constants.DynamoDBGenerator.ExceptionHelper.InvalidTypeRepresentationExceptionMethod}(nameof({typeName}));"
               : $"return {UnMarshallerClass}.{GetDeserializationMethodName(typeSymbol)}(entity, {MarshallerOptions.FieldReference});"
         );
     }

diff --git a/src/DynamoDBGenerator/Internal/ExceptionHelper.cs b/src/DynamoDBGenerator/Internal/ExceptionHelper.cs
@@ -40,6 +40,11 @@ public static InvalidOperationException NoDynamoDBAttributes(string typeName)
     {
         return new InvalidOperationException($"Could not create keys for type '{typeName}', include DynamoDBKeyAttribute on the correct properties.");
     }
+
+    public static InvalidOperationException InvalidTypeRepresentation(string typeName)
+    {
+        return new InvalidOperationException($"Could not unmarshall the type '{typeName}' from an 'Dictionary<String, AttributeValue>'.");
+    }
 
     public static Exception ShouldNeverHappen()
     {
@@ -51,4 +56,4 @@ public static ArgumentOutOfRangeException MissMatchedIndex(string paramName, str
         return new ArgumentOutOfRangeException(paramName, $"Could not find any index match for value '{value}'.");
     }
 #pragma warning restore CS1591
-}
+}