svn commit: r1593622 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java

[djones]

Author: djones
Date: Fri May  9 21:13:01 2014
New Revision: 1593622

URL: http://svn.apache.org/r1593622
Log:
Using Validate where possible in builder package.

Modified:
    
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
    
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java

Modified: 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java?rev=1593622&r1=1593621&r2=1593622&view=diff
==============================================================================
--- 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
 (original)
+++ 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
 Fri May  9 21:13:01 2014
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.Validate;
 
 /**
  * <p>
@@ -536,12 +537,8 @@ public class HashCodeBuilder implements 
      *             if the number is even
      */
     public HashCodeBuilder(final int initialOddNumber, final int 
multiplierOddNumber) {
-        if (initialOddNumber % 2 == 0) {
-            throw new IllegalArgumentException("HashCodeBuilder requires an 
odd initial value");
-        }
-        if (multiplierOddNumber % 2 == 0) {
-            throw new IllegalArgumentException("HashCodeBuilder requires an 
odd multiplier");
-        }
+        Validate.isTrue(initialOddNumber % 2 != 0, "HashCodeBuilder requires 
an odd initial value");
+        Validate.isTrue(multiplierOddNumber % 2 != 0, "HashCodeBuilder 
requires an odd multiplier");
         iConstant = multiplierOddNumber;
         iTotal = initialOddNumber;
     }

Modified: 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java?rev=1593622&r1=1593621&r2=1593622&view=diff
==============================================================================
--- 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
 (original)
+++ 
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
 Fri May  9 21:13:01 2014
@@ -60,8 +60,13 @@ public class HashCodeBuilderTest {
     }
 
     @Test(expected=IllegalArgumentException.class)
-    public void testConstructorExEven() {
-        new HashCodeBuilder(2, 2);
+    public void testConstructorExEvenFirst() {
+        new HashCodeBuilder(2, 3);
+    }
+    
+    @Test(expected=IllegalArgumentException.class)
+    public void testConstructorExEvenSecond() {
+        new HashCodeBuilder(3, 2);
     }
 
     @Test(expected=IllegalArgumentException.class)