Code update

masesgroup · May 23, 2024 · 860198d · 860198d
1 parent 30791a8
commit 860198d
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/src/net/KEFCore.SerDes/KEFCoreSerDes.Helpers.cs b/src/net/KEFCore.SerDes/KEFCoreSerDes.Helpers.cs
@@ -197,28 +197,13 @@ public static object FromRecord(Org.Apache.Kafka.Clients.Consumer.ConsumerRecord
     public static object FromRawValueData(Type keyType, Type valueContainer, Type keySerializer, Type valueContainerSerializer, string topic, byte[] recordValue, byte[] recordKey, bool throwUnmatch = false)
     {
         var fullKeySerializer = keySerializer.MakeGenericType(keyType);
-        Type jvmKeyType = null!;
-        foreach (var interfaceType in fullKeySerializer.GetInterfaces())
-        {
-            if (interfaceType.IsGenericType && interfaceType.Name.StartsWith(typeof(ISerDes<,>).Name))
-            {
-                jvmKeyType = interfaceType.GetGenericArguments()[1];
-            }
-        }
-        if (jvmKeyType == null) throw new InvalidOperationException($"Cannot identity JVM type from {keySerializer}");
+        ISerDes keySerDes = Activator.CreateInstance(fullKeySerializer) as ISerDes;
+        Type jvmKeyType = (keySerDes?.JVMType) ?? throw new InvalidOperationException($"Cannot identity JVM type from {keySerializer}");
 
         var fullValueContainer = valueContainer.MakeGenericType(keyType);
         var fullValueContainerSerializer = valueContainerSerializer.MakeGenericType(fullValueContainer);
-        Type jvmKValueContainerType = null!;
-        foreach (var interfaceType in fullValueContainerSerializer.GetInterfaces())
-        {
-            if (interfaceType.IsGenericType && interfaceType.Name.StartsWith(typeof(ISerDes<,>).Name))
-            {
-                jvmKValueContainerType = interfaceType.GetGenericArguments()[1];
-            }
-        }
-
-        if (jvmKValueContainerType == null) throw new InvalidOperationException($"Cannot identity JVM type from {fullValueContainerSerializer}");
+        ISerDes valueContainerSerDes = Activator.CreateInstance(fullValueContainerSerializer) as ISerDes;
+        Type jvmKValueContainerType = (valueContainerSerDes?.JVMType) ?? throw new InvalidOperationException($"Cannot identity JVM type from {fullValueContainerSerializer}");
 
         var ccType = typeof(LocalEntityExtractor<,,,,,>);
         var extractorType = ccType.MakeGenericType(keyType, fullValueContainer, jvmKeyType, jvmKValueContainerType, fullKeySerializer, fullValueContainerSerializer);