Enable checkstyle verification during build

- enable checkstyle plugin - reformat code to meet checkstyle requirements - reorder imports
mojohaus · Aug 15, 2022 · 592c8cd · 592c8cd
1 parent 45b7162
commit 592c8cd
Show file tree

Hide file tree

Showing 13 changed files with 1,690 additions and 1,430 deletions.
diff --git a/pom.xml b/pom.xml
@@ -210,6 +210,15 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
   <reporting>
     <plugins>
       <plugin>

diff --git a/src/main/java/org/codehaus/mojo/flatten/CleanMojo.java b/src/main/java/org/codehaus/mojo/flatten/CleanMojo.java
@@ -34,9 +34,8 @@
  * @author Joerg Hohwiller (hohwille at users.sourceforge.net)
  * @since 1.0.0-beta-2
  */
-//CHECKSTYLE_OFF: LineLength
-@Mojo( name = "clean", requiresProject = true, requiresDirectInvocation = false, executionStrategy = "once-per-session", threadSafe = true )
-//CHECKSTYLE_ON: LineLength
+@Mojo( name = "clean", requiresProject = true, requiresDirectInvocation = false, executionStrategy = "once-per-session",
+       threadSafe = true )
 public class CleanMojo
     extends AbstractFlattenMojo
 {

diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java
diff --git a/src/main/java/org/codehaus/mojo/flatten/KeepCommentsInPom.java b/src/main/java/org/codehaus/mojo/flatten/KeepCommentsInPom.java
diff --git a/src/main/java/org/codehaus/mojo/flatten/ModelBuilderThreadSafetyWorkaround.java b/src/main/java/org/codehaus/mojo/flatten/ModelBuilderThreadSafetyWorkaround.java
@@ -46,11 +46,14 @@
 import org.eclipse.sisu.Nullable;
 
 /**
- * Works around thread safety issues when modifying the global singleton {@link org.apache.maven.model.building.DefaultModelBuilder DefaultModelBuilder}
- * with custom {@link ProfileInjector} and {@link ProfileSelector}. Instead of modifying the global {@code DefaultModelBuilder}, this class
- * creates a new {@code DefaultModelBuilder} and equips it with the currently active components like {@link ModelProcessor}, {@link ModelValidator} etc.
- * which might have been modified/provided by other Maven extensions. 
- * 
+ * Works around thread safety issues when modifying the global singleton
+ * {@link org.apache.maven.model.building.DefaultModelBuilder DefaultModelBuilder}
+ * with custom {@link ProfileInjector} and {@link ProfileSelector}. Instead of modifying the global
+ * {@code DefaultModelBuilder}, this class
+ * creates a new {@code DefaultModelBuilder} and equips it with the currently active components like
+ * {@link ModelProcessor}, {@link ModelValidator} etc.
+ * which might have been modified/provided by other Maven extensions.
+ *
  * @author Falko Modler
  * @since 1.2.3
  */
@@ -104,7 +107,8 @@ public class ModelBuilderThreadSafetyWorkaround
     @Inject
     private ReportingConverter reportingConverter;
 
-    public ModelBuildingResult build( ModelBuildingRequest buildingRequest, ProfileInjector customInjector, ProfileSelector customSelector )
+    public ModelBuildingResult build( ModelBuildingRequest buildingRequest, ProfileInjector customInjector,
+                                      ProfileSelector customSelector )
         throws ModelBuildingException
     {
         // note: there is neither DefaultModelBuilder.get*(), nor DefaultModelBuilder.clone()