Addressed PR comments

Signed-off-by: Owais <[email protected]>

Author: owaiskazi19

src/main/java/org/opensearch/neuralsearch/processor/ValidateNormalizationDTO.java src/main/java/org/opensearch/neuralsearch/processor/TechniqueCompatibilityCheckDTO.java

@@ -9,14 +9,17 @@
 import lombok.Getter;
 import lombok.NonNull;
 import org.opensearch.neuralsearch.processor.combination.ScoreCombinationTechnique;
+import org.opensearch.neuralsearch.processor.normalization.ScoreNormalizationTechnique;
 
 /**
  * DTO object to hold data required for validation.
  */
 @AllArgsConstructor
 @Builder
 @Getter
-public class ValidateNormalizationDTO {
+public class TechniqueCompatibilityCheckDTO {
     @NonNull
     private ScoreCombinationTechnique scoreCombinationTechnique;
+    @NonNull
+    private ScoreNormalizationTechnique scoreNormalizationTechnique;
 }

src/main/java/org/opensearch/neuralsearch/processor/combination/ScoreCombinationTechnique.java

@@ -13,5 +13,8 @@ public interface ScoreCombinationTechnique {
      */
     float combine(final float[] scores);
 
+    /**
+     * Returns the name of the combination technique.
+     */
     String techniqueName();
 }

src/main/java/org/opensearch/neuralsearch/processor/factory/NormalizationProcessorFactory.java

@@ -12,7 +12,7 @@
 
 import org.opensearch.neuralsearch.processor.NormalizationProcessor;
 import org.opensearch.neuralsearch.processor.NormalizationProcessorWorkflow;
-import org.opensearch.neuralsearch.processor.ValidateNormalizationDTO;
+import org.opensearch.neuralsearch.processor.TechniqueCompatibilityCheckDTO;
 import org.opensearch.neuralsearch.processor.combination.ArithmeticMeanScoreCombinationTechnique;
 import org.opensearch.neuralsearch.processor.combination.ScoreCombinationFactory;
 import org.opensearch.neuralsearch.processor.combination.ScoreCombinationTechnique;
@@ -79,10 +79,11 @@ public SearchPhaseResultsProcessor create(
             scoreCombinationTechnique = scoreCombinationFactory.createCombination(combinationTechnique, combinationParams);
         }
 
-        ValidateNormalizationDTO validateDTO = ValidateNormalizationDTO.builder()
+        TechniqueCompatibilityCheckDTO techniqueCompatibilityCheckDTO = TechniqueCompatibilityCheckDTO.builder()
+            .scoreNormalizationTechnique(normalizationTechnique)
             .scoreCombinationTechnique(scoreCombinationTechnique)
             .build();
-        scoreNormalizationFactory.validateNormalizationTechnique(normalizationTechnique, validateDTO);
+        scoreNormalizationFactory.isTechniquesCompatible(techniqueCompatibilityCheckDTO);
 
         log.info(
             "Creating search phase results processor of type [{}] with normalization [{}] and combination [{}]",

src/main/java/org/opensearch/neuralsearch/processor/normalization/ScoreNormalizationFactory.java

@@ -4,14 +4,14 @@
  */
 package org.opensearch.neuralsearch.processor.normalization;
 
-import org.opensearch.neuralsearch.processor.ValidateNormalizationDTO;
+import org.opensearch.neuralsearch.processor.TechniqueCompatibilityCheckDTO;
 import org.opensearch.neuralsearch.processor.combination.ArithmeticMeanScoreCombinationTechnique;
 import org.opensearch.neuralsearch.processor.combination.GeometricMeanScoreCombinationTechnique;
 import org.opensearch.neuralsearch.processor.combination.HarmonicMeanScoreCombinationTechnique;
 
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -24,7 +24,7 @@ public class ScoreNormalizationFactory {
 
     public static final ScoreNormalizationTechnique DEFAULT_METHOD = new MinMaxScoreNormalizationTechnique();
 
-    private final Map<String, Function<Map<String, Object>, ScoreNormalizationTechnique>> scoreNormalizationMethodsMap = Map.of(
+    private static final Map<String, Function<Map<String, Object>, ScoreNormalizationTechnique>> scoreNormalizationMethodsMap = Map.of(
         MinMaxScoreNormalizationTechnique.TECHNIQUE_NAME,
         params -> new MinMaxScoreNormalizationTechnique(params, scoreNormalizationUtil),
         L2ScoreNormalizationTechnique.TECHNIQUE_NAME,
@@ -35,27 +35,27 @@ public class ScoreNormalizationFactory {
         params -> new ZScoreNormalizationTechnique()
     );
 
-    private final Map<String, List<String>> combinationTechniqueForNormalizationTechniqueMap = Map.of(
+    private final Map<String, Set<String>> combinationTechniqueForNormalizationTechniqueMap = Map.of(
         MinMaxScoreNormalizationTechnique.TECHNIQUE_NAME,
-        List.of(
+        Set.of(
             ArithmeticMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             GeometricMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             HarmonicMeanScoreCombinationTechnique.TECHNIQUE_NAME
         ),
         L2ScoreNormalizationTechnique.TECHNIQUE_NAME,
-        List.of(
+        Set.of(
             ArithmeticMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             GeometricMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             HarmonicMeanScoreCombinationTechnique.TECHNIQUE_NAME
         ),
         RRFNormalizationTechnique.TECHNIQUE_NAME,
-        List.of(
+        Set.of(
             ArithmeticMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             GeometricMeanScoreCombinationTechnique.TECHNIQUE_NAME,
             HarmonicMeanScoreCombinationTechnique.TECHNIQUE_NAME
         ),
         ZScoreNormalizationTechnique.TECHNIQUE_NAME,
-        List.of(ArithmeticMeanScoreCombinationTechnique.TECHNIQUE_NAME)
+        Set.of(ArithmeticMeanScoreCombinationTechnique.TECHNIQUE_NAME)
     );
 
     /**
@@ -75,21 +75,18 @@ public ScoreNormalizationTechnique createNormalization(final String technique, f
 
     /**
      * Validate normalization technique based on combination technique and other params that needs to be validated
-     * @param normalizationTechnique normalization technique to be validated
-     * @param validateNormalizationDTO data transfer object that contains combination technique and other params that needs to be validated
+     * @param techniqueCompatibilityCheckDTO data transfer object that contains combination technique and other params that needs to be validated
      */
-    public void validateNormalizationTechnique(
-        ScoreNormalizationTechnique normalizationTechnique,
-        ValidateNormalizationDTO validateNormalizationDTO
-    ) {
-        List<String> supportedTechniques = combinationTechniqueForNormalizationTechniqueMap.get(normalizationTechnique.techniqueName());
+    public void isTechniquesCompatible(TechniqueCompatibilityCheckDTO techniqueCompatibilityCheckDTO) {
+        ScoreNormalizationTechnique normalizationTechnique = techniqueCompatibilityCheckDTO.getScoreNormalizationTechnique();
+        Set<String> supportedTechniques = combinationTechniqueForNormalizationTechniqueMap.get(normalizationTechnique.techniqueName());
 
-        if (!supportedTechniques.contains(validateNormalizationDTO.getScoreCombinationTechnique().techniqueName())) {
+        if (supportedTechniques.contains(techniqueCompatibilityCheckDTO.getScoreCombinationTechnique().techniqueName()) == false) {
             throw new IllegalArgumentException(
                 String.format(
                     Locale.ROOT,
                     "provided combination technique %s is not supported for normalization technique %s. Supported techniques are: %s",
-                    validateNormalizationDTO.getScoreCombinationTechnique().techniqueName(),
+                    techniqueCompatibilityCheckDTO.getScoreCombinationTechnique().techniqueName(),
                     normalizationTechnique.techniqueName(),
                     String.join(", ", supportedTechniques)
                 )

src/main/java/org/opensearch/neuralsearch/processor/normalization/ScoreNormalizationTechnique.java

@@ -20,5 +20,8 @@ public interface ScoreNormalizationTechnique {
      */
     void normalize(final NormalizeScoresDTO normalizeScoresDTO);
 
+    /**
+     * Returns the name of the normalization technique.
+     */
     String techniqueName();
 }