switch to adding in types instead of namespaces for more flexibility

Author: runeanielsen

src/CIM.Cson/Converters/ShortNameBinder.cs

@@ -12,14 +12,14 @@ class ShortNameBinder : DefaultSerializationBinder
         readonly Dictionary<Type, string> _typeToName = new Dictionary<Type, string>();
         readonly Dictionary<string, Type> _nameToType = new Dictionary<string, Type>();
 
-        public ShortNameBinder(List<string> includeShortNameNamespaces)
+        public ShortNameBinder(List<Type> includeShortHandForTypes)
         {
             AddTypesFromNamespace(typeof(IdentifiedObject).Namespace);
             AddTypesFromNamespace(typeof(DataSetMember).Namespace);
 
-            foreach (var includeShortNameNamespace in includeShortNameNamespaces)
+            foreach (var type in includeShortHandForTypes)
             {
-                AddTypesFromNamespace(includeShortNameNamespace);
+                AddType(type);
             }
         }
 

src/CIM.Cson/CsonSerializer.cs

@@ -16,9 +16,9 @@ public class CsonSerializer
         private readonly CustomizedJsonSerializer _serializer;
         private readonly int _lineBufferSize;
 
-        public CsonSerializer(int lineBufferSize = 1024, List<string>? includeShorthandNamespaces = null)
+        public CsonSerializer(int lineBufferSize = 1024, List<Type>? includeShortHandForTypes = null)
         {
-            _serializer = new CustomizedJsonSerializer(includeShorthandNamespaces ?? new List<string>());
+            _serializer = new CustomizedJsonSerializer(includeShortHandForTypes ?? new List<Type>());
             _lineBufferSize = lineBufferSize;
         }
 

src/CIM.Cson/Internal/CustomizedJsonSerializer.cs

@@ -11,13 +11,13 @@ class CustomizedJsonSerializer
     {
         private JsonSerializerSettings _serializerSettings;
 
-        public CustomizedJsonSerializer(List<string> includeShortNameNamespaces)
+        public CustomizedJsonSerializer(List<Type> includeShortHandForTypes)
         {
             _serializerSettings = new JsonSerializerSettings
             {
                 TypeNameHandling = TypeNameHandling.Objects,
                 NullValueHandling = NullValueHandling.Ignore,
-                SerializationBinder = new ShortNameBinder(includeShortNameNamespaces),
+                SerializationBinder = new ShortNameBinder(includeShortHandForTypes),
                 Converters =
                 {
                    new ObjectReferenceSerializer(),