From 10641f9ae7d1d2f30aec5bc146a8d5b49c22d0a0 Mon Sep 17 00:00:00 2001
From: Duncan Jones <djones@apache.org>
Date: Fri, 9 May 2014 21:13:01 +0000
Subject: [PATCH] Using Validate where possible in builder package.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1593622 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/commons/lang3/builder/HashCodeBuilder.java    | 9 +++------
 .../commons/lang3/builder/HashCodeBuilderTest.java       | 9 +++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index 72be7c5ec..e667b020b 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -25,6 +25,7 @@
 import java.util.Set;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.Validate;
 
 /**
  * <p>
@@ -536,12 +537,8 @@ public HashCodeBuilder() {
      *             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;
     }
diff --git a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
index ad03976c3..0b51cd5d0 100644
--- a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
@@ -60,8 +60,13 @@ public void testConstructorExZero() {
     }
 
     @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)