RavenDB-21956 Address code review comments

djordjedjukic · May 20, 2024 · b7fc25d · b7fc25d
1 parent 5e4f43c
commit b7fc25d
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 111 deletions.
diff --git a/...r/Documents/ETL/Providers/Queue/AzureQueueStorage/AzureQueueStorageDocumentTransformer.cs b/...r/Documents/ETL/Providers/Queue/AzureQueueStorage/AzureQueueStorageDocumentTransformer.cs
@@ -1,7 +1,4 @@
-using Jint;
-using Jint.Native;
-using Jint.Native.Object;
-using Jint.Runtime.Interop;
+using Jint.Runtime.Interop;
 using Raven.Client.Documents.Operations.ETL;
 using Raven.Client.Documents.Operations.ETL.Queue;
 using Raven.Server.Documents.Patch;
@@ -23,7 +20,7 @@ protected override void LoadToFunction(string queueName, ScriptRunnerResult docu
         LoadToFunction(queueName, document, null);
     }
 
-    private void LoadToFunction(string queueName, ScriptRunnerResult document, CloudEventAttributes attributes)
+    protected override void LoadToFunction(string queueName, ScriptRunnerResult document, CloudEventAttributes attributes)
     {
         if (queueName == null)
             ThrowLoadParameterIsMandatory(nameof(queueName));
@@ -51,56 +48,4 @@ public override void Initialize(bool debugMode)
                 (self, args) => LoadToFunctionTranslatorWithAttributes(queueName, args)));
         }
     }
-
-    private JsValue LoadToFunctionTranslatorWithAttributes(JsValue self, JsValue[] args)
-    {
-        var methodSignature = "loadTo(name, obj, attributes)";
-
-        if (args.Length != 2 && args.Length != 3)
-            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with 2 or 3 parameters");
-
-        if (args[0].IsString() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} first argument must be a string");
-
-        if (args[1].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} second argument must be an object");
-
-        if (args.Length == 3 && args[2].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} third argument must be an object");
-
-        return LoadToFunctionTranslatorWithAttributesInternal(args[0].AsString(), args[1].AsObject(),
-            args.Length == 3 ? args[2].AsObject() : null);
-    }
-
-    private JsValue LoadToFunctionTranslatorWithAttributes(string name, JsValue[] args)
-    {
-        var methodSignature = $"loadTo{name}(obj, attributes)";
-
-        if (args.Length != 1 && args.Length != 2)
-            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with with 1 or 2 parameters");
-
-        if (args[0].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'obj' must be an object");
-
-        if (args.Length == 2 && args[1].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'attributes' must be an object");
-
-        return LoadToFunctionTranslatorWithAttributesInternal(name, args[0].AsObject(),
-            args.Length == 2 ? args[1].AsObject() : null);
-    }
-
-    private JsValue LoadToFunctionTranslatorWithAttributesInternal(string name, ObjectInstance obj,
-        ObjectInstance attributes)
-    {
-        var result = new ScriptRunnerResult(DocumentScript, obj);
-
-        CloudEventAttributes cloudEventAttributes = null;
-
-        if (attributes != null)
-            cloudEventAttributes = GetCloudEventAttributes(attributes);
-
-        LoadToFunction(name, result, cloudEventAttributes);
-
-        return result.Instance;
-    }
 }
diff --git a/src/Raven.Server/Documents/ETL/Providers/Queue/Kafka/KafkaDocumentTransformer.cs b/src/Raven.Server/Documents/ETL/Providers/Queue/Kafka/KafkaDocumentTransformer.cs
@@ -1,7 +1,4 @@
-using Jint;
-using Jint.Native;
-using Jint.Native.Object;
-using Jint.Runtime.Interop;
+using Jint.Runtime.Interop;
 using Raven.Client.Documents.Operations.ETL;
 using Raven.Client.Documents.Operations.ETL.Queue;
 using Raven.Server.Documents.Patch;
@@ -21,7 +18,7 @@ protected override void LoadToFunction(string topicName, ScriptRunnerResult docu
         LoadToFunction(topicName, document, null);
     }
 
-    private void LoadToFunction(string topicName, ScriptRunnerResult document, CloudEventAttributes attributes)
+    protected override void LoadToFunction(string topicName, ScriptRunnerResult document, CloudEventAttributes attributes)
     {
         if (topicName == null)
             ThrowLoadParameterIsMandatory(nameof(topicName));
@@ -47,53 +44,4 @@ public override void Initialize(bool debugMode)
                 (self, args) => LoadToFunctionTranslatorWithAttributes(queueName, args)));
         }
     }
