mapstruct#2016 Update Checkstyle to 8.29

filiphr · filiphr · commit 95ceba1a1e12 · 2020-02-02T14:33:45.000+01:00
Adapt checkstyle configuration with new changes:
* Move cacheFile to Checker module
* Move LineLength to Checker module
* Use SuppressWithPlainTextCommentFilter
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ test-output
 
 # Misc.
 .DS_Store
+checkstyle.cache
diff --git a/build-config/src/main/resources/build-config/checkstyle.xml b/build-config/src/main/resources/build-config/checkstyle.xml
@@ -15,6 +15,8 @@
         <property name="basedir" value="${basedir}"/>
     -->
 
+    <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
     <!-- Checks that each Java package has a Javadoc file used for commenting. -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage       -->
     <!--
@@ -29,6 +31,13 @@
 
     <module name="FileLength"/>
 
+    <module name="LineLength">
+        <property name="max" value="150"/>
+        <property name="fileExtensions" value="java" />
+    </module>
+
+    <module name="SuppressWithPlainTextCommentFilter"/>
+
     <!-- Following interprets the header file as regular expressions. -->
     <!-- <module name="RegexpHeader"/>                                -->
 
@@ -60,8 +69,6 @@
 
     <module name="TreeWalker">
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
         <module name="SuppressWarningsHolder"/>
 
         <!-- Checks for Javadoc comments.                     -->
@@ -115,9 +122,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="10"/>
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -28,7 +28,7 @@
         <org.apache.maven.plugins.javadoc.version>3.1.0</org.apache.maven.plugins.javadoc.version>
         <org.springframework.version>4.0.3.RELEASE</org.springframework.version>
         <org.eclipse.tycho.compiler-jdt.version>0.26.0</org.eclipse.tycho.compiler-jdt.version>
-        <com.puppycrawl.tools.checkstyle.version>8.18</com.puppycrawl.tools.checkstyle.version>
+        <com.puppycrawl.tools.checkstyle.version>8.29</com.puppycrawl.tools.checkstyle.version>
         <add.release.arguments />
         <forkCount>1</forkCount>
         <assertj.version>3.11.1</assertj.version>
@@ -278,7 +278,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                     <configuration>
                         <configLocation>build-config/checkstyle.xml</configLocation>
                         <consoleOutput>true</consoleOutput>
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/SimpleConversion.java
@@ -45,7 +45,6 @@ public List<HelperMethod> getRequiredHelperMethods(ConversionContext conversionC
         return Collections.emptyList();
     }
 
