DATAMONGO-479 - Assert MongoDB Java driver generation 3 compatibility.

Since the toString representation of o.b.t.Code changed we need to reflectively read the value in order to get its proper String representation. This works fine for MongoDB Java driver versions 2 and 3.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java

@@ -22,6 +22,7 @@
 
 import org.bson.types.Code;
 import org.bson.types.ObjectId;
+import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.Converter;
@@ -202,7 +203,7 @@ public CallableMongoScript convert(DBObject source) {
 			String id = source.get("_id").toString();
 			Object rawValue = source.get("value");
 
-			return new CallableMongoScript(id, rawValue.toString());
+			return new CallableMongoScript(id, new DirectFieldAccessor(rawValue).getPropertyValue("code").toString());
 		}
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CallableMongoScriptConvertsUnitTests.java

@@ -27,6 +27,7 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 import org.springframework.data.mongodb.core.convert.CallableMongoScriptConvertsUnitTests.CallableMongoScriptToDboConverterUnitTests;
+import org.springframework.data.mongodb.core.convert.CallableMongoScriptConvertsUnitTests.DboToCallableMongoScriptConverterUnitTests;
 import org.springframework.data.mongodb.core.convert.MongoConverters.CallableMongoScriptToDBObjectConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.DBObjectToCallableMongoScriptCoverter;
 import org.springframework.data.mongodb.core.script.CallableMongoScript;
@@ -39,7 +40,7 @@
  * @author Christoph Strobl
  */
 @RunWith(Suite.class)
-@SuiteClasses({ CallableMongoScriptToDboConverterUnitTests.class })
+@SuiteClasses({ CallableMongoScriptToDboConverterUnitTests.class, DboToCallableMongoScriptConverterUnitTests.class })
 public class CallableMongoScriptConvertsUnitTests {
 
 	static final String FUNCTION_NAME = "echo";
@@ -86,7 +87,7 @@ public void convertShouldConvertScriptCodeCorreclty() {
 
 			Object code = dbo.get("value");
 			assertThat(code, instanceOf(Code.class));
-			assertThat(code.toString(), equalTo(JS_FUNCTION));
+			assertThat(code, equalTo((Object) new Code(JS_FUNCTION)));
 		}
 	}
 
@@ -125,7 +126,7 @@ public void convertShouldConvertScriptValueCorreclty() {
 			CallableMongoScript script = converter.convert(FUNCTION);
 
 			assertThat(script.getCode(), notNullValue());
-			assertThat(script.getCode().toString(), equalTo(JS_FUNCTION));
+			assertThat(script.getCode(), equalTo(JS_FUNCTION));
 		}
 	}