Fix classpath

Signed-off-by: Daniel Widdis <[email protected]>
opensearch-project · Jan 8, 2024 · dede991 · dede991
1 parent 68f83de
commit dede991
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java b/src/main/java/org/opensearch/flowframework/indices/FlowFrameworkIndicesHandler.java
@@ -290,7 +290,7 @@ private void shouldUpdateIndex(String indexName, Integer newVersion, ActionListe
      * @throws IOException IOException if mapping file can't be read correctly
      */
     public static String getIndexMappings(String mapping) throws IOException {
-        return ParseUtils.resourceToString(mapping);
+        return ParseUtils.resourceToString("/" + mapping);
     }
 
     /**

diff --git a/src/main/java/org/opensearch/flowframework/model/WorkflowValidator.java b/src/main/java/org/opensearch/flowframework/model/WorkflowValidator.java
@@ -59,7 +59,7 @@ public static WorkflowValidator parse(XContentParser parser) throws IOException
      * @throws IOException on failure to read and parse the json file
      */
     public static WorkflowValidator parse(String file) throws IOException {
-        String json = ParseUtils.resourceToString(file);
+        String json = ParseUtils.resourceToString("/" + file);
         return parse(ParseUtils.jsonToParser(json));
     }
 

diff --git a/src/test/java/org/opensearch/flowframework/TestHelpers.java b/src/test/java/org/opensearch/flowframework/TestHelpers.java
@@ -49,7 +49,7 @@
 public class TestHelpers {
 
     public static Template createTemplateFromFile(String fileName) throws IOException {
-        String json = ParseUtils.resourceToString("template/" + fileName);
+        String json = ParseUtils.resourceToString("/template/" + fileName);
         return Template.parse(json);
     }
 

diff --git a/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java b/src/test/java/org/opensearch/flowframework/util/ParseUtilsTests.java
@@ -25,12 +25,13 @@
 
 public class ParseUtilsTests extends OpenSearchTestCase {
     public void testResourceToStringToJson() throws IOException {
-        String json = ParseUtils.resourceToString("template/finaltemplate.json");
+        String json = ParseUtils.resourceToString("/template/finaltemplate.json");
         assertTrue(json.startsWith("{"));
         assertTrue(json.contains("name"));
+        System.err.println(json);
         try (XContentParser parser = ParseUtils.jsonToParser(json)) {
-            assertEquals(Token.FIELD_NAME, parser.currentToken());
-            assertEquals("name", parser.text());
+            assertEquals(Token.FIELD_NAME, parser.nextToken());
+            assertEquals("name", parser.currentName());
         }
     }