- JAVA-425: further cleanup

Author: agirbal

src/main/com/mongodb/DBApiLayer.java

@@ -243,7 +243,7 @@ protected WriteResult insert(DBObject[] arr, boolean shouldApply , com.mongodb.W
                 OutMessage om = new OutMessage( _mongo , 2002, encoder );
 
                 int flags = 0;
-                if ( concern.continueOnErrorForInsert() ) flags |= 1;
+                if ( concern.getContinueOnErrorForInsert() ) flags |= 1;
                 om.writeInt( flags );
                 om.writeCString( _fullNameSpace );
 

src/main/com/mongodb/WriteConcern.java

@@ -269,15 +269,14 @@ public boolean getFsync(){
         return _fsync;
     }
 
-   /**
-    * Returns whether (batch) inserts will continue if an error occurs before the end
-    * @return boolean
-    */
-    public boolean continueOnErrorForInsert(){
-        return _continueOnErrorInsert;
+    /**
+     * Gets the fsync flag (fsync to disk on the server)
+     * @return
+     */
+    public boolean fsync(){
+        return _fsync;
     }
-	  	
-
+    
     /**
      * Returns whether network error may be raised (w >= 0)
      * @return
@@ -326,7 +325,7 @@ public static WriteConcern valueOf(String name) {
 
     @Override
     public String toString(){
-        return "WriteConcern " + getCommand() + " / (Continue Inserting on Errors? " + getContinueOnErrorInsert() + ")";
+        return "WriteConcern " + getCommand() + " / (Continue Inserting on Errors? " + getContinueOnErrorForInsert() + ")";
     }
 
     @Override
@@ -335,7 +334,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 && _continueOnErrorInsert == that._continueOnErrorInsert;
+        return _fsync == that._fsync && _wValue == that._wValue && _wtimeout == that._wtimeout && _j == that._j && _continueOnErrorForInsert == that._continueOnErrorForInsert;
     }
 
     /**
@@ -356,18 +355,18 @@ public boolean getJ() {
 
     /**
      * Sets the "continue inserts on error" mode
-     * @param continueOnErrorInsert 
+     * @param continueOnErrorForInsert 
      */
-    public void setContinueOnErrorInsert(boolean continueOnErrorInsert) {
-        this._continueOnErrorInsert = continueOnErrorInsert;
+    public void setContinueOnErrorForInsert(boolean continueOnErrorForInsert) {
+        this._continueOnErrorForInsert = continueOnErrorForInsert;
     }
 
     /**
      * Gets the "continue inserts on error" mode
      * @return 
      */
-    public boolean getContinueOnErrorInsert() {
-        return _continueOnErrorInsert;
+    public boolean getContinueOnErrorForInsert() {
+        return _continueOnErrorForInsert;
     }
 
     /**
@@ -387,7 +386,7 @@ public static Majority majorityWriteConcern( int wtimeout, boolean fsync, boolea
     int _wtimeout = 0;
     boolean _fsync = false;
     boolean _j = false;
-    boolean _continueOnErrorInsert = false;
+    boolean _continueOnErrorForInsert = false;
 
     public static class Majority extends WriteConcern {
 

src/test/com/mongodb/DBCollectionTest.java

@@ -242,7 +242,7 @@ public void testMultiInsertNoContinue() {
         WriteResult r = c.insert(inserted1,inserted2, inserted3);
         System.err.println( "Count: " + c.count()  + " WriteConcern: " + c.getWriteConcern() );
 
-        System.err.println( " Continue on Error? " + c.getWriteConcern().continueOnErrorForInsert() );
+        System.err.println( " Continue on Error? " + c.getWriteConcern().getContinueOnErrorForInsert() );
         for (DBObject doc : c.find(  )) {
             System.err.println( doc );
         }
@@ -271,7 +271,7 @@ public void testMultiInsertWithContinue() {
         DBObject inserted2 = BasicDBObjectBuilder.start("_id", id).add("x",3).add("y",4).get();
         DBObject inserted3 = BasicDBObjectBuilder.start().add("x",5).add("y",6).get();
         WriteConcern wc = new WriteConcern();
-        wc.setContinueOnErrorInsert(true);
+        wc.setContinueOnErrorForInsert(true);
         WriteResult r = c.insert(wc, inserted1, inserted2, inserted3);
         assertEquals( c.count(), 2 );
     }