Merge pull request #374 from oracle/checkstyle-fixes

Fixes for checkstyle scan, and prepare for uptake of checkstyle v10

Author: rjeberhard

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruProduct.java

@@ -32,6 +32,7 @@ public enum AruProduct {
 
     private final String productId;
     private final String description;
+
     AruProduct(String productId, String description) {
         this.productId = productId;
         this.description = description;

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -10,18 +10,18 @@
 import picocli.CommandLine.Unmatched;
 
 @Command(
-        name = "cache",
-        description = "List and set cache options",
-        versionProvider = HelpVersionProvider.class,
-        commandListHeading = "%nCommands:%n%n",
-        subcommands = {
-                ListCacheItems.class,
-                AddInstallerEntry.class,
-                AddPatchEntry.class,
-                AddEntry.class,
-                DeleteEntry.class
-        },
-        sortOptions = false
+    name = "cache",
+    description = "List and set cache options",
+    versionProvider = HelpVersionProvider.class,
+    commandListHeading = "%nCommands:%n%n",
+    subcommands = {
+        ListCacheItems.class,
+        AddInstallerEntry.class,
+        AddPatchEntry.class,
+        AddEntry.class,
+        DeleteEntry.class
+    },
+    sortOptions = false
 )
 public class CacheCLI {
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/installer/FmwInstallerType.java

@@ -83,6 +83,7 @@ public enum FmwInstallerType {
 
     private final InstallerType[] installers;
     private final Set<AruProduct> products;
+
     FmwInstallerType(Set<AruProduct> products, InstallerType... installers) {
         this.installers = installers;
         this.products = products;

imagetool/src/test/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptionsTest.java

@@ -44,6 +44,7 @@ private static void setPrivateField(String fieldname, Object target, Object valu
     /**
      * handleChown() should set the Dockerfile userid and groupid.
      * use case: user provides derek:data.  Result should be "derek" for user and "data" for group.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -66,6 +67,7 @@ void handleChown() throws Exception {
     /**
      * handleChown() should set the Dockerfile userid and groupid.
      * use case: default, no input.  Result should be "oracle" for both.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -87,6 +89,7 @@ void handleChownDefault() throws Exception {
 
     /**
      * Test CommonOptions handleChown method.
+     *
      * @throws Exception if reflection fails (developer error)
      */
     @Test
@@ -172,7 +175,7 @@ void testResolveOptions() throws Exception {
         resourceTemplatesField.setAccessible(true);
         List<Path> resolveFiles =
             Arrays.asList(new File("target/test-classes/templates/resolver.yml").toPath(),
-            new File("target/test-classes/templates/verrazzano.yml").toPath());
+                new File("target/test-classes/templates/verrazzano.yml").toPath());
         resourceTemplatesField.set(wdtOptions, resolveFiles);
 
         Field imageTagField = WdtFullOptions.class.getDeclaredField("wdtDomainHome");

pom.xml

@@ -214,7 +214,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.1.2</version>
                     <executions>
                         <execution>
                             <id>checkstyle</id>