Filter with an OR opperation

mbouchenoire · May 17, 2021 · 2e1649f · 2e1649f
1 parent 77d0e2b
commit 2e1649f
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 14 deletions.
diff --git a/src/main/java/org/lowfer/domain/common/ComponentFilters.java b/src/main/java/org/lowfer/domain/common/ComponentFilters.java
@@ -48,10 +48,12 @@ public static Builder builder() {
 
     @Override
     public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
+        if (!nameFilter.isSet() && !typeFilter.isSet() && !maintainerFilter.isSet() && !internalFilter.isSet()) return true;
+
         return nameFilter.test(architecture, component)
-            && typeFilter.test(architecture, component)
-            && maintainerFilter.test(architecture, component)
-            && internalFilter.test(architecture, component);
+            || typeFilter.test(architecture, component)
+            || maintainerFilter.test(architecture, component)
+            || internalFilter.test(architecture, component);
     }
 
     public static class Builder {

diff --git a/src/main/java/org/lowfer/domain/common/ComponentMaintainerFilter.java b/src/main/java/org/lowfer/domain/common/ComponentMaintainerFilter.java
@@ -45,10 +45,12 @@ public static ComponentMaintainerFilter ofText(String text) {
     }
 
     @Override
-    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
-        if (maintainerNames.isEmpty())
-            return true;
+    public boolean isSet() {
+        return !maintainerNames.isEmpty();
+    }
 
+    @Override
+    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
         return maintainerNames.stream()
                 .anyMatch(maintainerName -> component.getMaintainers().stream()
                         .anyMatch(maintainer -> maintainer.getName().equals(maintainerName)));

diff --git a/src/main/java/org/lowfer/domain/common/ComponentNameFilter.java b/src/main/java/org/lowfer/domain/common/ComponentNameFilter.java
@@ -45,10 +45,12 @@ public static ComponentNameFilter ofText(String text) {
     }
 
     @Override
-    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
-        if (componentNames.isEmpty())
-            return true;
+    public boolean isSet() {
+        return !componentNames.isEmpty();
+    }
 
+    @Override
+    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
         return componentNames.contains(component.getName());
     }
 }
diff --git a/src/main/java/org/lowfer/domain/common/ComponentTypeFilter.java b/src/main/java/org/lowfer/domain/common/ComponentTypeFilter.java
@@ -49,10 +49,12 @@ public static ComponentTypeFilter ofText(String text) {
     }
 
     @Override
-    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
-        if (componentTypes.isEmpty())
-            return true;
+    public boolean isSet() {
+        return !componentTypes.isEmpty();
+    }
 
+    @Override
+    public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
         return componentTypes.contains(component.getType());
     }
 }
diff --git a/src/main/java/org/lowfer/domain/common/InternalComponentFilter.java b/src/main/java/org/lowfer/domain/common/InternalComponentFilter.java
@@ -27,9 +27,14 @@ public InternalComponentFilter(boolean apply) {
         this.apply = apply;
     }
 
+    @Override
+    public boolean isSet() {
+        return apply;
+    }
+
     @Override
     public boolean test(SoftwareArchitecture architecture, SoftwareComponent component) {
-        return !component.isExternal() || !apply;
+        return !component.isExternal() && apply;
     }
 
     @Override

diff --git a/src/main/java/org/lowfer/domain/common/SoftwareComponentFilter.java b/src/main/java/org/lowfer/domain/common/SoftwareComponentFilter.java
@@ -21,6 +21,10 @@
 
 public interface SoftwareComponentFilter {
 
+    default boolean isSet() {
+        return false;
+    }
+
     boolean test(SoftwareArchitecture architecture, SoftwareComponent component);
 
     // TODO ?

diff --git a/src/test/java/org/lowfer/domain/common/InternalComponentFilterTest.java b/src/test/java/org/lowfer/domain/common/InternalComponentFilterTest.java
@@ -38,7 +38,7 @@ void testHideExternalComponent() {
         final SoftwareArchitecture architecture =
             new SoftwareArchitecture("architecture", Set.of(internal, external));
 
-        assertTrue(new InternalComponentFilter(false).test(architecture, external));
+        assertFalse(new InternalComponentFilter(false).test(architecture, external));
         assertFalse(new InternalComponentFilter(true).test(architecture, external));
     }
 }