JAVA-802: Use $query and $orderby in query document instead of query and orderby

Author: jyemin

src/main/com/mongodb/QueryOpBuilder.java

@@ -106,36 +106,36 @@ public QueryOpBuilder addReadPreference(DBObject readPref){
 	 * Constructs the query operation DBObject
 	 * @return DBObject representing the query command to be sent to server
 	 */
-	public DBObject get(){
-		DBObject lclQuery = query;
-		
-		//must always have a query
-		if(lclQuery == null){
-			lclQuery = new BasicDBObject();
-		}
-		
-		if (hasSpecialQueryFields()) {
-			DBObject queryop = (specialFields == null ? new BasicDBObject() : specialFields);
-
-            addToQueryObject(queryop, "query", lclQuery, true);
-            addToQueryObject(queryop, "orderby", orderBy, false);
-            if (hintStr != null)
-                addToQueryObject(queryop, "$hint", hintStr);
-            if (hintObj != null)
-                addToQueryObject(queryop, "$hint", hintObj);
-
-            if (explain)
-                queryop.put("$explain", true);
-            if (snapshot)
-                queryop.put("$snapshot", true);
-            if (readPref != null)
-                queryop.put(READ_PREFERENCE_META_OPERATOR, readPref);
-
-            return queryop;
-		}
-		
-		return lclQuery;
-	}
+        public DBObject get() {
+            DBObject lclQuery = query;
+
+            //must always have a query
+            if (lclQuery == null) {
+                lclQuery = new BasicDBObject();
+            }
+
+            if (hasSpecialQueryFields()) {
+                DBObject queryop = (specialFields == null ? new BasicDBObject() : specialFields);
+
+                addToQueryObject(queryop, "$query", lclQuery, true);
+                addToQueryObject(queryop, "$orderby", orderBy, false);
+                if (hintStr != null)
+                    addToQueryObject(queryop, "$hint", hintStr);
+                if (hintObj != null)
+                    addToQueryObject(queryop, "$hint", hintObj);
+
+                if (explain)
+                    queryop.put("$explain", true);
+                if (snapshot)
+                    queryop.put("$snapshot", true);
+                if (readPref != null)
+                    queryop.put(READ_PREFERENCE_META_OPERATOR, readPref);
+
+                return queryop;
+            }
+
+            return lclQuery;
+        }
 
     private boolean hasSpecialQueryFields(){
 

src/test/com/mongodb/QueryOpTest.java

@@ -30,41 +30,41 @@ public void testQueryAndOthers(){
 
 
 		DBObject queryOp = new QueryOpBuilder().addQuery(query).addOrderBy(orderBy).addHint(hintStr).get();
-		assertEquals(queryOp.get("query"), query);
-		assertEquals(queryOp.get("orderby"), orderBy);
+		assertEquals(queryOp.get("$query"), query);
+		assertEquals(queryOp.get("$orderby"), orderBy);
 		assertEquals(queryOp.get("$hint"), hintStr);
 		assertNull(queryOp.get("$explain"));
 		assertNull(queryOp.get("$snapshot"));
 
 		//orderby should only be there if added
 		queryOp = new QueryOpBuilder().addQuery(query).addHint(hintStr).get();
-		assertEquals(queryOp.get("query"), query);
-		assertNull(queryOp.get("orderby"));
+		assertEquals(queryOp.get("$query"), query);
+		assertNull(queryOp.get("$orderby"));
 
 		//hintObj takes precedence over hintStr
 		queryOp = new QueryOpBuilder().addQuery(query).addOrderBy(orderBy).addHint(hintStr).addHint(hintObj).get();
-		assertEquals(queryOp.get("query"), query);
-		assertEquals(queryOp.get("orderby"), orderBy);
+		assertEquals(queryOp.get("$query"), query);
+		assertEquals(queryOp.get("$orderby"), orderBy);
 		assertEquals(queryOp.get("$hint"), hintObj);
 
 		queryOp = new QueryOpBuilder().addQuery(query).addExplain(true).addSnapshot(true).get();
-		assertEquals(queryOp.get("query"), query);
-		assertNull(queryOp.get("orderby"));
+		assertEquals(queryOp.get("$query"), query);
+		assertNull(queryOp.get("$orderby"));
 		assertNull(queryOp.get("$hint"));
 		assertEquals(queryOp.get("$explain"), true);
 		assertEquals(queryOp.get("$snapshot"), true);
 
 		queryOp = new QueryOpBuilder().addQuery(query).addSpecialFields(new BasicDBObject("flag", "val")).get();
 		assertEquals(queryOp.get("flag"), "val");
-		assertEquals(queryOp.get("query"), query);
-		assertNull(queryOp.get("orderby"));
+		assertEquals(queryOp.get("$query"), query);
+		assertNull(queryOp.get("$orderby"));
 		assertNull(queryOp.get("$hint"));
 		assertNull(queryOp.get("$explain"));
 		assertNull(queryOp.get("$snapshot"));
 
 		queryOp = new QueryOpBuilder().addQuery(query).addReadPreference(readPref).get();
-        assertEquals(queryOp.get("query"), query);
-        assertNull(queryOp.get("orderby"));
+        assertEquals(queryOp.get("$query"), query);
+        assertNull(queryOp.get("$orderby"));
         assertNull(queryOp.get("$hint"));
         assertNull(queryOp.get("$explain"));
         assertNull(queryOp.get("$snapshot"));