Address PR comments

Signed-off-by: Andres Gomez Ferrer <[email protected]>
flyteorg · Jul 31, 2023 · 172afb3 · 172afb3
1 parent b4e4062
commit 172afb3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/jflyte/src/main/java/org/flyte/jflyte/ProjectClosure.java b/jflyte/src/main/java/org/flyte/jflyte/ProjectClosure.java
@@ -506,9 +506,7 @@ private static Optional<KeyValuePair> javaToolOptionsEnv(RunnableTask task) {
       javaToolOptions.add("-Xmx" + maxMemory);
     }
 
-    if (!task.getCustomJavaToolOptions().isEmpty()) {
-      javaToolOptions.addAll(task.getCustomJavaToolOptions());
-    }
+    javaToolOptions.addAll(task.getCustomJavaToolOptions());
 
     if (javaToolOptions.isEmpty()) {
       return Optional.empty();

diff --git a/jflyte/src/test/java/org/flyte/jflyte/ProjectClosureTest.java b/jflyte/src/test/java/org/flyte/jflyte/ProjectClosureTest.java
@@ -473,7 +473,8 @@ public void testCreateTaskTemplateForRunnableTaskWithResources() {
   public void testCreateTaskTemplateForRunnableTaskWithCustomJavaToolOptions() {
     // given
     RunnableTask task =
-        createRunnableTask(Resources.builder().build(), List.of("-CustomFlag", "-CustomFlag2"));
+        createRunnableTask(
+            Resources.builder().build(), List.of("-CustomFlag", "-AnotherCustomFlag"));
     String image = "my-image";
 
     // when
@@ -486,7 +487,8 @@ public void testCreateTaskTemplateForRunnableTaskWithCustomJavaToolOptions() {
     assertThat(
         container.env(),
         equalTo(
-            ImmutableList.of(KeyValuePair.of("JAVA_TOOL_OPTIONS", "-CustomFlag -CustomFlag2"))));
+            ImmutableList.of(
+                KeyValuePair.of("JAVA_TOOL_OPTIONS", "-CustomFlag -AnotherCustomFlag"))));
     assertThat(
         result.interface_(),
         equalTo(