misc code cleanup - chipping away at the compiler warnings.

Ryan · Ryan · commit 0322ed05816d · 2011-02-10T10:06:51.000-05:00
diff --git a/src/main/com/mongodb/BasicDBList.java b/src/main/com/mongodb/BasicDBList.java
@@ -27,6 +27,8 @@
  */
 public class BasicDBList extends BasicBSONList implements DBObject {
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     /**
      * Returns a JSON serialization of this object
      * @return JSON serialization
diff --git a/src/main/com/mongodb/BasicDBObject.java b/src/main/com/mongodb/BasicDBObject.java
@@ -33,6 +33,8 @@
  * </pre></blockquote>
  */
 public class BasicDBObject extends BasicBSONObject implements DBObject {
+
+    private static final long serialVersionUID = -4415279469780082174L;
     
     /**
      *  Creates an empty object.
diff --git a/src/main/com/mongodb/DBCallback.java b/src/main/com/mongodb/DBCallback.java
@@ -50,8 +50,8 @@ public void objectStart(boolean array, String name){
     public Object objectDone(){
         BSONObject o = (BSONObject)super.objectDone();
         if ( ! ( o instanceof List ) && 
-             o.containsKey( "$ref" ) && 
-             o.containsKey( "$id" ) ){
+             o.containsField( "$ref" ) && 
+             o.containsField( "$id" ) ){
             return cur().put( _lastName , new DBRef( _db, o ) );
         }
         
diff --git a/src/main/com/mongodb/DBPointer.java b/src/main/com/mongodb/DBPointer.java
@@ -23,6 +23,7 @@
 /**
  * @deprecated
  */
+@Deprecated
 public class DBPointer extends DBRefBase {
     
     static final boolean D = Boolean.getBoolean( "DEBUG.DBPOINTER" );
diff --git a/src/main/com/mongodb/MongoException.java b/src/main/com/mongodb/MongoException.java
@@ -26,6 +26,8 @@
  */
 public class MongoException extends RuntimeException {
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     /**
      * @param msg the message
      */
@@ -92,6 +94,8 @@ static Throwable _massage( Throwable t ){
      */
     public static class Network extends MongoException {
 
+        private static final long serialVersionUID = -4415279469780082174L;
+
         Network( String msg , java.io.IOException ioe ){
             super( -2 , msg , ioe );
             _ioe = ioe;
@@ -109,6 +113,9 @@ public static class Network extends MongoException {
      * Subclass of MongoException representing a duplicate key exception
      */
     public static class DuplicateKey extends MongoException {
+
+        private static final long serialVersionUID = -4415279469780082174L;
+
         DuplicateKey( int code , String msg ){
             super( code , msg );
         }
@@ -118,6 +125,9 @@ public static class DuplicateKey extends MongoException {
      * Subclass of MongoException representing a cursor-not-found exception
      */
     public static class CursorNotFound extends MongoException {
+        
+        private static final long serialVersionUID = -4415279469780082174L;
+
         CursorNotFound(){
             super( -5 , "cursor not found on server" );
         }
diff --git a/src/main/com/mongodb/MongoInternalException.java b/src/main/com/mongodb/MongoInternalException.java
@@ -24,6 +24,8 @@
  */
 public class MongoInternalException extends MongoException {
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     /**
      *
      * @param msg the message
@@ -42,3 +44,4 @@ public MongoInternalException( String msg , Throwable t ){
     }
 
 }
+
diff --git a/src/main/com/mongodb/RawDBObject.java b/src/main/com/mongodb/RawDBObject.java
@@ -78,6 +78,10 @@ public Object removeField( String key ){
         throw new RuntimeException( "read only" );
     }
 
+    /**
+     * @deprecated
+     */
+    @Deprecated
     public boolean containsKey( String key ){
         return containsField(key);
     }
diff --git a/src/main/com/mongodb/ReflectionDBObject.java b/src/main/com/mongodb/ReflectionDBObject.java
@@ -38,6 +38,10 @@ public Set<String> keySet(){
         return getWrapper().keySet();
     }
 
+    /**
+     * @deprecated
+     */
+    @Deprecated
     public boolean containsKey( String s ){
         return containsField( s );
     }
@@ -162,6 +166,10 @@ public Set<String> keySet(){
             return _keys;
         }
 
+        /**
+         * @deprecated
+         */
+        @Deprecated
         public boolean containsKey( String key ){
             return _keys.contains( key );
         }
diff --git a/src/main/com/mongodb/gridfs/GridFSFile.java b/src/main/com/mongodb/gridfs/GridFSFile.java
@@ -217,6 +217,10 @@ public Object removeField( String key ){
         throw new UnsupportedOperationException();
     }
 
+    /*
+     * @deprecated
+     */
+    @Deprecated
     public boolean containsKey( String s ){
         return containsField( s );
     }
diff --git a/src/main/com/mongodb/util/JSON.java b/src/main/com/mongodb/util/JSON.java
@@ -673,6 +673,8 @@ else if(current == ']') {
  */
 class JSONParseException extends RuntimeException { 
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     String s;
     int pos;
 
diff --git a/src/main/com/mongodb/util/JSONCallback.java b/src/main/com/mongodb/util/JSONCallback.java
@@ -34,14 +34,14 @@ public Object objectDone(){
 	BSONObject b = (BSONObject)o;
 
 	if ( ! _lastArray ) {
-	    if ( b.containsKey( "$oid" ) ) {
+	    if ( b.containsField( "$oid" ) ) {
 		o = new ObjectId((String)b.get("$oid"));
 		if (!isStackEmpty()) {
 		    gotObjectId( _lastName, (ObjectId)o);
 		} else {
 		    setRoot(o);
 		} 
-	    } else if ( b.containsKey( "$date" ) ) {
+	    } else if ( b.containsField( "$date" ) ) {
 		SimpleDateFormat format = 
 		    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 		format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
@@ -51,7 +51,7 @@ public Object objectDone(){
 		} else {
 		    setRoot(o);
 		}
-	    } else if ( b.containsKey( "$regex" ) ) {
+	    } else if ( b.containsField( "$regex" ) ) {
 		o = Pattern.compile( (String)b.get( "$regex" ), 
 				     BSON.regexFlags( (String)b.get( "$options" )) );
 		if (!isStackEmpty()) {
diff --git a/src/main/com/mongodb/util/OptionMap.java b/src/main/com/mongodb/util/OptionMap.java
@@ -22,6 +22,8 @@
 
 public class OptionMap extends TreeMap<String,String> {
     
+    private static final long serialVersionUID = -4415279469780082174L;
+    
     public int getInt( String name , int def ){
         return StringParseUtil.parseIfInt( get( name ) , def );
     }
diff --git a/src/main/com/mongodb/util/UniqueList.java b/src/main/com/mongodb/util/UniqueList.java
@@ -22,6 +22,8 @@
 
 public class UniqueList<T> extends ArrayList<T> {
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     public boolean add( T t ){
         if ( contains( t ) )
             return false;
diff --git a/src/main/org/bson/BasicBSONObject.java b/src/main/org/bson/BasicBSONObject.java
@@ -29,6 +29,8 @@
  * </pre></blockquote>
  */
 public class BasicBSONObject extends LinkedHashMap<String,Object> implements BSONObject {
+
+    private static final long serialVersionUID = -4415279469780082174L;
     
     /**
      *  Creates an empty object.
diff --git a/src/main/org/bson/types/BasicBSONList.java b/src/main/org/bson/types/BasicBSONList.java
@@ -51,9 +51,10 @@
  * </p>
  */
 public class BasicBSONList extends ArrayList<Object> implements BSONObject {
+
+    private static final long serialVersionUID = -4415279469780082174L;
     
-    public BasicBSONList(){
-    }
+    public BasicBSONList() { }
     
     /** 
      * Puts a value at an index.
diff --git a/src/main/org/bson/types/ObjectId.java b/src/main/org/bson/types/ObjectId.java
@@ -40,6 +40,8 @@
  */
 public class ObjectId implements Comparable<ObjectId> , java.io.Serializable {
 
+    private static final long serialVersionUID = -4415279469780082174L;
+
     static final Logger LOGGER = Logger.getLogger( "org.bson.ObjectId" );
 
     /** Gets a new object id.

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`public class MongoInternalException extends MongoException {`
`26`	`26`
	`27`	`+ private static final long serialVersionUID = -4415279469780082174L;`
	`28`	`+`
`27`	`29`	`/**`
`28`	`30`	`*`
`29`	`31`	`* @param msg the message`
`@@ -42,3 +44,4 @@ public MongoInternalException( String msg , Throwable t ){`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`}`
	`47`	`+`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ public Object removeField( String key ){`
`78`	`78`	`throw new RuntimeException( "read only" );`
`79`	`79`	`}`
`80`	`80`
	`81`	`+ /**`
	`82`	`+ * @deprecated`
	`83`	`+ */`
	`84`	`+ @Deprecated`
`81`	`85`	`public boolean containsKey( String key ){`
`82`	`86`	`return containsField(key);`
`83`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,10 @@ public Set<String> keySet(){`
`38`	`38`	`return getWrapper().keySet();`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ /**`
	`42`	`+ * @deprecated`
	`43`	`+ */`
	`44`	`+ @Deprecated`
`41`	`45`	`public boolean containsKey( String s ){`
`42`	`46`	`return containsField( s );`
`43`	`47`	`}`
`@@ -162,6 +166,10 @@ public Set<String> keySet(){`
`162`	`166`	`return _keys;`
`163`	`167`	`}`
`164`	`168`
	`169`	`+ /**`
	`170`	`+ * @deprecated`
	`171`	`+ */`
	`172`	`+ @Deprecated`
`165`	`173`	`public boolean containsKey( String key ){`
`166`	`174`	`return _keys.contains( key );`
`167`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,10 @@ public Object removeField( String key ){`
`217`	`217`	`throw new UnsupportedOperationException();`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ /*`
	`221`	`+ * @deprecated`
	`222`	`+ */`
	`223`	`+ @Deprecated`
`220`	`224`	`public boolean containsKey( String s ){`
`221`	`225`	`return containsField( s );`
`222`	`226`	`}`