Remove .* style imports and replace with explicit imports.

src/main/com/mongodb/BasicDBList.java

@@ -18,8 +18,9 @@
 
 package com.mongodb;
 
-import org.bson.types.*;
-import com.mongodb.util.*;
+import org.bson.types.BasicBSONList;
+
+import com.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson list that is mongo specific 

src/main/com/mongodb/BasicDBObject.java

@@ -18,11 +18,11 @@
 
 package com.mongodb;
 
-import java.util.*;
+import java.util.Map;
 
-import org.bson.*;
+import org.bson.BasicBSONObject;
 
-import com.mongodb.util.*;
+import com.mongodb.util.JSON;
 
 /**
  * a basic implementation of bson object that is mongo specific.

src/main/com/mongodb/BasicDBObjectBuilder.java

@@ -18,7 +18,9 @@
 
 package com.mongodb;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
 
 /**
  * utility for building complex objects

src/main/com/mongodb/Bytes.java

@@ -18,13 +18,17 @@
 
 package com.mongodb;
 
-import java.nio.*;
+import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.*;
-
-import org.bson.*;
-import org.bson.types.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.bson.BSON;
+import org.bson.types.BSONTimestamp;
+import org.bson.types.Code;
+import org.bson.types.CodeWScope;
+import org.bson.types.ObjectId;
 
 /**
  * Class that hold definitions of the wire protocol

src/main/com/mongodb/DB.java

@@ -18,10 +18,17 @@
 
 package com.mongodb;
 
-import java.io.*;
-import java.util.*;
-
-import com.mongodb.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import com.mongodb.util.Util;
 
 /**
  * an abstract class that represents a logical database on a server

src/main/com/mongodb/DBAddress.java

@@ -18,7 +18,8 @@
 
 package com.mongodb;
 
-import java.net.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * Represents a database address

src/main/com/mongodb/DBApiLayer.java

@@ -18,7 +18,14 @@
 
 package com.mongodb;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/main/com/mongodb/DBCallback.java

@@ -19,7 +19,7 @@
 package com.mongodb;
 
 
-import org.bson.*;
+import org.bson.BSONCallback;
 
 /**
  * The DB callback interface.

src/main/com/mongodb/DBCollection.java

@@ -19,7 +19,14 @@
 package com.mongodb;
 
 // Mongo
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import org.bson.types.ObjectId;
 

src/main/com/mongodb/DBCursor.java

@@ -18,7 +18,11 @@
 
 package com.mongodb;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 import com.mongodb.DBApiLayer.Result;
 

src/main/com/mongodb/DBDecoder.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.bson.BSONDecoder;
 
 /**

src/main/com/mongodb/DBObject.java

@@ -18,7 +18,7 @@
 
 package com.mongodb;
 
-import org.bson.*;
+import org.bson.BSONObject;
 
 /**
  * A key-value map that can be saved to the database.

src/main/com/mongodb/DBPointer.java

@@ -18,7 +18,7 @@
 
 package com.mongodb;
 
-import org.bson.types.*;
+import org.bson.types.ObjectId;
 
 /**
  * @deprecated

src/main/com/mongodb/DBPort.java

@@ -18,12 +18,19 @@
 
 package com.mongodb;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
-
-import com.mongodb.util.*;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.mongodb.util.ThreadUtil;
 
 /**
  * represents a Port to the database, which is effectively a single connection to a server

src/main/com/mongodb/DBPortPool.java

@@ -19,11 +19,18 @@
 package com.mongodb;
 
 import java.lang.management.ManagementFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Semaphore;
 import java.util.logging.Level;
 
-import javax.management.*;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 
 import com.mongodb.util.SimplePool;
 

src/main/com/mongodb/DBRef.java

@@ -18,7 +18,7 @@
 
 package com.mongodb;
 
-import org.bson.*;
+import org.bson.BSONObject;
 
 /**
  * overrides DBRefBase to understand a BSONObject representation of a reference.

src/main/com/mongodb/DBTCPConnector.java

@@ -20,7 +20,9 @@
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/main/com/mongodb/DefaultDBCallback.java

@@ -19,12 +19,13 @@
 package com.mongodb;
 
 // Bson
-import org.bson.*;
-import org.bson.types.*;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-// Java
-import java.util.*;
-import java.util.logging.*;
+import org.bson.BSONObject;
+import org.bson.BasicBSONCallback;
+import org.bson.types.ObjectId;
 
 /**
  * This class overrides BasicBSONCallback to implement some extra features specific to the Database.

src/main/com/mongodb/DefaultDBDecoder.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.bson.BasicBSONDecoder;
 
 /**

src/main/com/mongodb/LazyDBDecoder.java

@@ -17,6 +17,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.bson.LazyBSONDecoder;
 
 /**

src/main/com/mongodb/Mongo.java

@@ -19,7 +19,10 @@
 package com.mongodb;
 
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 

src/main/com/mongodb/MongoException.java

@@ -18,7 +18,7 @@
 
 package com.mongodb;
 
-import org.bson.*;
+import org.bson.BSONObject;
 
 /**
  * A general exception raised in Mongo

src/main/com/mongodb/MongoURI.java

@@ -18,9 +18,11 @@
 
 package com.mongodb;
 
-import java.net.*;
-import java.util.*;
-import java.util.logging.*;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * Represents a URI which can be used to create a Mongo instance.

src/main/com/mongodb/OutMessage.java

@@ -18,14 +18,18 @@
 
 package com.mongodb;
 
-import java.util.concurrent.atomic.*;
-import java.io.*;
-
-
-import org.bson.*;
-import org.bson.io.*;
-import org.bson.types.*;
-import static org.bson.BSON.*;
+import static org.bson.BSON.EOO;
+import static org.bson.BSON.OBJECT;
+import static org.bson.BSON.REF;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.bson.BSONEncoder;
+import org.bson.BSONObject;
+import org.bson.io.PoolOutputBuffer;
+import org.bson.types.ObjectId;
 
 class OutMessage extends BSONEncoder {
 

src/main/com/mongodb/QueryBuilder.java

@@ -18,7 +18,8 @@
 
 package com.mongodb;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 
 /**

src/main/com/mongodb/RawDBObject.java

@@ -18,14 +18,39 @@
 
 package com.mongodb;
 
-import java.nio.*;
-import java.util.*;
-
-import org.bson.*;
-import org.bson.types.*;
-
-import static com.mongodb.Bytes.*;
-import static com.mongodb.util.MyAsserts.*;
+import static com.mongodb.util.MyAsserts.assertEquals;
+import static org.bson.BSON.ARRAY;
+import static org.bson.BSON.BINARY;
+import static org.bson.BSON.BOOLEAN;
+import static org.bson.BSON.CODE;
+import static org.bson.BSON.CODE_W_SCOPE;
+import static org.bson.BSON.DATE;
+import static org.bson.BSON.EOO;
+import static org.bson.BSON.MAXKEY;
+import static org.bson.BSON.MINKEY;
+import static org.bson.BSON.NULL;
+import static org.bson.BSON.NUMBER;
+import static org.bson.BSON.NUMBER_INT;
+import static org.bson.BSON.NUMBER_LONG;
+import static org.bson.BSON.OBJECT;
+import static org.bson.BSON.OID;
+import static org.bson.BSON.REF;
+import static org.bson.BSON.REGEX;
+import static org.bson.BSON.STRING;
+import static org.bson.BSON.SYMBOL;
+import static org.bson.BSON.TIMESTAMP;
+import static org.bson.BSON.UNDEFINED;
+
+import java.nio.ByteBuffer;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.bson.BSONObject;
+import org.bson.types.ObjectId;
 
 /**
  * This object wraps the binary object format ("BSON") used for the transport of serialized objects to / from the Mongo database.