From d24cb07dbbfdc77137d21f593c6c5e7d47f41bda Mon Sep 17 00:00:00 2001 From: Adrian Nistor Date: Thu, 29 Oct 2015 13:23:15 +0200 Subject: [PATCH] Avoid casting in QueryFacadeImpl --- .../infinispan/query/remote/impl/QueryFacadeImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/QueryFacadeImpl.java b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/QueryFacadeImpl.java index e548111992ee..09418308a2dc 100644 --- a/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/QueryFacadeImpl.java +++ b/remote-query/remote-query-server/src/main/java/org/infinispan/query/remote/impl/QueryFacadeImpl.java @@ -10,7 +10,6 @@ import org.infinispan.protostream.WrappedMessage; import org.infinispan.query.Search; import org.infinispan.query.SearchManager; -import org.infinispan.query.dsl.Query; import org.infinispan.query.dsl.impl.BaseQuery; import org.infinispan.query.remote.client.QueryRequest; import org.infinispan.query.remote.client.QueryResponse; @@ -63,7 +62,7 @@ public byte[] query(AdvancedCache cache, byte[] query) { long startOffset = request.getStartOffset() == null ? -1 : request.getStartOffset(); int maxResults = request.getMaxResults() == null ? -1 : request.getMaxResults(); Map namedParameters = getNamedParameters(request); - Query q = queryEngine.buildQuery(null, request.getJpqlString(), namedParameters, startOffset, maxResults); + BaseQuery q = queryEngine.buildQuery(null, request.getJpqlString(), namedParameters, startOffset, maxResults); QueryResponse response = makeResponse(q); return ProtobufUtil.toByteArray(serCtx, response); @@ -84,10 +83,10 @@ private Map getNamedParameters(QueryRequest request) { return params; } - private QueryResponse makeResponse(Query q) { + private QueryResponse makeResponse(BaseQuery q) { List list = q.list(); int numResults = list.size(); - String[] projection = ((BaseQuery) q).getProjection(); + String[] projection = q.getProjection(); int projSize = projection != null ? projection.length : 0; List results = new ArrayList(projSize == 0 ? numResults : numResults * projSize); @@ -96,8 +95,8 @@ private QueryResponse makeResponse(Query q) { results.add(new WrappedMessage(o)); } else { Object[] row = (Object[]) o; - for (int j = 0; j < projSize; j++) { - results.add(new WrappedMessage(row[j])); + for (int i = 0; i < projSize; i++) { + results.add(new WrappedMessage(row[i])); } } }