From 172afb3713dbddea7121c1a23e8d369494812104 Mon Sep 17 00:00:00 2001
From: Andres Gomez Ferrer <andresg@spotify.com>
Date: Mon, 31 Jul 2023 16:52:53 +0200
Subject: [PATCH] Address PR comments

Signed-off-by: Andres Gomez Ferrer <andresg@spotify.com>
---
 jflyte/src/main/java/org/flyte/jflyte/ProjectClosure.java   | 4 +---
 .../src/test/java/org/flyte/jflyte/ProjectClosureTest.java  | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jflyte/src/main/java/org/flyte/jflyte/ProjectClosure.java b/jflyte/src/main/java/org/flyte/jflyte/ProjectClosure.java
index 49270daa6..cbe7e16f7 100644
--- 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
index 46b93bc06..a927b89c5 100644
--- 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(