[kie-issues #673] Remove checkstyle warnings from drools compiler mod…

…ule (#5574) * Fixed imports * Replaced tabs with spaces * Fixed issues with missing braces * fixed last class * Reverted changes for generated files. * Ignored warnings from generated files
apache · Nov 8, 2023 · 574e45a · 574e45a
1 parent 8a2b9db
commit 574e45a
Show file tree

Hide file tree

Showing 142 changed files with 610 additions and 507 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -44,6 +44,7 @@
 
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
     <checkstyle.logViolationsToConsole>true</checkstyle.logViolationsToConsole>
+    <drools.exclude.checkstyle></drools.exclude.checkstyle>
 
     <victims.updates>weekly</victims.updates>
     <illegaltransitivereportonly>false</illegaltransitivereportonly>
@@ -1581,6 +1582,9 @@
               <configuration>
                 <checkstyleRules>
                   <module name="Checker">
+ <module name="BeforeExecutionExclusionFileFilter">
+    <property name="fileNamePattern" value="${drools.exclude.checkstyle}"/>
+  </module>                  
                     <!-- Checks for whitespace. -->
                     <module name="FileTabCharacter">
                       <property name="severity" value="error"/>

diff --git a/drools-compiler/pom.xml b/drools-compiler/pom.xml
@@ -39,6 +39,7 @@
     <java.module.name>org.drools.compiler</java.module.name>
     <excludedGroups>org.kie.test.testcategory.TurtleTestCategory</excludedGroups>
     <surefire.forkCount>2</surefire.forkCount>
+    <drools.exclude.checkstyle>JavaParser.java|JavaLexer.java</drools.exclude.checkstyle>
   </properties>
 
   <dependencies>

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/DroolsAssemblerContext.java b/drools-compiler/src/main/java/org/drools/compiler/builder/DroolsAssemblerContext.java
@@ -22,14 +22,14 @@
 import java.util.List;
 import java.util.Map;
 
+import org.drools.base.base.ObjectType;
+import org.drools.base.rule.TypeDeclaration;
 import org.drools.compiler.builder.impl.BuilderConfigurationProvider;
 import org.drools.compiler.builder.impl.InternalKnowledgeBaseProvider;
 import org.drools.compiler.builder.impl.RootClassLoaderProvider;
 import org.drools.compiler.compiler.PackageRegistry;
 import org.drools.compiler.rule.builder.PackageBuildContext;
 import org.drools.compiler.rule.builder.RuleBuildContext;
-import org.drools.base.base.ObjectType;
-import org.drools.base.rule.TypeDeclaration;
 import org.drools.drl.ast.descr.PackageDescr;
 import org.kie.internal.builder.KnowledgeBuilderErrors;
 

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/InternalKnowledgeBuilder.java b/drools-compiler/src/main/java/org/drools/compiler/builder/InternalKnowledgeBuilder.java
@@ -27,14 +27,14 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.drools.base.base.ObjectType;
+import org.drools.base.definitions.InternalKnowledgePackage;
+import org.drools.base.rule.TypeDeclaration;
 import org.drools.compiler.builder.impl.KnowledgeBuilderConfigurationImpl;
 import org.drools.compiler.builder.impl.KnowledgeBuilderImpl;
 import org.drools.compiler.compiler.PackageBuilderErrors;
 import org.drools.compiler.compiler.PackageBuilderResults;
 import org.drools.compiler.compiler.PackageRegistry;
-import org.drools.base.base.ObjectType;
-import org.drools.base.definitions.InternalKnowledgePackage;
-import org.drools.base.rule.TypeDeclaration;
 import org.drools.drl.ast.descr.PackageDescr;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.kie.api.KieBase;

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/PackageRegistryManager.java b/drools-compiler/src/main/java/org/drools/compiler/builder/PackageRegistryManager.java
@@ -18,12 +18,12 @@
  */
 package org.drools.compiler.builder;
 
-import org.drools.compiler.compiler.PackageRegistry;
-import org.drools.drl.ast.descr.PackageDescr;
-
 import java.util.Collection;
 import java.util.Map;
 
+import org.drools.compiler.compiler.PackageRegistry;
+import org.drools.drl.ast.descr.PackageDescr;
+
 /**
  * Manages handling and creation of {@link PackageRegistry} instances.
  */

diff --git a/...mpiler/src/main/java/org/drools/compiler/builder/conf/DecisionTableConfigurationImpl.java b/...mpiler/src/main/java/org/drools/compiler/builder/conf/DecisionTableConfigurationImpl.java
@@ -127,13 +127,21 @@ public int getCol() {
 
         @Override
         public boolean equals( Object o ) {
-            if ( this == o ) return true;
-            if ( o == null || getClass() != o.getClass() ) return false;
+            if ( this == o ) {
+                return true;
+            }
+            if ( o == null || getClass() != o.getClass() ) {
+                return false;
+            }
 
             RuleTemplateInfo that = ( RuleTemplateInfo ) o;
 
-            if ( row != that.row ) return false;
-            if ( col != that.col ) return false;
+            if ( row != that.row ) {
+                return false;
+            }
+            if ( col != that.col ) {
+                return false;
+            }
             return template != null ? template.equals( that.template ) : that.template == null;
         }
 

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/conf/JaxbConfigurationImpl.java b/drools-compiler/src/main/java/org/drools/compiler/builder/conf/JaxbConfigurationImpl.java
@@ -27,15 +27,14 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.sun.tools.xjc.Language;
+import com.sun.tools.xjc.Options;
 import org.drools.io.ResourceConfigurationImpl;
 import org.kie.api.io.ResourceConfiguration;
 import org.kie.internal.builder.JaxbConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.tools.xjc.Language;
-import com.sun.tools.xjc.Options;
-
 public class JaxbConfigurationImpl extends ResourceConfigurationImpl implements JaxbConfiguration {
     private final Logger logger = LoggerFactory.getLogger( JaxbConfigurationImpl.class ); 
 

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/BuildResultCollector.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/BuildResultCollector.java
@@ -18,12 +18,12 @@
  */
 package org.drools.compiler.builder.impl;
 
+import java.util.Collection;
+
 import org.kie.internal.builder.KnowledgeBuilderResult;
 import org.kie.internal.builder.KnowledgeBuilderResults;
 import org.kie.internal.builder.ResultSeverity;
 
-import java.util.Collection;
-
 /**
  * Holds build processing info, warnings and errors.
  */

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/BuildResultCollectorImpl.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/BuildResultCollectorImpl.java
@@ -18,6 +18,11 @@
  */
 package org.drools.compiler.builder.impl;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+
 import org.drools.compiler.compiler.ConfigurableSeverityResult;
 import org.drools.compiler.compiler.DroolsErrorWrapper;
 import org.drools.compiler.compiler.DroolsWarning;
@@ -31,11 +36,6 @@
 import org.kie.internal.builder.KnowledgeBuilderResults;
 import org.kie.internal.builder.ResultSeverity;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-
 import static java.util.Arrays.asList;
 
 public class BuildResultCollectorImpl implements BuildResultCollector {

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/ClassDefinitionFactory.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/ClassDefinitionFactory.java
@@ -33,35 +33,35 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.compiler.compiler.PackageRegistry;
-import org.drools.compiler.compiler.TypeDeclarationError;
-import org.drools.drl.ast.descr.AbstractClassTypeDeclarationDescr;
-import org.drools.drl.ast.descr.AnnotationDescr;
-import org.drools.drl.ast.descr.EnumDeclarationDescr;
-import org.drools.drl.ast.descr.EnumLiteralDescr;
-import org.drools.drl.ast.descr.PatternDescr;
-import org.drools.drl.ast.descr.QualifiedName;
-import org.drools.drl.ast.descr.TypeDeclarationDescr;
-import org.drools.drl.ast.descr.TypeFieldDescr;
-import org.drools.compiler.rule.builder.util.AnnotationFactory;
-import org.drools.util.TypeResolver;
 import org.drools.base.base.ClassFieldInspector;
 import org.drools.base.base.CoreComponentsBuilder;
 import org.drools.base.factmodel.AnnotationDefinition;
 import org.drools.base.factmodel.ClassDefinition;
-import org.drools.compiler.builder.impl.classbuilder.EnumClassDefinition;
-import org.drools.compiler.builder.impl.classbuilder.EnumLiteralDefinition;
 import org.drools.base.factmodel.FieldDefinition;
-import org.kie.internal.definition.GenericTypeDefinition;
 import org.drools.base.factmodel.traits.Thing;
 import org.drools.base.factmodel.traits.Trait;
 import org.drools.base.factmodel.traits.Traitable;
 import org.drools.base.factmodel.traits.TraitableBean;
 import org.drools.base.rule.TypeDeclaration;
+import org.drools.compiler.builder.impl.classbuilder.EnumClassDefinition;
+import org.drools.compiler.builder.impl.classbuilder.EnumLiteralDefinition;
+import org.drools.compiler.compiler.PackageRegistry;
+import org.drools.compiler.compiler.TypeDeclarationError;
+import org.drools.compiler.rule.builder.util.AnnotationFactory;
+import org.drools.drl.ast.descr.AbstractClassTypeDeclarationDescr;
+import org.drools.drl.ast.descr.AnnotationDescr;
+import org.drools.drl.ast.descr.EnumDeclarationDescr;
+import org.drools.drl.ast.descr.EnumLiteralDescr;
+import org.drools.drl.ast.descr.PatternDescr;
+import org.drools.drl.ast.descr.QualifiedName;
+import org.drools.drl.ast.descr.TypeDeclarationDescr;
+import org.drools.drl.ast.descr.TypeFieldDescr;
 import org.drools.util.ClassUtils;
+import org.drools.util.TypeResolver;
 import org.kie.api.definition.type.Key;
 import org.kie.api.definition.type.Position;
 import org.kie.api.io.Resource;
+import org.kie.internal.definition.GenericTypeDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/ClassHierarchyManager.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/ClassHierarchyManager.java
@@ -27,22 +27,22 @@
 import java.util.List;
 import java.util.Map;
 
-import org.drools.compiler.compiler.PackageRegistry;
-import org.drools.compiler.compiler.TypeDeclarationError;
-import org.drools.util.TypeResolver;
 import org.drools.base.base.ClassFieldInspector;
 import org.drools.base.base.CoreComponentsBuilder;
 import org.drools.base.definitions.InternalKnowledgePackage;
 import org.drools.base.factmodel.ClassDefinition;
 import org.drools.base.factmodel.FieldDefinition;
 import org.drools.base.factmodel.traits.Alias;
 import org.drools.base.rule.TypeDeclaration;
+import org.drools.compiler.compiler.PackageRegistry;
+import org.drools.compiler.compiler.TypeDeclarationError;
 import org.drools.drl.ast.descr.AbstractClassTypeDeclarationDescr;
 import org.drools.drl.ast.descr.AnnotationDescr;
 import org.drools.drl.ast.descr.PatternDescr;
 import org.drools.drl.ast.descr.QualifiedName;
 import org.drools.drl.ast.descr.TypeDeclarationDescr;
 import org.drools.drl.ast.descr.TypeFieldDescr;
+import org.drools.util.TypeResolver;
 import org.kie.api.definition.type.Key;
 import org.kie.api.io.Resource;
 
@@ -193,9 +193,9 @@ private static void buildDescrsFromFields(Class klass, TypeDeclarationDescr type
                     inheritedFlDescr.setResource(resource);
                     inheritedFlDescr.setInherited(!Modifier.isAbstract(inspector.getGetterMethods().get(name).getModifiers()));
 
-                    if (!fieldMap.containsKey(inheritedFlDescr.getFieldName()))
-                        fieldMap.put(inheritedFlDescr.getFieldName(),
-                                     inheritedFlDescr);
+                    if (!fieldMap.containsKey(inheritedFlDescr.getFieldName())) {
+                        fieldMap.put(inheritedFlDescr.getFieldName(), inheritedFlDescr);
+                    }
                 }
             }
         }

diff --git a/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeBuilderConfiguration.java b/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeBuilderConfiguration.java
@@ -27,8 +27,6 @@
 import org.kie.internal.conf.ConfigurationFactory;
 import org.kie.internal.utils.ChainedProperties;
 
-import java.util.Properties;
-
 public class CompositeBuilderConfiguration extends CompositeConfiguration<KnowledgeBuilderOption, SingleValueKieBuilderOption, MultiValueKieBuilderOption> implements KnowledgeBuilderConfiguration {
 
     public CompositeBuilderConfiguration(ChainedProperties properties, ClassLoader classloader,

diff --git a/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java b/...ompiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
@@ -18,6 +18,13 @@
  */
 package org.drools.compiler.builder.impl;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.drools.compiler.lang.descr.CompositePackageDescr;
 import org.kie.api.internal.assembler.KieAssemblers;
 import org.kie.api.internal.utils.KieService;
@@ -31,13 +38,6 @@
 import org.kie.internal.builder.ResourceChangeSet;
 import org.kie.internal.io.ResourceWithConfigurationImpl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 public class CompositeKnowledgeBuilderImpl implements CompositeKnowledgeBuilder {
 
     private static final KieAssemblers ASSEMBLERS = KieService.load(KieAssemblers.class);

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/DeclaredClassBuilder.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/DeclaredClassBuilder.java
@@ -18,16 +18,16 @@
  */
 package org.drools.compiler.builder.impl;
 
+import org.drools.base.factmodel.ClassDefinition;
+import org.drools.base.rule.TypeDeclaration;
+import org.drools.compiler.builder.impl.classbuilder.ClassBuilder;
 import org.drools.compiler.compiler.PackageRegistry;
 import org.drools.compiler.compiler.TypeDeclarationError;
+import org.drools.core.rule.JavaDialectRuntimeData;
 import org.drools.drl.ast.descr.AbstractClassTypeDeclarationDescr;
 import org.drools.drl.ast.descr.TypeDeclarationDescr;
-import org.drools.compiler.builder.impl.classbuilder.ClassBuilder;
-import org.drools.base.factmodel.ClassDefinition;
-import org.drools.core.rule.JavaDialectRuntimeData;
-import org.drools.base.rule.TypeDeclaration;
-import org.drools.wiring.api.classloader.ProjectClassLoader;
 import org.drools.util.TypeResolver;
+import org.drools.wiring.api.classloader.ProjectClassLoader;
 
 import static org.drools.util.ClassUtils.convertClassToResourcePath;
 

diff --git a/...s-compiler/src/main/java/org/drools/compiler/builder/impl/DroolsAssemblerContextImpl.java b/...s-compiler/src/main/java/org/drools/compiler/builder/impl/DroolsAssemblerContextImpl.java
@@ -22,12 +22,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.drools.compiler.builder.DroolsAssemblerContext;
-import org.drools.compiler.compiler.PackageRegistry;
 import org.drools.base.base.ClassObjectType;
 import org.drools.base.base.ObjectType;
 import org.drools.base.definitions.InternalKnowledgePackage;
 import org.drools.base.rule.TypeDeclaration;
+import org.drools.compiler.builder.DroolsAssemblerContext;
+import org.drools.compiler.compiler.PackageRegistry;
 import org.drools.drl.ast.descr.PackageDescr;
 import org.drools.kiesession.rulebase.InternalKnowledgeBase;
 import org.kie.internal.builder.KnowledgeBuilderErrors;

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/EvaluatorRegistry.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/EvaluatorRegistry.java
@@ -26,11 +26,11 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.compiler.rule.builder.ConstraintBuilder;
-import org.drools.compiler.rule.builder.EvaluatorDefinition;
 import org.drools.base.base.ValueType;
 import org.drools.base.common.DroolsObjectInput;
 import org.drools.base.rule.accessor.Evaluator;
+import org.drools.compiler.rule.builder.ConstraintBuilder;
+import org.drools.compiler.rule.builder.EvaluatorDefinition;
 import org.drools.drl.parser.impl.Operator;
 
 /**
@@ -100,7 +100,9 @@ public void writeExternal( ObjectOutput out ) throws IOException {
     }
 
     private static ClassLoader getDefaultClassLoader() {
-        if ( Thread.currentThread().getContextClassLoader() != null ) return Thread.currentThread().getContextClassLoader();
+        if ( Thread.currentThread().getContextClassLoader() != null ) {
+            return Thread.currentThread().getContextClassLoader();
+        }
         return EvaluatorRegistry.class.getClassLoader();
     }
 

diff --git a/drools-compiler/src/main/java/org/drools/compiler/builder/impl/HierarchySorter.java b/drools-compiler/src/main/java/org/drools/compiler/builder/impl/HierarchySorter.java
@@ -18,7 +18,12 @@
  */
 package org.drools.compiler.builder.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class HierarchySorter<K> {
 
@@ -83,7 +88,9 @@ public List<K> sort( Map<K,Collection<K>> hierarchy ) {
         java.util.Iterator<Node<K, K>> iter = map.values().iterator();
         while ( iter.hasNext() ) {
             Node<K,K> n = iter.next();
-            if ( n.getData() == null ) root.addChild( n );
+            if ( n.getData() == null ) {
+                root.addChild( n );
+            }
 
         }
 
@@ -154,12 +161,18 @@ public String toString() {
 
         @Override
         public boolean equals( Object o ) {
-            if ( this == o ) return true;
-            if ( o == null || getClass() != o.getClass() ) return false;
+            if ( this == o ) {
+                return true;
+            }
+            if ( o == null || getClass() != o.getClass() ) {
+                return false;
+            }
 
             Node node = (Node) o;
 
-            if ( !key.equals( node.key ) ) return false;
+            if ( !key.equals( node.key ) ) {
+                return false;
+            }
 
             return true;
         }