Throw clear exception when converter is null.

ChebanovDD · ChebanovDD · commit 1c6bcf984ce8 · 2023-04-23T20:26:56.000+08:00
diff --git a/src/UnityMvvmToolkit.Core/Internal/ObjectHandlers/ObjectWrapperHandler.cs b/src/UnityMvvmToolkit.Core/Internal/ObjectHandlers/ObjectWrapperHandler.cs
@@ -30,11 +30,9 @@ public ObjectWrapperHandler(ValueConverterHandler valueConverterHandler)
 
         public void CreateValueConverterInstances<T>(int capacity, WarmupType warmupType) where T : IValueConverter
         {
-            var valueConverter = _valueConverterHandler.GetValueConverterByType(typeof(T));
-
-            if (valueConverter == default)
+            if (_valueConverterHandler.TryGetValueConverterByType(typeof(T), out var valueConverter) == false)
             {
-                throw new NullReferenceException($"Converter '{typeof(T)}' not found.");
+                throw new NullReferenceException($"Converter '{typeof(T)}' not found");
             }
 
             switch (valueConverter)
@@ -79,7 +77,13 @@ public TProperty GetProperty<TProperty, TValueType>(IBindingContext context, Bin
                 _wrappersByConverter.Add(converterId, new Queue<IObjectWrapper>());
             }
 
-            var args = new object[] { _valueConverterHandler.GetValueConverterById(converterId) };
+            if (_valueConverterHandler.TryGetValueConverterById(converterId, out var valueConverter) == false)
+            {
+                throw new NullReferenceException(
+                    $"Property value converter from '{sourceType}' to '{targetType}' not found.");
+            }
+
+            var args = new object[] { valueConverter };
             var wrapperType = typeof(PropertyWrapper<,>).MakeGenericType(targetType, sourceType);
 
             return (TProperty) ObjectWrapperHelper.CreatePropertyWrapper(wrapperType, args, converterId,
@@ -129,7 +133,13 @@ public ICommandWrapper GetCommandWrapper(IBindingContext context, CommandBinding
                 _wrappersByConverter.Add(converterId, new Queue<IObjectWrapper>());
             }
 
-            var args = new object[] { _valueConverterHandler.GetValueConverterById(converterId) };
+            if (_valueConverterHandler.TryGetValueConverterById(converterId, out var valueConverter) == false)
+            {
+                throw new NullReferenceException(
+                    $"Parameter value converter to '{commandValueType}' not found.");
+            }
+
+            var args = new object[] { valueConverter };
             var wrapperType = typeof(CommandWrapper<>).MakeGenericType(commandValueType);
             var command = propertyInfo.GetValue(context);
 
diff --git a/src/UnityMvvmToolkit.Core/Internal/ObjectHandlers/ValueConverterHandler.cs b/src/UnityMvvmToolkit.Core/Internal/ObjectHandlers/ValueConverterHandler.cs
@@ -18,14 +18,14 @@ public ValueConverterHandler(IValueConverter[] valueConverters)
             RegisterValueConverters(valueConverters);
         }
 
-        public IValueConverter GetValueConverterById(int converterId)
+        public bool TryGetValueConverterById(int converterId, out IValueConverter valueConverter)
         {
-            return _valueConvertersByHash[converterId]; // TODO: throw clear exception.
+            return _valueConvertersByHash.TryGetValue(converterId, out valueConverter);
         }
 
-        public IValueConverter GetValueConverterByType(Type converterType)
+        public bool TryGetValueConverterByType(Type converterType, out IValueConverter valueConverter)
         {
-            return _valueConvertersByHash[converterType.GetHashCode()]; // TODO: throw clear exception.
+            return _valueConvertersByHash.TryGetValue(converterType.GetHashCode(), out valueConverter);
         }
 
         public void Dispose()
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Internal/ObjectHandlers/ObjectWrapperHandler.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Internal/ObjectHandlers/ObjectWrapperHandler.cs
@@ -30,11 +30,9 @@ public ObjectWrapperHandler(ValueConverterHandler valueConverterHandler)
 
         public void CreateValueConverterInstances<T>(int capacity, WarmupType warmupType) where T : IValueConverter
         {
-            var valueConverter = _valueConverterHandler.GetValueConverterByType(typeof(T));
-
-            if (valueConverter == default)
+            if (_valueConverterHandler.TryGetValueConverterByType(typeof(T), out var valueConverter) == false)
             {
-                throw new NullReferenceException($"Converter '{typeof(T)}' not found.");
+                throw new NullReferenceException($"Converter '{typeof(T)}' not found");
             }
 
             switch (valueConverter)
@@ -79,7 +77,13 @@ public TProperty GetProperty<TProperty, TValueType>(IBindingContext context, Bin
                 _wrappersByConverter.Add(converterId, new Queue<IObjectWrapper>());
             }
 
-            var args = new object[] { _valueConverterHandler.GetValueConverterById(converterId) };
+            if (_valueConverterHandler.TryGetValueConverterById(converterId, out var valueConverter) == false)
+            {
+                throw new NullReferenceException(
+                    $"Property value converter from '{sourceType}' to '{targetType}' not found.");
+            }
+
+            var args = new object[] { valueConverter };
             var wrapperType = typeof(PropertyWrapper<,>).MakeGenericType(targetType, sourceType);
 
             return (TProperty) ObjectWrapperHelper.CreatePropertyWrapper(wrapperType, args, converterId,
@@ -129,7 +133,13 @@ public ICommandWrapper GetCommandWrapper(IBindingContext context, CommandBinding
                 _wrappersByConverter.Add(converterId, new Queue<IObjectWrapper>());
             }
 
-            var args = new object[] { _valueConverterHandler.GetValueConverterById(converterId) };
+            if (_valueConverterHandler.TryGetValueConverterById(converterId, out var valueConverter) == false)
+            {
+                throw new NullReferenceException(
+                    $"Parameter value converter to '{commandValueType}' not found.");
+            }
+
+            var args = new object[] { valueConverter };
             var wrapperType = typeof(CommandWrapper<>).MakeGenericType(commandValueType);
             var command = propertyInfo.GetValue(context);
 
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Internal/ObjectHandlers/ValueConverterHandler.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/Core/Internal/ObjectHandlers/ValueConverterHandler.cs
@@ -18,14 +18,14 @@ public ValueConverterHandler(IValueConverter[] valueConverters)
             RegisterValueConverters(valueConverters);
         }
 
-        public IValueConverter GetValueConverterById(int converterId)
+        public bool TryGetValueConverterById(int converterId, out IValueConverter valueConverter)
         {
-            return _valueConvertersByHash[converterId]; // TODO: throw clear exception.
+            return _valueConvertersByHash.TryGetValue(converterId, out valueConverter);
         }
 
-        public IValueConverter GetValueConverterByType(Type converterType)
+        public bool TryGetValueConverterByType(Type converterType, out IValueConverter valueConverter)
         {
-            return _valueConvertersByHash[converterType.GetHashCode()]; // TODO: throw clear exception.
+            return _valueConvertersByHash.TryGetValue(converterType.GetHashCode(), out valueConverter);
         }
 
         public void Dispose()

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ public ValueConverterHandler(IValueConverter[] valueConverters)`
`18`	`18`	`RegisterValueConverters(valueConverters);`
`19`	`19`	`}`
`20`	`20`
`21`		`- public IValueConverter GetValueConverterById(int converterId)`
	`21`	`+ public bool TryGetValueConverterById(int converterId, out IValueConverter valueConverter)`
`22`	`22`	`{`
`23`		`- return _valueConvertersByHash[converterId]; // TODO: throw clear exception.`
	`23`	`+ return _valueConvertersByHash.TryGetValue(converterId, out valueConverter);`
`24`	`24`	`}`
`25`	`25`
`26`		`- public IValueConverter GetValueConverterByType(Type converterType)`
	`26`	`+ public bool TryGetValueConverterByType(Type converterType, out IValueConverter valueConverter)`
`27`	`27`	`{`
`28`		`- return _valueConvertersByHash[converterType.GetHashCode()]; // TODO: throw clear exception.`
	`28`	`+ return _valueConvertersByHash.TryGetValue(converterType.GetHashCode(), out valueConverter);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public void Dispose()`