-
     /**
      * Returns the conversion string from source to target. The placeholder {@code <SOURCE>} can be used to represent a
      * reference to the source value.
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
@@ -177,8 +177,6 @@ public boolean doTypeVarsMatch(Type parameter, Type returnType) {
         return true;
     }
 
-
-
     /**
      * There's currently only one parameter foreseen instead of a list of parameter
      *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java b/processor/src/main/java/org/mapstruct/ap/internal/model/LifecycleMethodResolver.java
@@ -73,7 +73,6 @@ public static List<LifecycleCallbackMethodReference> afterMappingMethods(Method
                         existingVariableNames );
     }
 
-
     /**
      * @param method the method to obtain the beforeMapping methods for
      * @param selectionParameters method selectionParameters
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ObjectFactoryMethodResolver.java
@@ -50,8 +50,6 @@ public static MethodReference getFactoryMethod( Method method,
         return getFactoryMethod( method, method.getResultType(), selectionParameters, ctx );
     }
 
-
-
     /**
      * returns a no arg factory method
      *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
@@ -145,7 +145,6 @@ private Type getType(String canonicalName, boolean isLiteral) {
         return getType( typeElement, isLiteral );
     }
 
-
     /**
      * Determines if the type with the given full qualified name is part of the classpath
      *
@@ -597,7 +596,6 @@ else if ( typeMirror.getKind() == TypeKind.TYPEVAR ) {
         return typeMirror;
     }
 
-
     /**
      * Whether the given type is ready to be processed or not. It can be processed if it is not of kind
      * {@link TypeKind#ERROR} and all {@link AstModifyingAnnotationProcessor}s (if any) indicated that they've fully
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/AnnotationBasedComponentModelProcessor.java
@@ -176,7 +176,6 @@ private AnnotatedConstructor buildAnnotatedConstructorForDecorator(Decorator dec
         );
     }
 
-
     /**
      * Removes duplicate constructor parameter annotations. If an annotation is already present on the constructor, it
      * does not have be defined on the constructor parameter, too. For example, for CDI, the javax.inject.Inject
diff --git a/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/spi/DefaultAccessorNamingStrategy.java
@@ -86,7 +86,6 @@ public boolean isGetterMethod(ExecutableElement method) {
         return isNonBooleanGetterName || ( isBooleanGetterName && returnTypeIsBoolean );
     }
 
-
     /**
      * Returns {@code true} when the {@link ExecutableElement} is a setter method. A setter starts with 'set'. The
      * remainder of the name is supposed to reflect the property name.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java b/processor/src/test/java/org/mapstruct/ap/test/accessibility/referenced/a/ReferencedMapperDefaultOther.java
@@ -8,7 +8,6 @@
 import org.mapstruct.ap.test.accessibility.referenced.ReferencedSource;
 import org.mapstruct.ap.test.accessibility.referenced.ReferencedTarget;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_1170/PetMapper.java
@@ -29,7 +29,6 @@ public class PetMapper {
         .put( 3L, "cat" )
         .put( 4L, "dog" ).build();
 
-
     /**
      * method to be used when using an adder
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_375/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._375;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetElement.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetKey.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/TargetValue.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.bugs._513;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_913/Issue913GetterMapperForCollectionsTest.java
@@ -198,8 +198,6 @@ public void shouldReturnNullForUpdateWithReturnWithPresenceChecker() {
         assertThat( domain2.getLongs() ).isEmpty();
     }
 
-
-
     /**
      * These assert check if non-null and default mapping is working as expected.
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
@@ -31,7 +31,6 @@ public class PetMapper {
         .put( 3L, "cat" )
         .put( 4L, "dog" ).build();
 
-
     /**
      * method to be used when using an adder
      *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/source/SingleElementSource.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.collection.adder.source;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/localdatetoxmlgregoriancalendarconversion/Source.java
@@ -7,7 +7,6 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * @author Andreas Gudian
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/AmbiguousBarFactory.java
@@ -7,7 +7,6 @@
 
 import org.mapstruct.ObjectFactory;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Foo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousannotatedfactorymethod/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousannotatedfactorymethod;
 
-
 /**
  * @author Remo Meier
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Foo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.erroneous.ambiguousfactorymethod;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java b/processor/src/test/java/org/mapstruct/ap/test/erroneous/ambiguousfactorymethod/a/BarFactory.java
@@ -7,7 +7,6 @@
 
 import org.mapstruct.ap.test.erroneous.ambiguousfactorymethod.Bar;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java b/processor/src/test/java/org/mapstruct/ap/test/generics/AbstractTo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.generics;
 
-
 /**
  * @author Andreas Gudian
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java b/processor/src/test/java/org/mapstruct/ap/test/generics/TargetTo.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.generics;
 
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/AdderUsageObserver.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nestedsourceproperties._target;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/_target/ChartEntryLabel.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nestedsourceproperties._target;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/source/Song.java
@@ -7,7 +7,6 @@
 
 import java.util.List;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/MyLongWrapper.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.nullcheck;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/Target.java b/processor/src/test/java/org/mapstruct/ap/test/references/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.references;
 
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveMapper.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.selection.primitives;
 
-
 /**
  * @author Sjaak Derksen
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source1.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Source2.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/Target2.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/Source.java b/processor/src/test/java/org/mapstruct/ap/test/template/Source.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.template;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/Target.java b/processor/src/test/java/org/mapstruct/ap/test/template/Target.java
@@ -5,7 +5,6 @@
  */
 package org.mapstruct.ap.test.template;
 
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java b/processor/src/test/java/org/mapstruct/ap/testutil/runner/GeneratedSource.java
@@ -57,7 +57,6 @@ static void clearCompilingStatement() {
         GeneratedSource.compilingStatement.remove();
     }
 
