Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAMONGO-2410 - Polishing.

Browse Source 
Simplify cast. Extend test with DBObject interface.

Original pull request: #813.
This commit is contained in:
Mark Paluch
2019-12-04 08:56:20 +01:00
parent 11baf455d2
commit c342bf266e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
View File

@@ -225,7 +225,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
return (S) new BasicDBObject((Document) bson);
}
return (S) DBObject.class.cast(bson);
return (S) bson;
}
if (typeToUse.isCollectionLike() && bson instanceof List) {

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
View File

@@ -48,6 +48,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.ConversionNotSupportedException;
import org.springframework.beans.factory.annotation.Value;
@@ -85,6 +86,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import com.mongodb.BasicDBList;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.DBRef;
/**
@@ -1932,6 +1934,8 @@ public class MappingMongoConverterUnitTests {
assertThat(converter.read(BasicDBObject.class, new org.bson.Document("property", "value")))
.isEqualTo(new BasicDBObject("property", "value"));
assertThat(converter.read(DBObject.class, new org.bson.Document("property", "value")))
.isEqualTo(new BasicDBObject("property", "value"));
}
static class GenericType<T> {
@@ -1955,7 +1959,7 @@ public class MappingMongoConverterUnitTests {
@Override
void method() {
}
}
};
abstract void method();