From 8580e05d3178d69503c1cd26490973e945d4bc9e Mon Sep 17 00:00:00 2001
From: smarthi <smarthi@apache.org>
Date: Fri, 6 Jan 2017 17:32:32 -0500
Subject: [PATCH] OPENNLP-910: Add checkstyle

---
 checkstyle.xml                                | 75 +------------------
 .../tools/ml/naivebayes/Probabilities.java    | 11 ++-
 .../NewlineSentenceDetectorTest.java          |  2 +-
 pom.xml                                       |  2 +-
 4 files changed, 13 insertions(+), 77 deletions(-)

diff --git a/checkstyle.xml b/checkstyle.xml
index e72b53d2e..ed428ed29 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -35,28 +35,17 @@
   </module>
 
   <module name="TreeWalker">
-    <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
       <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
       <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
     </module>
-    <module name="AvoidEscapedUnicodeCharacters">
-      <property name="allowEscapesForControlCharacters" value="true"/>
-      <property name="allowByTailComment" value="true"/>
-      <property name="allowNonPrintableEscapes" value="true"/>
-    </module>
     <!--<module name="LineLength">-->
       <!--<property name="max" value="110"/>-->
       <!--<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>-->
     <!--</module>-->
     <module name="AvoidStarImport"/>
-    <module name="OneTopLevelClass"/>
     <module name="NoLineWrap"/>
-    <module name="EmptyBlock">
-      <property name="option" value="TEXT"/>
-      <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-    </module>
     <!--<module name="NeedBraces"/>-->
     <!--<module name="LeftCurly">-->
       <!--<property name="maxLineLength" value="100"/>-->
@@ -72,38 +61,11 @@
       <property name="allowEmptyTypes" value="true"/>
       <property name="allowEmptyLoops" value="true"/>
     </module>
-    <module name="OneStatementPerLine"/>
-    <module name="MultipleVariableDeclarations"/>
-    <!--<module name="ArrayTypeStyle"/>-->
-    <module name="MissingSwitchDefault"/>
-    <module name="FallThrough"/>
-    <module name="UpperEll"/>
-    <module name="ModifierOrder"/>
-    <module name="EmptyLineSeparator">
-      <property name="allowNoEmptyLineBetweenFields" value="true"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="tokens" value="DOT"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="tokens" value="COMMA"/>
-      <property name="option" value="EOL"/>
-    </module>
     <module name="PackageName">
       <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
       <message key="name.invalidPattern"
                value="Package name ''{0}'' must match pattern ''{1}''."/>
     </module>
-    <module name="TypeName">
-      <message key="name.invalidPattern"
-               value="Type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <module name="ClassTypeParameterName">
-      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-      <message key="name.invalidPattern"
-               value="Class type name ''{0}'' must match pattern ''{1}''."/>
-    </module>
     <module name="MethodTypeParameterName">
       <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
       <message key="name.invalidPattern"
@@ -114,7 +76,6 @@
       <message key="name.invalidPattern"
                value="Interface type name ''{0}'' must match pattern ''{1}''."/>
     </module>
-    <module name="NoFinalizer"/>
     <module name="GenericWhitespace">
       <message key="ws.followed"
                value="GenericWhitespace ''{0}'' is followed by whitespace."/>
@@ -133,40 +94,10 @@
       <property name="lineWrappingIndentation" value="4"/>
       <property name="arrayInitIndent" value="2"/>
     </module>
-    <module name="OverloadMethodsDeclarationOrder"/>
-    <module name="VariableDeclarationUsageDistance"/>
-    <module name="CustomImportOrder">
-      <property name="sortImportsInGroupAlphabetically" value="true"/>
-      <property name="separateLineBetweenGroups" value="true"/>
+    <!--<module name="CustomImportOrder">-->
+      <!--<property name="sortImportsInGroupAlphabetically" value="true"/>-->
+      <!--<property name="separateLineBetweenGroups" value="true"/>-->
       <!--<property name="customImportOrderRules" value="SAME_PACKAGE(3)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"/>-->
-    </module>
-    <module name="MethodParamPad"/>
-    <module name="AnnotationLocation">
-      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-    </module>
-    <module name="AnnotationLocation">
-      <property name="tokens" value="VARIABLE_DEF"/>
-      <property name="allowSamelineMultipleAnnotations" value="true"/>
-    </module>
-    <module name="JavadocTagContinuationIndentation"/>
-    <module name="SummaryJavadoc">
-      <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-    </module>
-    <module name="AtclauseOrder">
-      <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-      <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-    </module>
-    <module name="MethodName">
-      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-      <message key="name.invalidPattern"
-               value="Method name ''{0}'' must match pattern ''{1}''."/>
-    </module>
-    <!--<module name="SingleLineJavadoc">-->
-      <!--<property name="ignoreInlineTags" value="false"/>-->
-    <!--</module>-->
-    <!--<module name="EmptyCatchBlock">-->
-      <!--<property name="exceptionVariableName" value="expected"/>-->
     <!--</module>-->
-    <module name="CommentsIndentation"/>
   </module>
 </module>
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probabilities.java b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probabilities.java
index 394a4c6f1..10f448156 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probabilities.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/Probabilities.java
@@ -17,7 +17,12 @@
 
 package opennlp.tools.ml.naivebayes;
 
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Class implementing the probability distribution over labels returned by a classifier.
@@ -26,7 +31,7 @@
  *
  */
 public abstract class Probabilities<T> {
-  protected HashMap<T, Double> map = new HashMap<>();
+  protected Map<T, Double> map = new HashMap<>();
 
   protected transient boolean isNormalised = false;
   protected Map<T, Double> normalised;
@@ -190,7 +195,7 @@ public double getMaxValue() {
   }
 
   public void discardCountsBelow(double i) {
-    ArrayList<T> labelsToRemove = new ArrayList<>();
+    List<T> labelsToRemove = new ArrayList<>();
     for (T label : map.keySet()) {
       Double sum = map.get(label);
       if (sum == null) sum = 0.0;
diff --git a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
index 92c2b915c..b209aed07 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/sentdetect/NewlineSentenceDetectorTest.java
@@ -19,7 +19,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Tests for the {@link NewlineSentenceDetector} class.
diff --git a/pom.xml b/pom.xml
index e796e6654..ec76e5c17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,7 +166,7 @@
 								<consoleOutput>true</consoleOutput>
 								<includeTestSourceDirectory>true</includeTestSourceDirectory>
 								<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
-								<failsOnError>false</failsOnError>
+								<failsOnError>true</failsOnError>
 								<excludes>**/stemmer/**/*</excludes>
 							</configuration>
 							<goals>