From ae48542132d7713de92e81ba2f5c6994179d0f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?=
 <juansotuyo@gmail.com>
Date: Sat, 7 Apr 2018 21:06:02 -0300
Subject: [PATCH] Revert check on initializers

---
 .../java/rule/codestyle/ClassNamingConventionsRule.java     | 6 ++++++
 .../lang/java/rule/codestyle/xml/ClassNamingConventions.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsRule.java
index c0a841ff76..53048bc6d1 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/ClassNamingConventionsRule.java
@@ -12,6 +12,7 @@ import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration.TypeKind;
 import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTEnumDeclaration;
+import net.sourceforge.pmd.lang.java.ast.ASTInitializer;
 import net.sourceforge.pmd.lang.java.ast.AccessNode;
 import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
 import net.sourceforge.pmd.properties.PropertyDescriptor;
@@ -77,6 +78,11 @@ public class ClassNamingConventionsRule extends AbstractJavaRule {
                     return false;
                 }
                 break;
+                
+            case INITIALIZER:
+                if (!((ASTInitializer) decl.getDeclarationNode()).isStatic()) {
+                    return false;
+                }
 
             default:
                 break;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/ClassNamingConventions.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/ClassNamingConventions.xml
index a103614edd..4146358d50 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/ClassNamingConventions.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/ClassNamingConventions.xml
@@ -119,8 +119,8 @@
     </test-code>
 
     <test-code>
-        <description>Class with instance initializer should be a utility class</description>
-        <expected-problems>1</expected-problems>
+        <description>Class with instance initializer should not be a utility class</description>
+        <expected-problems>0</expected-problems>
         <code><![CDATA[
             public class Foo {