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

Fixes JIRA issue SGF-290 handling custom OQL statements specified with an @Query annotated Repository method that returns neither a Collection nor a Entity-based result, such as the case with SELECT count(*) FROM /Region ... based queries returning an Integer count.

Browse Source
This commit is contained in:
John Blum
2014-06-16 20:01:34 -07:00
parent 33437c23e0
commit 1920ce4ba1
4 changed files with 73 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/org/springframework/data/gemfire/repository/query/StringBasedGemfireRepositoryQuery.java
View File

@@ -19,6 +19,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import com.gemstone.gemfire.cache.query.SelectResults;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.repository.query.ParametersParameterAccessor;
@@ -26,9 +28,6 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.internal.ResultsBag;
/**
* {@link GemfireRepositoryQuery} using plain {@link String} based OQL queries.
* <p>
@@ -111,51 +110,61 @@ public class StringBasedGemfireRepositoryQuery extends GemfireRepositoryQuery {
*/
@Override
public Object execute(Object[] parameters) {
ParametersParameterAccessor accessor = new ParametersParameterAccessor(method.getParameters(), parameters);
ParametersParameterAccessor parameterAccessor = new ParametersParameterAccessor(method.getParameters(), parameters);
QueryString query = (isUserDefinedQuery() ? this.query :
this.query.forRegion(method.getEntityInformation().getJavaType(), template.getRegion()));
QueryString query = (isUserDefinedQuery() ? this.query : this.query.forRegion(
method.getEntityInformation().getJavaType(), template.getRegion()));
for (Integer index : query.getInParameterIndexes()) {
query = query.bindIn(toCollection(accessor.getBindableValue(index - 1)));
query = query.bindIn(toCollection(parameterAccessor.getBindableValue(index - 1)));
}
Collection<?> result = toCollection(template.find(query.toString(), parameters));
if (method.isCollectionQuery()) {
return result;
} else if (method.isQueryForEntity()) {
if (result.isEmpty()) {
return null;
} else if (result.size() == 1) {
return result.iterator().next();
} else {
throw new IncorrectResultSizeDataAccessException(1, result.size());
}
} else {
throw new IllegalStateException("Unsupported query: " + query.toString());
}
}
if (method.isCollectionQuery()) {
return result;
}
else if (method.isQueryForEntity()) {
if (result.isEmpty()) {
return null;
}
else if (result.size() == 1) {
return result.iterator().next();
}
else {
throw new IncorrectResultSizeDataAccessException(1, result.size());
}
}
else if (isSingleResultNonEntityQuery(method, result)) {
return result.iterator().next();
}
else {
throw new IllegalStateException("Unsupported query: " + query.toString());
}
}
/**
boolean isSingleResultNonEntityQuery(final GemfireQueryMethod method, final Collection<?> result) {
return (!method.isCollectionQuery() && method.getReturnedObjectType() != null
&& !Void.TYPE.equals(method.getReturnedObjectType()) && result != null && result.size() == 1);
}
/**
* Returns the given object as a Collection. Collections will be returned as is, Arrays will be converted into a
* Collection and all other objects will be wrapped into a single-element Collection.
* <p/>
*
* @param source the resulting object from the GemFire Query.
* @return the querying resulting object as a Collection.
* @see java.util.Arrays#asList(Object[])
* @see java.util.Collection
* @see org.springframework.util.CollectionUtils#arrayToList(Object)
* @see com.gemstone.gemfire.cache.query.SelectResults
*/
Collection<?> toCollection(Object source) {
Collection<?> toCollection(final Object source) {
if (source instanceof SelectResults) {
return ((SelectResults) source).asList();
}
if (source instanceof ResultsBag) {
return ((ResultsBag) source).asList();
}
if (source instanceof Collection) {
return (Collection<?>) source;
}