-
     /**
      * Adds more mappers that need to be compared.
      *
diff --git a/processor/src/test/resources/checkstyle-for-generated-sources.xml b/processor/src/test/resources/checkstyle-for-generated-sources.xml

Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,4 @@ test-output`
`23`	`23`
`24`	`24`	`# Misc.`
`25`	`25`	`.DS_Store`
	`26`	`+checkstyle.cache`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ public List<HelperMethod> getRequiredHelperMethods(ConversionContext conversionC`
`45`	`45`	`return Collections.emptyList();`
`46`	`46`	`}`
`47`	`47`
`48`		`-`
`49`	`48`	`/**`
`50`	`49`	`* Returns the conversion string from source to target. The placeholder {@code <SOURCE>} can be used to represent a`
`51`	`50`	`* reference to the source value.`
Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,6 @@ public boolean doTypeVarsMatch(Type parameter, Type returnType) {`
`177`	`177`	`return true;`
`178`	`178`	`}`
`179`	`179`
`180`		`-`
`181`		`-`
`182`	`180`	`/**`
`183`	`181`	`* There's currently only one parameter foreseen instead of a list of parameter`
`184`	`182`	`*`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ public static List<LifecycleCallbackMethodReference> afterMappingMethods(Method`
`73`	`73`	`existingVariableNames );`
`74`	`74`	`}`
`75`	`75`
`76`		`-`
`77`	`76`	`/**`
`78`	`77`	`* @param method the method to obtain the beforeMapping methods for`
`79`	`78`	`* @param selectionParameters method selectionParameters`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,6 @@ public static MethodReference getFactoryMethod( Method method,`
`50`	`50`	`return getFactoryMethod( method, method.getResultType(), selectionParameters, ctx );`
`51`	`51`	`}`
`52`	`52`
`53`		`-`
`54`		`-`
`55`	`53`	`/**`
`56`	`54`	`* returns a no arg factory method`
`57`	`55`	`*`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,6 @@ private Type getType(String canonicalName, boolean isLiteral) {`
`145`	`145`	`return getType( typeElement, isLiteral );`
`146`	`146`	`}`
`147`	`147`
`148`		`-`
`149`	`148`	`/**`
`150`	`149`	`* Determines if the type with the given full qualified name is part of the classpath`
`151`	`150`	`*`
`@@ -597,7 +596,6 @@ else if ( typeMirror.getKind() == TypeKind.TYPEVAR ) {`
`597`	`596`	`return typeMirror;`
`598`	`597`	`}`
`599`	`598`
`600`		`-`
`601`	`599`	`/**`
`602`	`600`	`* Whether the given type is ready to be processed or not. It can be processed if it is not of kind`
`603`	`601`	`* {@link TypeKind#ERROR} and all {@link AstModifyingAnnotationProcessor}s (if any) indicated that they've fully`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@ private AnnotatedConstructor buildAnnotatedConstructorForDecorator(Decorator dec`
`176`	`176`	`);`
`177`	`177`	`}`
`178`	`178`
`179`		`-`
`180`	`179`	`/**`
`181`	`180`	`* Removes duplicate constructor parameter annotations. If an annotation is already present on the constructor, it`
`182`	`181`	`* does not have be defined on the constructor parameter, too. For example, for CDI, the javax.inject.Inject`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ public boolean isGetterMethod(ExecutableElement method) {`
`86`	`86`	`return isNonBooleanGetterName \|\| ( isBooleanGetterName && returnTypeIsBoolean );`
`87`	`87`	`}`
`88`	`88`
`89`		`-`
`90`	`89`	`/**`
`91`	`90`	`* Returns {@code true} when the {@link ExecutableElement} is a setter method. A setter starts with 'set'. The`
`92`	`91`	`* remainder of the name is supposed to reflect the property name.`