From 72bc163d72d2375ec53c36e5e831c6b0835cf945 Mon Sep 17 00:00:00 2001
From: Kariem Hussein <kariem.hussein@gmail.com>
Date: Wed, 1 Aug 2018 01:33:26 +0200
Subject: minor: Issue #3161: Format trailing comma in enums

---
 .../google/checkstyle/test/base/AbstractIndentationTestSupport.java  | 5 ++++-
 .../com/google/checkstyle/test/base/AbstractModuleTestSupport.java   | 2 +-
 .../java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java    | 2 +-
 src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java        | 2 +-
 src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java        | 2 +-
 src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java | 2 +-
 .../com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java   | 2 +-
 .../puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java   | 2 +-
 .../puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java  | 2 +-
 .../com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java | 2 +-
 .../tools/checkstyle/checks/imports/ImportOrderOption.java           | 2 +-
 .../puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java | 2 +-
 .../com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java | 2 +-
 .../puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java    | 2 +-
 .../tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java | 2 +-
 .../tools/checkstyle/filters/SuppressionCommentFilter.java           | 2 +-
 src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java | 2 +-
 .../com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java   | 2 +-
 .../puppycrawl/tools/checkstyle/internal/CommitValidationTest.java   | 3 ++-
 19 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
index 0b58bd465..9bdefd37e 100644
--- a/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
+++ b/src/it/java/com/google/checkstyle/test/base/AbstractIndentationTestSupport.java
@@ -214,7 +214,10 @@ public abstract class AbstractIndentationTestSupport extends AbstractModuleTestS
 
     private enum CommentType {
 
-        MULTILEVEL, SINGLE_LEVEL, NON_STRICT_LEVEL, UNKNOWN
+        MULTILEVEL,
+        SINGLE_LEVEL,
+        NON_STRICT_LEVEL,
+        UNKNOWN,
 
     }
 
diff --git a/src/it/java/com/google/checkstyle/test/base/AbstractModuleTestSupport.java b/src/it/java/com/google/checkstyle/test/base/AbstractModuleTestSupport.java
index cb85cd829..b9e321654 100644
--- a/src/it/java/com/google/checkstyle/test/base/AbstractModuleTestSupport.java
+++ b/src/it/java/com/google/checkstyle/test/base/AbstractModuleTestSupport.java
@@ -71,7 +71,7 @@ public abstract class AbstractModuleTestSupport extends AbstractPathTestSupport
          * Points that checker will be created as
          * a root of default configuration.
          */
-        IN_CHECKER
+        IN_CHECKER,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index 8ebfbe6c7..1b12f0d24 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -64,7 +64,7 @@ public final class ConfigurationLoader {
         /**
          * Execute ignored modules.
          */
-        EXECUTE
+        EXECUTE,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
index 99ff11ae6..d228a252c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/JavaParser.java
@@ -59,7 +59,7 @@ public final class JavaParser {
         /**
          * Comments nodes should be ignored.
          */
-        WITHOUT_COMMENTS
+        WITHOUT_COMMENTS,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
index 112f82ad7..4bb61548c 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/TreeWalker.java
@@ -525,7 +525,7 @@ public final class TreeWalker extends AbstractFileSetCheck implements ExternalRe
         /**
          * AST contains comment nodes.
          */
-        WITH_COMMENTS
+        WITH_COMMENTS,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
index b20db2342..6ff89d93f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
@@ -69,7 +69,7 @@ public abstract class AutomaticBean
         /**
          * Do nothing in the end.
          */
-        NONE
+        NONE,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
index ba0c63de1..3af4dc3e4 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/BlockOption.java
@@ -46,6 +46,6 @@ public enum BlockOption {
      * }
      * </pre>
      */
-    STATEMENT
+    STATEMENT,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
index 52d362670..6cb328114 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/LeftCurlyOption.java
@@ -70,6 +70,6 @@ public enum LeftCurlyOption {
      *     ...
      * </pre>
      */
-    NL
+    NL,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
index 92854290a..f444aec39 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyOption.java
@@ -126,6 +126,6 @@ public enum RightCurlyOption {
      * } else { ... <b>}</b> // OK, single-line multi-block statement
      * </pre>
      **/
-    SAME
+    SAME,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
index e9e90365f..53297d115 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/AccessResult.java
@@ -30,6 +30,6 @@ enum AccessResult {
     /** Represents that access is disallowed. */
     DISALLOWED,
     /** Represents that access is unknown. */
-    UNKNOWN
+    UNKNOWN,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
index 43e4cd7cd..795284f15 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderOption.java
@@ -102,6 +102,6 @@ public enum ImportOrderOption {
         import static javax.swing.WindowConstants.*;
      * </pre>
      */
-    BOTTOM
+    BOTTOM,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
index 92c154da9..54705d4d7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/MismatchStrategy.java
@@ -42,6 +42,6 @@ public enum MismatchStrategy {
      * In a case if matching allow/disallow rule was not found,
      * import will be disallowed by default.
      */
-    DISALLOWED
+    DISALLOWED,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
index 2b96f66ee..2ea6fed40 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/PadOption.java
@@ -37,6 +37,6 @@ public enum PadOption {
      * Represents mandatory spacing following a left parenthesis
      * and preceding a right one.
      */
-    SPACE
+    SPACE,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
index f15de3948..2d4962702 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WrapOption.java
@@ -28,6 +28,6 @@ public enum WrapOption {
     /** Require that the token is on a new line. */
     NL,
     /** Require that the token is at the end of the line. */
-    EOL
+    EOL,
 
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
index dad09d89d..b704cec72 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithPlainTextCommentFilter.java
@@ -212,7 +212,7 @@ public class SuppressWithPlainTextCommentFilter extends AutomaticBean implements
         /** On suppression type. */
         ON,
         /** Off suppression type. */
-        OFF
+        OFF,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
index 6cf2829e8..af0f5b485 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
@@ -66,7 +66,7 @@ public class SuppressionCommentFilter
         /**
          * Switch reporting off.
          */
-        OFF
+        OFF,
 
     }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
index b3228fb59..4b37fe051 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtil.java
@@ -52,7 +52,7 @@ public final class JavadocUtil {
         /** Inline type. */
         INLINE,
         /** All validTags. */
-        ALL
+        ALL,
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
index 3493e1138..7f224dde2 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/AbstractModuleTestSupport.java
@@ -63,7 +63,7 @@ public abstract class AbstractModuleTestSupport extends AbstractPathTestSupport
          * Points that checker will be created as
          * a root of default configuration.
          */
-        IN_CHECKER
+        IN_CHECKER,
 
     }
 
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
index c5c6e6962..afc207913 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java
@@ -297,7 +297,8 @@ public class CommitValidationTest {
 
     private enum CommitsResolutionMode {
 
-        BY_COUNTER, BY_LAST_COMMIT_AUTHOR
+        BY_COUNTER,
+        BY_LAST_COMMIT_AUTHOR,
 
     }
 
-- 
cgit v1.2.3