HSEARCH-3649 Add an exception to a jqassistant rule

hibernate · Sep 3, 2019 · 72d7926 · 72d7926
1 parent 0bc5c66
commit 72d7926
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/jqassistant/rules.xml b/jqassistant/rules.xml
@@ -418,7 +418,7 @@
             This allows to more easily understand which module a given type comes from.
             Exceptions are allowed when:
             - the misnamed type is an anonymous type, a generated type or a test type;
-            - or the misnamed type is an inner/nested type named "Builder" and its parent type does use the module-specific keyword;
+            - or the misnamed type is an inner/nested type named "(Abstract)?Builder" and its parent type does use the module-specific keyword;
             - or the implemented type is in a util module,
             in which case the implemented interface may just be a detail.
         </description>
@@ -436,11 +436,10 @@
                 AND NOT misnamedType:Generated
                 AND NOT misnamedType:Test
                 AND NOT (
-                        misnamedType.nameWithoutContainingTypeName = "Builder"
+                        misnamedType.nameWithoutContainingTypeName =~ "^(Abstract)?Builder$"
                         AND misnamedType.name =~ ("^(Abstract)?\\Q" + misnamedTypeArtifact.moduleSpecificKeyword + "\\E.*")
                 )
                 AND NOT externalParentTypeArtifact.name STARTS WITH "hibernate-search-util-"
-                AND NOT externalParentTypeArtifact.name STARTS WITH "hibernate-search-util-"
             RETURN misnamedTypeArtifact.moduleSpecificKeyword, misnamedType, externalParentType
         ]]></cypher>
     </constraint>