Revert "[no tests yet] add GroupConstraint.union() and implementation…

… GroupConstraintImpl.union()" This reverts commit 139ef24.
NASA-PDS · May 1, 2023 · badc29b · badc29b
1 parent a805f2a
commit badc29b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 61 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/GroupConstraint.java b/service/src/main/java/gov/nasa/pds/api/registry/GroupConstraint.java
@@ -30,10 +30,4 @@ public interface GroupConstraint {
    * Group.
    */
   public Map<String, List<String>> mustNot();
-
-  /**
-   * Return the union of this GroupConstraint and another.  Equivalent to taking the union of both FILTER sets, the union of both MUST sets, and the union of both MUSTNOT sets
-   */
-
-  public GroupConstraint union(GroupConstraint otherConstraint);
 }
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/util/GroupConstraintImpl.java b/service/src/main/java/gov/nasa/pds/api/registry/util/GroupConstraintImpl.java
@@ -3,20 +3,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import com.google.errorprone.annotations.Immutable;
 
 import gov.nasa.pds.api.registry.GroupConstraint;
-import gov.nasa.pds.api.registry.search.SearchRequestFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Immutable
 public class GroupConstraintImpl implements GroupConstraint {
-
-  private static final Logger log = LoggerFactory.getLogger(GroupConstraintImpl.class);
-
   final private Map<String, List<String>> filter;
   final private Map<String, List<String>> must;
   final private Map<String, List<String>> mustNot;
@@ -43,54 +36,6 @@ public Map<String, List<String>> mustNot() {
     return mustNot;
   }
 
-
-  /**
-   * Perform a union on a pair of a single constraint type (filter, must or mustNot)
-   */
-  private Map<String, List<String>> performConstraintUnion(Map<String, List<String>> constraint1, Map<String, List<String>> constraint2) {
-    Map<String, List<String>> unionConstraint = new HashMap<>(constraint1);
-    constraint2.forEach(
-        (key, value) -> {
-          if (unionConstraint.containsKey(key)) {
-            unionConstraint.get(key).addAll(value);
-            List<String> deduplicatedValue = List.copyOf(Set.copyOf(unionConstraint.get(key)));
-            unionConstraint.put(key, deduplicatedValue);
-          } else {
-            unionConstraint.put(key, List.copyOf(value));
-          }
-        });
-
-    return unionConstraint;
-  }
-
-  private void logMutuallyExclusiveMustConditions(Map<String, List<String>> mustConditions) {
-    mustConditions.forEach(
-        (key, value) -> {
-          if (value.size() > 1) {
-            log.warn(
-                "Multiple values for 'must' condition are mutually-exclusive and will always fail: property='"
-                    + key
-                    + "', values=['"
-                    + String.join("', '", value)
-                    + "']");
-          }
-        });
-  }
-
-  @Override
-  public GroupConstraint union(GroupConstraint otherGroupConstraint) {
-    Map<String, List<String>> unionFilter =
-        performConstraintUnion(this.filter, otherGroupConstraint.filter());
-    Map<String, List<String>> unionMust =
-        performConstraintUnion(this.must, otherGroupConstraint.must());
-    Map<String, List<String>> unionMustNot =
-        performConstraintUnion(this.mustNot, otherGroupConstraint.mustNot());
-
-    logMutuallyExclusiveMustConditions(unionMust);
-
-    return new GroupConstraintImpl(unionMust, unionFilter, unionMustNot);
-  }
-
   final private static Map<String, List<String>> EMPTY = new HashMap<String, List<String>>();
 
   public static GroupConstraint empty() {