Fix checkstyle buck daemon issue
- checkstyle buck daemon was not processing a file listed at end of the list.
- fix issues, which hasn't been detected due to above bug
- cosmetic fixes
Change-Id: I15f24311835726757f0974b7e5c12ff1c79a3d4e
diff --git a/tools/build/conf/src/main/java/org/onosproject/checkstyle/CheckstyleRunner.java b/tools/build/conf/src/main/java/org/onosproject/checkstyle/CheckstyleRunner.java
index e6638be..9e05fa3 100644
--- a/tools/build/conf/src/main/java/org/onosproject/checkstyle/CheckstyleRunner.java
+++ b/tools/build/conf/src/main/java/org/onosproject/checkstyle/CheckstyleRunner.java
@@ -81,7 +81,7 @@
checker.addListener(listener);
// run Checker
- List<File> fileList = input.subList(2, input.size() - 1).stream()
+ List<File> fileList = input.subList(2, input.size()).stream()
.filter(s -> !s.contains("/:")) // Yes, fighting a hack with a hack.
.map(File::new)
.collect(Collectors.toList());
diff --git a/tools/build/conf/src/main/resources/onos/checkstyle-mvn.xml b/tools/build/conf/src/main/resources/onos/checkstyle-mvn.xml
index 32e4a77..d8401a8 100644
--- a/tools/build/conf/src/main/resources/onos/checkstyle-mvn.xml
+++ b/tools/build/conf/src/main/resources/onos/checkstyle-mvn.xml
@@ -140,9 +140,9 @@
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="scope" value="package"/>
- <property name="allowMissingJavadoc" value="true"/>
+ <property name="allowMissingJavadoc" value="true"/>
<property name="allowUndeclaredRTE" value="true"/>
- <property name="suppressLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
</module>
<module name="JavadocType">
<property name="severity" value="warning"/>
diff --git a/tools/build/conf/src/main/resources/onos/checkstyle.xml b/tools/build/conf/src/main/resources/onos/checkstyle.xml
index 1d365a9..9b98d01 100644
--- a/tools/build/conf/src/main/resources/onos/checkstyle.xml
+++ b/tools/build/conf/src/main/resources/onos/checkstyle.xml
@@ -139,9 +139,9 @@
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="scope" value="package"/>
- <property name="allowMissingJavadoc" value="true"/>
+ <property name="allowMissingJavadoc" value="true"/>
<property name="allowUndeclaredRTE" value="true"/>
- <property name="suppressLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
</module>
<module name="JavadocType">
<property name="severity" value="warning"/>
diff --git a/tools/build/conf/src/main/resources/onos/suppressions.xml b/tools/build/conf/src/main/resources/onos/suppressions.xml
index a40ce9c..56f3d79 100644
--- a/tools/build/conf/src/main/resources/onos/suppressions.xml
+++ b/tools/build/conf/src/main/resources/onos/suppressions.xml
@@ -39,7 +39,7 @@
<suppress files="org.onlab.packet.RADIUSAttribute" checks="RegexpHeader" />
<!-- Suppressions for unit testing code -->
- <suppress checks="Javadoc.*"
+ <suppress checks="Javadoc(Package|Method)"
files=".*/src/test/.*.java"
/>