remove get all chunkers in chunker factory

Signed-off-by: yuye-aws <[email protected]>
yuye-aws · Mar 14, 2024 · 87679ad · 87679ad
1 parent a574980
commit 87679ad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 36 deletions.
diff --git a/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java b/src/main/java/org/opensearch/neuralsearch/processor/TextChunkingProcessor.java
@@ -7,7 +7,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.Locale;
 import java.util.ArrayList;
 import java.util.List;
@@ -101,18 +100,6 @@ private void validateAndParseAlgorithmMap(final Map<String, Object> algorithmMap
         Entry<String, Object> algorithmEntry = algorithmMap.entrySet().iterator().next();
         String algorithmKey = algorithmEntry.getKey();
         Object algorithmValue = algorithmEntry.getValue();
-        Set<String> supportedChunkers = ChunkerFactory.getAllChunkers();
-        if (!supportedChunkers.contains(algorithmKey)) {
-            throw new IllegalArgumentException(
-                String.format(
-                    Locale.ROOT,
-                    "Unable to create %s processor as chunker algorithm [%s] is not supported. Supported chunkers types are %s",
-                    TYPE,
-                    algorithmKey,
-                    supportedChunkers
-                )
-            );
-        }
         if (!(algorithmValue instanceof Map)) {
             throw new IllegalArgumentException(
                 String.format(

diff --git a/src/main/java/org/opensearch/neuralsearch/processor/chunker/ChunkerFactory.java b/src/main/java/org/opensearch/neuralsearch/processor/chunker/ChunkerFactory.java
@@ -5,10 +5,8 @@
 package org.opensearch.neuralsearch.processor.chunker;
 
 import com.google.common.collect.ImmutableMap;
-import lombok.Getter;
 
 import java.util.Map;
-import java.util.Set;
 import java.util.Locale;
 import java.util.function.Function;
 
@@ -24,16 +22,13 @@ public class ChunkerFactory {
         DelimiterChunker::new
     );
 
-    @Getter
-    private static final Set<String> allChunkers = chunkers.keySet();
-
     public static Chunker create(final String type, final Map<String, Object> parameters) {
         Function<Map<String, Object>, Chunker> chunkerConstructionFunction = chunkers.get(type);
         if (chunkerConstructionFunction == null) {
             throw new IllegalArgumentException(
                 String.format(
                     Locale.ROOT,
-                    "chunking algorithm [%s] is not supported. Supported chunking algorithms are %s",
+                    "Chunking algorithm [%s] is not supported. Supported chunking algorithms are %s",
                     type,
                     chunkers.keySet()
                 )

diff --git a/src/test/java/org/opensearch/neuralsearch/processor/TextChunkingProcessorTests.java b/src/test/java/org/opensearch/neuralsearch/processor/TextChunkingProcessorTests.java
@@ -248,14 +248,7 @@ public void testCreate_whenAlgorithmFieldInvalidAlgorithmName_thenFail() {
             () -> textChunkingProcessorFactory.create(registry, PROCESSOR_TAG, DESCRIPTION, config)
         );
         assert (illegalArgumentException.getMessage()
-            .contains(
-                String.format(
-                    Locale.ROOT,
-                    "Unable to create %s processor as chunker algorithm [%s] is not supported.",
-                    TYPE,
-                    invalid_algorithm_type
-                )
-            ));
+            .contains(String.format(Locale.ROOT, "Chunking algorithm [%s] is not supported.", invalid_algorithm_type)));
     }
 
     public void testCreate_whenAlgorithmFieldInvalidAlgorithmContent_thenFail() {

diff --git a/src/test/java/org/opensearch/neuralsearch/processor/chunker/ChunkerFactoryTests.java b/src/test/java/org/opensearch/neuralsearch/processor/chunker/ChunkerFactoryTests.java
@@ -11,7 +11,6 @@
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 
 import static org.opensearch.neuralsearch.processor.chunker.FixedTokenLengthChunker.ANALYSIS_REGISTRY_FIELD;
 
@@ -20,11 +19,6 @@ public class ChunkerFactoryTests extends OpenSearchTestCase {
     @Mock
     private AnalysisRegistry analysisRegistry;
 
-    public void testGetAllChunkers() {
-        Set<String> expected = Set.of(FixedTokenLengthChunker.ALGORITHM_NAME, DelimiterChunker.ALGORITHM_NAME);
-        assertEquals(expected, ChunkerFactory.getAllChunkers());
-    }
-
     public void testCreate_FixedTokenLength() {
         Chunker chunker = ChunkerFactory.create(FixedTokenLengthChunker.ALGORITHM_NAME, createChunkParameters());
         assertNotNull(chunker);
@@ -38,13 +32,13 @@ public void testCreate_Delimiter() {
     }
 
     public void testCreate_Invalid() {
-        String invalidChunkerType = "Invalid Chunker Type";
+        String invalidChunkerName = "Invalid Chunker Algorithm";
         IllegalArgumentException illegalArgumentException = assertThrows(
             IllegalArgumentException.class,
-            () -> ChunkerFactory.create(invalidChunkerType, createChunkParameters())
+            () -> ChunkerFactory.create(invalidChunkerName, createChunkParameters())
         );
         assert (illegalArgumentException.getMessage()
-            .contains(String.format(Locale.ROOT, "chunking algorithm [%s] is not supported.", invalidChunkerType)));
+            .contains(String.format(Locale.ROOT, "Chunking algorithm [%s] is not supported.", invalidChunkerName)));
     }
 
     private Map<String, Object> createChunkParameters() {