checkstyle 6.16.1

ironjacamar · Mar 15, 2016 · 28da404 · 28da404
1 parent 4f9fe71
commit 28da404
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -201,7 +201,7 @@ subprojects { subProject ->
     configFile = rootProject.file('tools/checkstyle/checkstyle.xml')
     showViolations = true
     ignoreFailures = false
-    toolVersion = '6.10.1'
+    toolVersion = '6.16.1'
   }
 
   checkstyleMain.exclude '**/*_$bundle*'

diff --git a/...uite/src/test/java/org/ironjacamar/common/metadata/common/ExpressionTemplateTestCase.java b/...uite/src/test/java/org/ironjacamar/common/metadata/common/ExpressionTemplateTestCase.java
@@ -109,7 +109,7 @@ private void expressionValueTest(Expression e, String expected)
    @Test
    public void testGetValueUnresolved()
    {
-      expressionValueTest(new Expression("a", "b", null) , "b");
+      expressionValueTest(new Expression("a", "b", null), "b");
    }
 
    /**
@@ -118,7 +118,7 @@ public void testGetValueUnresolved()
    @Test
    public void testGetValueResolvedEmpty()
    {
-      expressionValueTest(new Expression("a", "b", "  ") , "b");
+      expressionValueTest(new Expression("a", "b", "  "), "b");
    }
 
    /**
@@ -127,7 +127,7 @@ public void testGetValueResolvedEmpty()
    @Test
    public void testGetValueUnresolvedNoDefault()
    {
-      expressionValueTest(new Expression("a", null, null) , "");
+      expressionValueTest(new Expression("a", null, null), "");
    }
 
    /**
@@ -137,7 +137,7 @@ public void testGetValueUnresolvedNoDefault()
    @Test
    public void testGetValueResolvedAndDefaultEmpty()
    {
-      expressionValueTest(new Expression("a", "", "  ") , "");
+      expressionValueTest(new Expression("a", "", "  "), "");
    }
 
    /**
@@ -146,7 +146,7 @@ public void testGetValueResolvedAndDefaultEmpty()
    @Test
    public void testGetValueResolved1()
    {
-      expressionValueTest(new Expression("a", "b", "c") , "c");
+      expressionValueTest(new Expression("a", "b", "c"), "c");
    }
 
    /**
@@ -156,7 +156,7 @@ public void testGetValueResolved1()
    @Test
    public void testGetValueResolved2()
    {
-      expressionValueTest(new Expression("a", null, "c") , "c");
+      expressionValueTest(new Expression("a", null, "c"), "c");
    }
 
    /**
@@ -175,7 +175,7 @@ private void expressionSubstitutionTest(Expression e, String expected)
    @Test
    public void testToSubstitutionUnresolved()
    {
-      expressionSubstitutionTest(new Expression("a", "b", null) , "${a:b}");
+      expressionSubstitutionTest(new Expression("a", "b", null), "${a:b}");
    }
 
    /**
@@ -184,7 +184,7 @@ public void testToSubstitutionUnresolved()
    @Test
    public void testToSubstitutionResolvedEmpty()
    {
-      expressionSubstitutionTest(new Expression("a", "b", "  ") , "${a:  }");
+      expressionSubstitutionTest(new Expression("a", "b", "  "), "${a:  }");
    }
 
    /**
@@ -193,7 +193,7 @@ public void testToSubstitutionResolvedEmpty()
    @Test
    public void testToSubstitutionUnresolvedNoDefault()
    {
-      expressionSubstitutionTest(new Expression("a", null, null) , "${a}");
+      expressionSubstitutionTest(new Expression("a", null, null), "${a}");
    }
 
    /**
@@ -203,7 +203,7 @@ public void testToSubstitutionUnresolvedNoDefault()
    @Test
    public void testToSubstitutionResolvedAndDefaultEmpty()
    {
-      expressionSubstitutionTest(new Expression("a", "", null) , "${a:}");
+      expressionSubstitutionTest(new Expression("a", "", null), "${a:}");
    }
 
    /**
@@ -212,7 +212,7 @@ public void testToSubstitutionResolvedAndDefaultEmpty()
    @Test
    public void testToSubstitutionResolved1()
    {
-      expressionSubstitutionTest(new Expression("a", "b", "c") , "${a:c}");
+      expressionSubstitutionTest(new Expression("a", "b", "c"), "${a:c}");
    }
 
    /**
@@ -222,7 +222,7 @@ public void testToSubstitutionResolved1()
    @Test
    public void testToSubstitutionResolved2()
    {
-      expressionSubstitutionTest(new Expression("a", null, "c") , "${a}");
+      expressionSubstitutionTest(new Expression("a", null, "c"), "${a}");
    }
 
    /**

diff --git a/testsuite/src/test/java/org/ironjacamar/util/TestUtils.java b/testsuite/src/test/java/org/ironjacamar/util/TestUtils.java
@@ -93,7 +93,8 @@ public static boolean isCorrectCollectionSizeTimeOut(Collection<?> collection,
          int size, long timeout, TimeUnit unit)
          throws InterruptedException
    {
-      Runnable task = () -> {
+      Runnable task = () ->
+      {
          try
          {
             while (collection.size() != size)

diff --git a/tools/checkstyle/checkstyle.xml b/tools/checkstyle/checkstyle.xml
@@ -62,6 +62,7 @@
       <property name="allowUndeclaredRTE" value="true"/>
       <property name="allowThrowsTagsForSubclasses" value="true"/>
       <property name="scope" value="package"/>
+      <property name="tokens" value="METHOD_DEF, CTOR_DEF"/>
     </module>
     <module name="JavadocVariable">
       <property name="scope" value="package"/>