-
-    private JsValue LoadToFunctionTranslatorWithAttributes(JsValue self, JsValue[] args)
-    {
-        var methodSignature = "loadTo(name, obj, attributes)";
-
-        if (args.Length != 2 && args.Length != 3)
-            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with 2 or 3 parameters");
-
-        if (args[0].IsString() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} first argument must be a string");
-
-        if (args[1].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} second argument must be an object");
-
-        if (args.Length == 3 && args[2].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} third argument must be an object");
-
-        return LoadToFunctionTranslatorWithAttributesInternal(args[0].AsString(), args[1].AsObject(), args.Length == 3 ? args[2].AsObject() : null);
-    }
-
-    private JsValue LoadToFunctionTranslatorWithAttributes(string name, JsValue[] args)
-    {
-        var methodSignature = $"loadTo{name}(obj, attributes)";
-
-        if (args.Length != 1 && args.Length != 2)
-            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with with 1 or 2 parameters");
-
-        if (args[0].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'obj' must be an object");
-
-        if (args.Length == 2 && args[1].IsObject() == false)
-            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'attributes' must be an object");
-
-        return LoadToFunctionTranslatorWithAttributesInternal(name, args[0].AsObject(), args.Length == 2 ? args[1].AsObject() : null);
-    }
-
-    private JsValue LoadToFunctionTranslatorWithAttributesInternal(string name, ObjectInstance obj, ObjectInstance attributes)
-    {
-        var result = new ScriptRunnerResult(DocumentScript, obj);
-
-        CloudEventAttributes cloudEventAttributes = null;
-
-        if (attributes != null)
-            cloudEventAttributes = GetCloudEventAttributes(attributes);
-
-        LoadToFunction(name, result, cloudEventAttributes);
-
-        return result.Instance;
-    }
 }
diff --git a/src/Raven.Server/Documents/ETL/Providers/Queue/QueueDocumentTransformer.cs b/src/Raven.Server/Documents/ETL/Providers/Queue/QueueDocumentTransformer.cs
@@ -190,4 +190,57 @@ bool TryGetDateAttributeValue(PropertyDescriptor attributeValue, out DateTimeOff
             return false;
         }
     }
+
+    protected abstract void LoadToFunction(string name, ScriptRunnerResult result, CloudEventAttributes cloudEventAttributes);
+
+    protected JsValue LoadToFunctionTranslatorWithAttributesInternal(string name, ObjectInstance obj, ObjectInstance attributes)
+    {
+        var result = new ScriptRunnerResult(DocumentScript, obj);
+
+        CloudEventAttributes cloudEventAttributes = null;
+
+        if (attributes != null)
+            cloudEventAttributes = GetCloudEventAttributes(attributes);
+
+        LoadToFunction(name, result, cloudEventAttributes);
+
+        return result.Instance;
+    }
+
+    protected JsValue LoadToFunctionTranslatorWithAttributes(JsValue self, JsValue[] args)
+    {
+        var methodSignature = "loadTo(name, obj, attributes)";
+
+        if (args.Length != 2 && args.Length != 3)
+            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with 2 or 3 parameters");
+
+        if (args[0].IsString() == false)
+            ThrowInvalidScriptMethodCall($"{methodSignature} first argument must be a string");
+
+        if (args[1].IsObject() == false)
+            ThrowInvalidScriptMethodCall($"{methodSignature} second argument must be an object");
+
+        if (args.Length == 3 && args[2].IsObject() == false)
+            ThrowInvalidScriptMethodCall($"{methodSignature} third argument must be an object");
+
+        return LoadToFunctionTranslatorWithAttributesInternal(args[0].AsString(), args[1].AsObject(),
+            args.Length == 3 ? args[2].AsObject() : null);
+    }
+
+    protected JsValue LoadToFunctionTranslatorWithAttributes(string name, JsValue[] args)
+    {
+        var methodSignature = $"loadTo{name}(obj, attributes)";
+
+        if (args.Length != 1 && args.Length != 2)
+            ThrowInvalidScriptMethodCall($"{methodSignature} must be called with with 1 or 2 parameters");
+
+        if (args[0].IsObject() == false)
+            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'obj' must be an object");
+
+        if (args.Length == 2 && args[1].IsObject() == false)
+            ThrowInvalidScriptMethodCall($"{methodSignature} argument 'attributes' must be an object");
+
+        return LoadToFunctionTranslatorWithAttributesInternal(name, args[0].AsObject(),
+            args.Length == 2 ? args[1].AsObject() : null);
+    }
 }
diff --git a/src/Raven.Server/Documents/ETL/Providers/Queue/RabbitMq/RabbitMqDocumentTransformer.cs b/src/Raven.Server/Documents/ETL/Providers/Queue/RabbitMq/RabbitMqDocumentTransformer.cs
@@ -137,4 +137,10 @@ private JsValue LoadToFunctionTranslatorWithAttributesInternal(string name, Obje
 
         return result.Instance;
     }
+
+    protected override void LoadToFunction(string name, ScriptRunnerResult result, CloudEventAttributes cloudEventAttributes)
+    {
+         // not needed for RabbitMq
+        throw new System.NotImplementedException();
+    }
 }