From 9a8a79231529f5bd8145ff76590965118e933329 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Wed, 1 May 2013 18:59:05 +0200
Subject: [PATCH] Remove _id field in the converter and care about if numbers
 are floating or not.

---
 .../massivecraft/mcore/store/DriverMongo.java |  2 +
 .../mcore/store/MongoGsonConverter.java       | 40 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/com/massivecraft/mcore/store/DriverMongo.java b/src/com/massivecraft/mcore/store/DriverMongo.java
index b0254e46..9ea6d550 100644
--- a/src/com/massivecraft/mcore/store/DriverMongo.java
+++ b/src/com/massivecraft/mcore/store/DriverMongo.java
@@ -133,6 +133,8 @@ public class DriverMongo extends DriverAbstract
 		DBCollection dbcoll = fixColl(coll);
 		BasicDBObject raw = (BasicDBObject)dbcoll.findOne(new BasicDBObject(ID_FIELD, id));
 		if (raw == null) return null;
+		
+		raw.removeField(ID_FIELD);
 		Long mtime = (Long) raw.removeField(MTIME_FIELD);
 		
 		JsonElement element = MongoGsonConverter.mongo2GsonObject(raw);
diff --git a/src/com/massivecraft/mcore/store/MongoGsonConverter.java b/src/com/massivecraft/mcore/store/MongoGsonConverter.java
index 9f6dd2fa..4fa2a332 100644
--- a/src/com/massivecraft/mcore/store/MongoGsonConverter.java
+++ b/src/com/massivecraft/mcore/store/MongoGsonConverter.java
@@ -10,6 +10,7 @@ import com.massivecraft.mcore.xlib.gson.JsonElement;
 import com.massivecraft.mcore.xlib.gson.JsonNull;
 import com.massivecraft.mcore.xlib.gson.JsonObject;
 import com.massivecraft.mcore.xlib.gson.JsonPrimitive;
+import com.massivecraft.mcore.xlib.gson.internal.LazilyParsedNumber;
 import com.massivecraft.mcore.xlib.mongodb.BasicDBList;
 import com.massivecraft.mcore.xlib.mongodb.BasicDBObject;
 import com.massivecraft.mcore.xlib.mongodb.DBObject;
@@ -88,9 +89,42 @@ public final class MongoGsonConverter
 	{
 		if (inElement.isJsonNull()) return null;
 		JsonPrimitive in = inElement.getAsJsonPrimitive();
-		if (in.isBoolean()) return in.getAsBoolean();
-		if (in.isNumber()) return in.getAsNumber().doubleValue();
-		if (in.isString()) return in.getAsString();
+		
+		if (in.isBoolean())
+		{
+			return in.getAsBoolean();
+		}
+		
+		if (in.isNumber())
+		{
+			Number number = in.getAsNumber();
+			boolean floating;
+			
+			if (number instanceof LazilyParsedNumber)
+			{
+				floating = StringUtils.contains(number.toString(), '.');
+			}
+			else
+			{
+				floating = (number instanceof Double || number instanceof Float);
+			}
+			
+			if (floating)
+			{
+				return number.doubleValue();
+			}
+			else
+			{
+				return number.longValue();
+			}
+			
+		}
+		
+		if (in.isString())
+		{
+			return in.getAsString();
+		}
+		
 		throw new IllegalArgumentException("Unsupported value type for: " + in);
 	}