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

DATAJPA-920 - Polishing.

Browse Source 
Formatting and a bit of JavaDoc polish in JpaQueryCreator.

Original pull request: #176.
This commit is contained in:
Oliver Gierke
2016-12-01 20:01:48 +01:00
parent e07e53e556
commit 96c1251544
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
View File

@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -62,10 +61,10 @@ public class JpaQueryCreator extends AbstractQueryCreator<CriteriaQuery<? extend
/**
* Create a new {@link JpaQueryCreator}.
*
* @param tree
* @param domainClass
* @param accessor
* @param em
* @param tree must not be {@literal null}.
* @param type must not be {@literal null}.
* @param builder must not be {@literal null}.
* @param provider must not be {@literal null}.
*/
public JpaQueryCreator(PartTree tree, ReturnedType type, CriteriaBuilder builder,
ParameterMetadataProvider provider) {
@@ -93,7 +92,8 @@ public class JpaQueryCreator extends AbstractQueryCreator<CriteriaQuery<? extend
Class<?> typeToRead = type.getTypeToRead();
return (typeToRead == null || tree.isExistsProjection()) ? builder.createTupleQuery() : builder.createQuery(typeToRead);
return typeToRead == null || tree.isExistsProjection() ? builder.createTupleQuery()
: builder.createQuery(typeToRead);
}
/**
@@ -168,24 +168,26 @@ public class JpaQueryCreator extends AbstractQueryCreator<CriteriaQuery<? extend
}
query = query.multiselect(selections);
} else if (tree.isExistsProjection()) {
if (root.getModel().hasSingleIdAttribute()) {
SingularAttribute<?, ?> id = root.getModel().getId(root.getModel().getIdType().getJavaType());
query = query.multiselect(root.get((SingularAttribute) id).alias(id.getName()));
} else {
List<Selection<?>> selections = new ArrayList<Selection<?>>();
Set<SingularAttribute<?, ?>> idClassAttributes = (Set<SingularAttribute<?, ?>>) root.getModel().getIdClassAttributes();
for (SingularAttribute<?, ?> attribute : idClassAttributes) {
for (SingularAttribute<?, ?> attribute : root.getModel().getIdClassAttributes()) {
selections.add(root.get((SingularAttribute) attribute).alias(attribute.getName()));
}
selections.add(root.get((SingularAttribute) id).alias(id.getName()));
query = query.multiselect(selections);
}
} else {
query = query.select((Root) root);
}