- JAVA-425: throw exception if w is wrong type

Author: agirbal

src/main/com/mongodb/WriteConcern.java

@@ -146,7 +146,7 @@ public WriteConcern( int w , int wtimeout , boolean fsync ){
      * @param j whether writes should wait for a journaling group commit
      */
     public WriteConcern( int w , int wtimeout , boolean fsync , boolean j ){
-        _wValue = w;
+        _w = w;
         _wtimeout = wtimeout;
         _fsync = fsync;
         _j = j;
@@ -169,7 +169,7 @@ public WriteConcern( int w , int wtimeout , boolean fsync , boolean j ){
      * @param j whether writes should wait for a journaling group commit
      */
     public WriteConcern( String w , int wtimeout , boolean fsync, boolean j ){
-        _wValue = w;
+        _w = w;
         _wtimeout = wtimeout;
         _fsync = fsync;
         _j = j;
@@ -182,9 +182,9 @@ public WriteConcern( String w , int wtimeout , boolean fsync, boolean j ){
     public BasicDBObject getCommand(){
         BasicDBObject _command = new BasicDBObject( "getlasterror" , 1 );
 
-        if ( _wValue instanceof Integer && ( (Integer) _wValue > 0) ||
-            ( _wValue instanceof String && _wValue != null ) ){
-            _command.put( "w" , _wValue );
+        if ( _w instanceof Integer && ( (Integer) _w > 0) ||
+            ( _w instanceof String && _w != null ) ){
+            _command.put( "w" , _w );
             _command.put( "wtimeout" , _wtimeout );
         }
 
@@ -201,40 +201,42 @@ public BasicDBObject getCommand(){
      * Sets the w value (the write strategy)
      * @param wValue
      */
-    public void setWObject(Object wValue) {
-        this._wValue = wValue;
+    public void setWObject(Object w) {
+        if ( ! (w instanceof Integer) && ! (w instanceof String) )
+            throw new IllegalArgumentException("The w parameter must be an int or a String");
+        this._w = w;
     }
 
     /**
      * Gets the w value (the write strategy)
      * @return
      */
     public Object getWObject(){
-        return _wValue;
+        return _w;
     }
 
     /**
      * Sets the w value (the write strategy)
      * @param w
      */
     public void setW(int w) {
-        _wValue = w;
+        _w = w;
     }
 
     /**
      * Gets the w parameter (the write strategy)
      * @return
      */
     public int getW(){
-        return (Integer) _wValue;
+        return (Integer) _w;
     }
 
     /**
      * Gets the w parameter (the write strategy) in String format
      * @return
      */
     public String getWString(){
-        return _wValue.toString();
+        return _w.toString();
     }
 
     /**
@@ -282,19 +284,19 @@ public boolean fsync(){
      * @return
      */
     public boolean raiseNetworkErrors(){
-        if (_wValue instanceof Integer)
-            return (Integer) _wValue >= 0;
-        return _wValue != null;
+        if (_w instanceof Integer)
+            return (Integer) _w >= 0;
+        return _w != null;
     }
 
     /**
      * Returns whether "getlasterror" should be called (w > 0)
      * @return
      */
     public boolean callGetLastError(){
-        if (_wValue instanceof Integer)
-            return (Integer) _wValue  > 0;
-        return _wValue != null;
+        if (_w instanceof Integer)
+            return (Integer) _w  > 0;
+        return _w != null;
     }
 
     /**
@@ -334,7 +336,7 @@ public boolean equals( Object o ){
         if ( o == null || getClass() != o.getClass() ) return false;
 
         WriteConcern that = (WriteConcern) o;
-        return _fsync == that._fsync && _wValue == that._wValue && _wtimeout == that._wtimeout && _j == that._j && _continueOnErrorForInsert == that._continueOnErrorForInsert;
+        return _fsync == that._fsync && _w == that._w && _wtimeout == that._wtimeout && _j == that._j && _continueOnErrorForInsert == that._continueOnErrorForInsert;
     }
 
     /**
@@ -384,7 +386,7 @@ public static Majority majorityWriteConcern( int wtimeout, boolean fsync, boolea
     }
 
 
-    Object _wValue = 0;
+    Object _w = 0;
     int _wtimeout = 0;
     boolean _fsync = false;
     boolean _j = false;