mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1729 - Open projections don't get field restrictions applied.

Browse Source 
We now only apply a field restriction if the projection used for a query is closed.
This commit is contained in:
Oliver Gierke
2017-07-03 22:04:16 +02:00
parent 6568fa2d2e
commit 028aeb327f
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java
View File

@@ -100,7 +100,7 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
ReturnedType returnedType = processor.withDynamicProjection(accessor).getReturnedType(); ReturnedType returnedType = processor.withDynamicProjection(accessor).getReturnedType();
if (returnedType.isProjecting()) { if (returnedType.needsCustomConstruction()) {
Field fields = query.fields(); Field fields = query.fields();

19
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java
View File

@@ -31,6 +31,7 @@ import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.MongoDbFactory;
import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.convert.DbRefResolver; import org.springframework.data.mongodb.core.convert.DbRefResolver;
@@ -172,6 +173,14 @@ public class PartTreeMongoQueryUnitTests {
assertThat(query.getFieldsObject().get("firstname"), is((Object) 1)); assertThat(query.getFieldsObject().get("firstname"), is((Object) 1));
} }
@Test // DATAMONGO-1729
public void doesNotCreateFieldsObjectForOpenProjection() {
org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findAllBy");
assertThat(query.getFieldsObject(), is(nullValue()));
}
private org.springframework.data.mongodb.core.query.Query deriveQueryFromMethod(String method, Object... args) { private org.springframework.data.mongodb.core.query.Query deriveQueryFromMethod(String method, Object... args) {
Class<?>[] types = new Class<?>[args.length]; Class<?>[] types = new Class<?>[args.length];
@@ -232,6 +241,8 @@ public class PartTreeMongoQueryUnitTests {
@Query(fields = "{ 'firstname' : 1 }") @Query(fields = "{ 'firstname' : 1 }")
List<Person> findBySex(Sex sex); List<Person> findBySex(Sex sex);
OpenProjection findAllBy();
} }
interface PersonProjection { interface PersonProjection {
@@ -256,4 +267,12 @@ public class PartTreeMongoQueryUnitTests {
this.lastname = lastname; this.lastname = lastname;
} }
} }
interface OpenProjection {
String getFirstname();
@Value("#{target.firstname + ' ' + target.lastname}")
String getFullname();
}
} }