Removed IKafkaSerdesFactory and other code clean-up

masesgroup · Oct 4, 2023 · 73f1719 · 73f1719
1 parent fe57106
commit 73f1719
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 301 deletions.
diff --git a/src/net/KEFCore/Extensions/KafkaServiceCollectionExtensions.cs b/src/net/KEFCore/Extensions/KafkaServiceCollectionExtensions.cs
@@ -23,7 +23,6 @@
 using MASES.EntityFrameworkCore.KNet.Infrastructure.Internal;
 using MASES.EntityFrameworkCore.KNet.Metadata.Conventions;
 using MASES.EntityFrameworkCore.KNet.Query.Internal;
-using MASES.EntityFrameworkCore.KNet.Serdes.Internal;
 using MASES.EntityFrameworkCore.KNet.Storage.Internal;
 using MASES.EntityFrameworkCore.KNet.ValueGeneration.Internal;
 using System.ComponentModel;
@@ -72,8 +71,7 @@ public static IServiceCollection AddEntityFrameworkKafkaDatabase(this IServiceCo
                     .TryAddSingleton<IKafkaSingletonOptions, KafkaSingletonOptions>()
                     .TryAddSingleton<IKafkaClusterCache, KafkaClusterCache>()
                     .TryAddSingleton<IKafkaTableFactory, KafkaTableFactory>()
-                    .TryAddScoped<IKafkaDatabase, KafkaDatabase>()
-                    .TryAddScoped<IKafkaSerdesFactory, KafkaSerdesFactory>());
+                    .TryAddScoped<IKafkaDatabase, KafkaDatabase>());
 
         builder.TryAddCoreServices();
 

diff --git a/src/net/KEFCore/Query/Internal/KafkaQueryContext.cs b/src/net/KEFCore/Query/Internal/KafkaQueryContext.cs
@@ -32,17 +32,15 @@ public virtual IEnumerable<ValueBuffer> GetValueBuffers(IEntityType entityType)
     {
         if (!_valueBuffersCache.TryGetValue(entityType, out var valueBuffers))
         {
-            valueBuffers = Cluster.GetData(entityType);
+            valueBuffers = Cluster.GetValueBuffers(entityType);
 
             _valueBuffersCache[entityType] = valueBuffers;
         }
 
         return valueBuffers;
     }
 
-    public KafkaQueryContext(
-        QueryContextDependencies dependencies,
-        IKafkaCluster cluster)
+    public KafkaQueryContext(QueryContextDependencies dependencies, IKafkaCluster cluster)
         : base(dependencies)
     {
         Cluster = cluster;

diff --git a/src/net/KEFCore/Serdes/Internal/IKafkaSerdesEntityType.cs b/src/net/KEFCore/Serdes/Internal/IKafkaSerdesEntityType.cs
diff --git a/src/net/KEFCore/Serdes/Internal/IKafkaSerdesFactory.cs b/src/net/KEFCore/Serdes/Internal/IKafkaSerdesFactory.cs
diff --git a/src/net/KEFCore/Serdes/Internal/KafkaSerdesEntityType.cs b/src/net/KEFCore/Serdes/Internal/KafkaSerdesEntityType.cs
diff --git a/src/net/KEFCore/Serdes/Internal/KafkaSerdesFactory.cs b/src/net/KEFCore/Serdes/Internal/KafkaSerdesFactory.cs
diff --git a/src/net/KEFCore/Storage/Internal/IKafkaCluster.cs b/src/net/KEFCore/Storage/Internal/IKafkaCluster.cs
@@ -17,38 +17,25 @@
 */
 
 using MASES.EntityFrameworkCore.KNet.Infrastructure.Internal;
-using MASES.EntityFrameworkCore.KNet.Serdes.Internal;
 using MASES.EntityFrameworkCore.KNet.ValueGeneration.Internal;
 
 namespace MASES.EntityFrameworkCore.KNet.Storage.Internal;
 
-public interface IKafkaCluster :IDisposable
+public interface IKafkaCluster : IDisposable
 {
-    bool EnsureDeleted(
-        IUpdateAdapterFactory updateAdapterFactory,
-        IModel designModel,
-        IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
+    bool EnsureDeleted(IUpdateAdapterFactory updateAdapterFactory, IModel designModel, IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
 
-    bool EnsureCreated(
-        IUpdateAdapterFactory updateAdapterFactory,
-        IModel designModel,
-        IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
+    bool EnsureCreated(IUpdateAdapterFactory updateAdapterFactory, IModel designModel, IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
 
-    bool EnsureConnected(
-        IModel designModel,
-        IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
+    bool EnsureConnected(IModel designModel, IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
 
     string CreateTable(IEntityType entityType);
 
-    IKafkaSerdesFactory SerdesFactory { get; }
-
-    IEnumerable<ValueBuffer> GetData(IEntityType entityType);
+    IEnumerable<ValueBuffer> GetValueBuffers(IEntityType entityType);
 
     KafkaIntegerValueGenerator<TProperty> GetIntegerValueGenerator<TProperty>(IProperty property);
 
-    int ExecuteTransaction(
-        IList<IUpdateEntry> entries,
-        IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
+    int ExecuteTransaction(IList<IUpdateEntry> entries, IDiagnosticsLogger<DbLoggerCategory.Update> updateLogger);
 
     KafkaOptionsExtension Options { get; }
 }
diff --git a/src/net/KEFCore/Storage/Internal/IKafkaRowBag.cs b/src/net/KEFCore/Storage/Internal/IKafkaRowBag.cs
@@ -18,8 +18,6 @@
 
 #nullable enable
 
-using MASES.EntityFrameworkCore.KNet.Serdes.Internal;
-
 namespace MASES.EntityFrameworkCore.KNet.Storage.Internal;
 
 public interface IKafkaRowBag

diff --git a/src/net/KEFCore/Storage/Internal/IKafkaTable.cs b/src/net/KEFCore/Storage/Internal/IKafkaTable.cs
@@ -24,12 +24,10 @@
 
 namespace MASES.EntityFrameworkCore.KNet.Storage.Internal;
 
-public interface IKafkaTable : IDisposable
+public interface IKafkaTable : IEntityTypeProducer
 {
     IReadOnlyList<object?[]> SnapshotRows();
 
-    IEnumerable<ValueBuffer> ValueBuffers { get; }
-
     IEnumerable<object?[]> Rows { get; }
 
     IKafkaRowBag Create(IUpdateEntry entry);
@@ -38,11 +36,7 @@ public interface IKafkaTable : IDisposable
 
     IKafkaRowBag Update(IUpdateEntry entry);
 
-    IEnumerable<Future<RecordMetadata>> Commit(IEnumerable<IKafkaRowBag> records);
-
-    KafkaIntegerValueGenerator<TProperty> GetIntegerValueGenerator<TProperty>(
-        IProperty property,
-        IReadOnlyList<IKafkaTable> tables);
+    KafkaIntegerValueGenerator<TProperty> GetIntegerValueGenerator<TProperty>(IProperty property, IReadOnlyList<IKafkaTable> tables);
 
     void BumpValueGenerators(object?[] row);