Additional unit test for invalid filter

Author: jpfinne

modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java

@@ -394,10 +394,11 @@ protected void normalizePaths() {
             if (Boolean.TRUE.equals(getRule(FILTER))) {
                 String filters = inputRules.get(FILTER);
                 Filter filter = createFilter(this.openAPI, filters);
-                filter.parse();
-                // Iterates over each HTTP method in methodMap, retrieves the corresponding Operations from the PathItem,
-                // and marks it as internal (`x-internal=true`) if the method/operationId/tag/path is not in the filters.
-                filter.apply(pathsEntry.getKey(), path, methodMap);
+                if (filter.parse()) {
+                    // Iterates over each HTTP method in methodMap, retrieves the corresponding Operations from the PathItem,
+                    // and marks it as internal (`x-internal=true`) if the method/operationId/tag/path is not in the filters.
+                    filter.apply(pathsEntry.getKey(), path, methodMap);
+                }
             }
 
             // Include callback operation as well
@@ -1812,6 +1813,7 @@ protected static class Filter {
         protected Set<String> methodFilters = Collections.emptySet();
         protected Set<String> tagFilters = Collections.emptySet();
         protected Set<String> pathStartingWithFilters = Collections.emptySet();
+        private boolean hasFilter;
 
         protected Filter(String filters) {
             this.filters = filters.trim();
@@ -1848,10 +1850,10 @@ private void doParse() {
                     String filterKey = filterStrs[0].trim();
                     String filterValue = filterStrs[1];
                     Set<String> parsedFilters = splitByPipe(filterValue);
+                    hasFilter = true;
                     if (OPERATION_ID.equals(filterKey)) {
                         operationIdFilters = parsedFilters;
                     } else if (METHOD.equals(filterKey)) {
-
                         methodFilters = parsedFilters;
                     } else if (TAG.equals(filterKey)) {
                         tagFilters = parsedFilters;
@@ -1909,7 +1911,7 @@ protected boolean hasCustomFilterMatch(String path, Operation operation) {
         }
 
         public boolean hasFilter() {
-            return !operationIdFilters.isEmpty() || !methodFilters.isEmpty() || !tagFilters.isEmpty() || !pathStartingWithFilters.isEmpty  ();
+            return hasFilter;
         }
 
         public void apply(String path, PathItem pathItem, Map<String, Function<PathItem, Operation>> methodMap) {

modules/openapi-generator/src/test/java/org/openapitools/codegen/OpenAPINormalizerTest.java

@@ -743,7 +743,6 @@ public CustomRoleFilter(String filters) {
             super(filters);
         }
 
-
         @Override
         protected void parse(String filterName, String filterValue) {
             if ("role".equals(filterName)) {
@@ -760,7 +759,7 @@ protected boolean hasCustomFilterMatch(String path, Operation operation) {
     }
 
     @Test
-    public void testFilterInvalidDoesThrow() {
+    public void testFilterInvalidSyntaxDoesThrow() {
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml");
 
         Map<String, String> options = Map.of("FILTER", "tag ; invalid");
@@ -772,6 +771,19 @@ public void testFilterInvalidDoesThrow() {
         }
     }
 
+    @Test
+    public void testFilterInvalidFilterDoesThrow() {
+        OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/enableKeepOnlyFirstTagInOperation_test.yaml");
+
+        Map<String, String> options = Map.of("FILTER", "method:get ; unknown:test");
+        try {
+            new OpenAPINormalizer(openAPI, options).normalize();
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+            assertEquals(e.getMessage(), "FILTER rule [method:get ; unknown:test] must be in the form of `operationId:name1|name2|name3` or `method:get|post|put` or `tag:tag1|tag2|tag3` or `path:/v1|/v2`. Error: filter not supported :[unknown:test]");
+        }
+    }
+
 
     @Test
     public void testComposedSchemaDoesNotThrow() {