From fea0a7f0ababf20e9eb421e311431cb49c10cfe5 Mon Sep 17 00:00:00 2001
From: Yizhe Liu <59710443+yizheliu-amazon@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:58:54 -0800
Subject: [PATCH] Clean up unused validateFieldName() and use existing methods
 for TextEmbeddingProcessorIT (#1074)

Signed-off-by: Yizhe Liu <yizheliu@amazon.com>
---
 .../util/ProcessorDocumentUtils.java          | 24 -------------------
 .../processor/TextEmbeddingProcessorIT.java   |  9 ++-----
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/opensearch/neuralsearch/util/ProcessorDocumentUtils.java b/src/main/java/org/opensearch/neuralsearch/util/ProcessorDocumentUtils.java
index 6f9297e5c..0cbf4534d 100644
--- a/src/main/java/org/opensearch/neuralsearch/util/ProcessorDocumentUtils.java
+++ b/src/main/java/org/opensearch/neuralsearch/util/ProcessorDocumentUtils.java
@@ -296,30 +296,6 @@ private static void unflattenSingleItem(String key, Object value, Map<String, Ob
         }
     }
 
-    /**
-     * Validate if field name is in correct format, which is either "a", or "a.b.c".
-     * If field name is like "..a..b", "a..b", "a.b..", it should be invalid.
-     * This is done via checking if a string contains empty segments when split by dots.
-     *
-     * @param input the string to check
-     * @throws IllegalArgumentException if the input is null or has invalid dot usage
-     */
-    private static void validateFieldName(String input) {
-        if (StringUtils.isBlank(input)) {
-            throw new IllegalArgumentException("Field name cannot be null or empty");
-        }
-
-        // Use split with -1 limit to preserve trailing empty strings
-        String[] segments = input.split("\\.", -1);
-
-        // Check if any segment is empty
-        for (String segment : segments) {
-            if (StringUtils.isBlank(segment)) {
-                throw new IllegalArgumentException(String.format(Locale.ROOT, "Field name '%s' contains invalid dot usage", input));
-            }
-        }
-    }
-
     // Helper classes to maintain state during iteration
     private static class ProcessJsonObjectItem {
         String key;
diff --git a/src/test/java/org/opensearch/neuralsearch/processor/TextEmbeddingProcessorIT.java b/src/test/java/org/opensearch/neuralsearch/processor/TextEmbeddingProcessorIT.java
index 26e30d529..d872aafcd 100644
--- a/src/test/java/org/opensearch/neuralsearch/processor/TextEmbeddingProcessorIT.java
+++ b/src/test/java/org/opensearch/neuralsearch/processor/TextEmbeddingProcessorIT.java
@@ -280,14 +280,9 @@ public void testNestedFieldMapping_whenDocumentInListIngested_thenSuccessful() t
             Map<String, Object> searchResponseAsMap = search(INDEX_NAME, queryNestedHighLevel, 2);
             assertNotNull(searchResponseAsMap);
 
-            Map<String, Object> hits = (Map<String, Object>) searchResponseAsMap.get("hits");
-            assertNotNull(hits);
-
-            List<Map<String, Object>> listOfHits = (List<Map<String, Object>>) hits.get("hits");
-            assertNotNull(listOfHits);
-            assertEquals(1, listOfHits.size());
+            assertEquals(1, getHitCount(searchResponseAsMap));
 
-            Map<String, Object> innerHitDetails = listOfHits.getFirst();
+            Map<String, Object> innerHitDetails = getFirstInnerHit(searchResponseAsMap);
             assertEquals("5", innerHitDetails.get("_id"));
         } finally {
             wipeOfTestResources(INDEX_NAME, PIPELINE_NAME, modelId, null);