You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by pa...@apache.org on 2018/11/20 17:21:48 UTC

[5/6] [lang] Make whitespace use before tokens consistent and add a checkstyle rule to enforce it.

Make whitespace use before tokens consistent and add a checkstyle rule to enforce it.


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/07f53712
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/07f53712
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/07f53712

Branch: refs/heads/master
Commit: 07f537120f6a9220c8cc8216b22f9f5744f619b1
Parents: 89cbfa5
Author: pascalschumacher <pa...@gmx.net>
Authored: Mon Nov 19 22:04:43 2018 +0100
Committer: pascalschumacher <pa...@gmx.net>
Committed: Mon Nov 19 22:05:11 2018 +0100

----------------------------------------------------------------------
 checkstyle.xml                                          |  1 +
 src/main/java/org/apache/commons/lang3/StringUtils.java |  2 +-
 .../java/org/apache/commons/lang3/math/NumberUtils.java |  4 ++--
 .../org/apache/commons/lang3/reflect/TypeUtilsTest.java |  2 +-
 .../apache/commons/lang3/time/FastDateParserTest.java   | 12 ++++++------
 5 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/07f53712/checkstyle.xml
----------------------------------------------------------------------
diff --git a/checkstyle.xml b/checkstyle.xml
index 057c1aa..3a31026 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -56,5 +56,6 @@ limitations under the License.
     <module name="NeedBraces"/>
     <module name="RightCurly"/>
     <module name="WhitespaceAfter"/>
+    <module name="NoWhitespaceBefore"/>
  </module>
 </module>

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/07f53712/src/main/java/org/apache/commons/lang3/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/StringUtils.java b/src/main/java/org/apache/commons/lang3/StringUtils.java
index a21e5a9..7fcd024 100644
--- a/src/main/java/org/apache/commons/lang3/StringUtils.java
+++ b/src/main/java/org/apache/commons/lang3/StringUtils.java
@@ -3270,7 +3270,7 @@ public class StringUtils {
      * @return an array of parsed Strings, {@code null} if null String was input
      */
     public static String[] splitByWholeSeparator(final String str, final String separator) {
-        return splitByWholeSeparatorWorker(str, separator, -1, false ) ;
+        return splitByWholeSeparatorWorker(str, separator, -1, false);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/07f53712/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
index e3efc96..bffff0d 100644
--- a/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
+++ b/src/main/java/org/apache/commons/lang3/math/NumberUtils.java
@@ -960,10 +960,10 @@ public class NumberUtils {
             pos += 2;
         } else if (str.startsWith("#", pos)) { // alternative hex (allowed by Long/Integer)
             radix = 16;
-            pos ++;
+            pos++;
         } else if (str.startsWith("0", pos) && str.length() > pos + 1) { // octal; so long as there are additional digits
             radix = 8;
-            pos ++;
+            pos++;
         } // default is to treat as decimal
 
         final BigInteger value = new BigInteger(str.substring(pos), radix);

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/07f53712/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index 46327db..42a34e6 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -49,7 +49,7 @@ import org.junit.jupiter.api.Test;
 /**
  * Test TypeUtils
  */
-@SuppressWarnings({ "unchecked", "unused" , "rawtypes" })
+@SuppressWarnings({ "unchecked", "unused", "rawtypes" })
 //raw types, where used, are used purposely
 public class TypeUtilsTest<B> {
 

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/07f53712/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
index f9f2f94..f7e2bd4 100644
--- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
+++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
@@ -395,13 +395,13 @@ public class FastDateParserTest {
 
     @Test
     public void testSpecialCharacters() throws Exception {
-        testSdfAndFdp("q" , "", true); // bad pattern character (at present)
-        testSdfAndFdp("Q" , "", true); // bad pattern character
-        testSdfAndFdp("$" , "$", false); // OK
-        testSdfAndFdp("?.d" , "?.12", false); // OK
+        testSdfAndFdp("q", "", true); // bad pattern character (at present)
+        testSdfAndFdp("Q", "", true); // bad pattern character
+        testSdfAndFdp("$", "$", false); // OK
+        testSdfAndFdp("?.d", "?.12", false); // OK
         testSdfAndFdp("''yyyyMMdd'A''B'HHmmssSSS''", "'20030210A'B153320989'", false); // OK
         testSdfAndFdp("''''yyyyMMdd'A''B'HHmmssSSS''", "''20030210A'B153320989'", false); // OK
-        testSdfAndFdp("'$\\Ed'" , "$\\Ed", false); // OK
+        testSdfAndFdp("'$\\Ed'", "$\\Ed", false); // OK
 
         // quoted charaters are case sensitive
         testSdfAndFdp("'QED'", "QED", false);
@@ -413,7 +413,7 @@ public class FastDateParserTest {
 
     @Test
     public void testLANG_832() throws Exception {
-        testSdfAndFdp("'d'd" , "d3", false); // OK
+        testSdfAndFdp("'d'd", "d3", false); // OK
         testSdfAndFdp("'d'd'", "d3", true); // should fail (unterminated quote)
     }