addressing more comments and adding more UT

Signed-off-by: Amit Galitzky <amgalitz@amazon.com>
opensearch-project · Mar 15, 2024 · cdb6459 · cdb6459
1 parent 88610c6
commit cdb6459
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java b/src/main/java/org/opensearch/flowframework/rest/RestCreateWorkflowAction.java
@@ -137,9 +137,10 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
                             }
                         }
                     } catch (Exception ex) {
+                        RestStatus status = ex instanceof IOException ? RestStatus.BAD_REQUEST : ExceptionsHelper.status(ex);
                         String errorMessage = "failure parsing request body when a use case is given";
                         logger.error(errorMessage, ex);
-                        throw new FlowFrameworkException(errorMessage, ExceptionsHelper.status(ex));
+                        throw new FlowFrameworkException(errorMessage, status);
                     }
 
                 }

diff --git a/src/main/java/org/opensearch/flowframework/util/ParseUtils.java b/src/main/java/org/opensearch/flowframework/util/ParseUtils.java
@@ -109,8 +109,6 @@ public static String resourceToString(String path) throws IOException {
     public static void buildStringToStringMap(XContentBuilder xContentBuilder, Map<?, ?> map) throws IOException {
         xContentBuilder.startObject();
         for (Entry<?, ?> e : map.entrySet()) {
-            String key = (String) e.getKey();
-            String value = (String) e.getValue();
             xContentBuilder.field((String) e.getKey(), (String) e.getValue());
         }
         xContentBuilder.endObject();

diff --git a/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java b/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
@@ -97,7 +97,7 @@ public void testConditionallySubstituteWithNoPlaceholders() {
 
         Object result = ParseUtils.conditionallySubstitute(input, outputs, params);
 
-        assertEquals("This string has no placeholders", result, "String should remain unchanged");
+        assertEquals("This string has no placeholders", result);
     }
 
     public void testConditionallySubstituteWithUnmatchedPlaceholders() {
@@ -107,7 +107,7 @@ public void testConditionallySubstituteWithUnmatchedPlaceholders() {
 
         Object result = ParseUtils.conditionallySubstitute(input, outputs, params);
 
-        assertEquals("This string has unmatched ${{placeholder}}", result, "String should remain unchanged due to unmatched placeholders");
+        assertEquals("This string has unmatched ${{placeholder}}", result);
     }
 
     public void testConditionallySubstituteWithOutputsSubstitution() {