Fix SparkSubmitParameterModifier issue (#2837)

Signed-off-by: Tomoyuki Morita <moritato@amazon.com> (cherry picked from commit 607354c) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 17, 2024 · 64fcc83 · 64fcc83
1 parent 8856f85
commit 64fcc83
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...y-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilder.java b/...y-core/src/main/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilder.java
@@ -154,7 +154,9 @@ public SparkSubmitParametersBuilder sessionExecution(String sessionId, String da
   }
 
   public SparkSubmitParametersBuilder acceptModifier(SparkSubmitParameterModifier modifier) {
-    modifier.modifyParameters(this);
+    if (modifier != null) {
+      modifier.modifyParameters(this);
+    }
     return this;
   }
 

diff --git a/...re/src/test/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderTest.java b/...re/src/test/java/org/opensearch/sql/spark/parameter/SparkSubmitParametersBuilderTest.java
@@ -152,6 +152,11 @@ public void testAcceptModifier() {
     verify(sparkSubmitParameterModifier).modifyParameters(sparkSubmitParametersBuilder);
   }
 
+  @Test
+  public void testAcceptNullModifier() {
+    sparkSubmitParametersBuilder.acceptModifier(null);
+  }
+
   @Test
   public void testDataSource() {
     when(sparkParameterComposerCollection.isComposerRegistered(DataSourceType.S3GLUE))