add beans for PythonExecutorCommunicationServiceImpl (#1404)

Co-authored-by: TVerdesOprea <[email protected]>
CloudSlang · Feb 16, 2023 · 96b31a1 · 96b31a1
1 parent 9f7b933
commit 96b31a1
Show file tree

Hide file tree

Showing 10 changed files with 150 additions and 90 deletions.
diff --git a/...slang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ArgumentsBindingTest.java b/...slang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ArgumentsBindingTest.java
@@ -29,8 +29,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionNotCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -466,10 +467,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/InputsBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/InputsBindingTest.java
@@ -27,8 +27,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -565,10 +566,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/OutputsBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/OutputsBindingTest.java
@@ -26,8 +26,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -273,10 +274,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ResultBindingTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/bindings/ResultBindingTest.java
@@ -27,8 +27,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -250,10 +251,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java b/...untime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptEvaluatorTest.java
@@ -25,8 +25,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutor;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -216,10 +217,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java b/...runtime/src/test/java/io/cloudslang/lang/runtime/bindings/scripts/ScriptExecutorTest.java
@@ -24,8 +24,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutor;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.events.EventBus;
@@ -206,10 +207,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ActionStepsTest.java
@@ -36,8 +36,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.api.execution.ExecutionParametersConsts;
@@ -1213,10 +1214,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ExecutableStepsTest.java
@@ -46,8 +46,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonRuntimeServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.api.execution.precondition.ExecutionPreconditionService;
@@ -517,10 +518,15 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonExecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }
 
         @Bean(name = "externalPythonRuntimeService")

diff --git a/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java b/cloudslang-runtime/src/test/java/io/cloudslang/lang/runtime/steps/ParallelLoopStepsTest.java
@@ -37,8 +37,9 @@
 import io.cloudslang.runtime.impl.python.PythonExecutionCachedEngine;
 import io.cloudslang.runtime.impl.python.PythonExecutionEngine;
 import io.cloudslang.runtime.impl.python.PythonRuntimeServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.ExternalPythonExecutorServiceImpl;
+import io.cloudslang.runtime.impl.python.executor.PythonExecutorCommunicationServiceImpl;
 import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutionEngine;
-import io.cloudslang.runtime.impl.python.external.ExternalPythonExecutorServiceImpl;
 import io.cloudslang.runtime.impl.python.external.StatefulRestEasyClientsHolder;
 import io.cloudslang.score.api.EndBranchDataContainer;
 import io.cloudslang.score.events.EventBus;
@@ -613,15 +614,20 @@ public PythonExecutorConfigurationDataService pythonExecutorConfigurationDataSer
             return PythonExecutorDetails::new;
         }
 
+        @Bean(name = "pythonExecutorCommunicationService")
+        public PythonExecutorCommunicationServiceImpl pythonExecutorCommunicationService() {
+            return new PythonExecutorCommunicationServiceImpl(
+                    mock(StatefulRestEasyClientsHolder.class), mock(PythonExecutorConfigurationDataService.class));
+        }
+
         @Bean(name = "externalPythonRuntimeService")
         public PythonRuntimeService externalPythonRuntimeService() {
             return new PythonRuntimeServiceImpl();
         }
 
         @Bean(name = "externalPythonExecutorService")
         public PythonRuntimeService externalPythonexecutorService() {
-            return new ExternalPythonExecutorServiceImpl(mock(StatefulRestEasyClientsHolder.class),
-                    new Semaphore(100), new Semaphore(50));
+            return new ExternalPythonExecutorServiceImpl(new Semaphore(100), new Semaphore(50));
         }