#803 - Fix generics on findMap() to ... <K> Map<K, T> findMap();

This commit is contained in:
Robin Bygrave committed 2016-08-04 20:23:11 +12:00
1 parent b5b221ffb1
commit 81de83a6e7
14 files changed
+39 -24

No files matched your search

@@ -1134,18 +1134,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
public <T> Map<?, T> findMap(Query<T> query, Transaction t) {
public <K, T> Map<K, T> findMap(Query<T> query, Transaction t) {
SpiOrmQueryRequest request = createQueryRequest(Type.MAP, query, t);
Object result = request.getFromQueryCache();
if (result != null) {
return (Map<?, T>) result;
return (Map<K, T>) result;
}
try {
request.initTransIfRequired();
return (Map<?, T>) request.findMap();
return (Map<K, T>) request.findMap();
} finally {
request.endTransIfRequired();
@@ -1153,6 +1153,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
}
@Override
@SuppressWarnings("unchecked")
public <A> List<A> findSingleAttributeList(Query<?> query, Transaction t) {
SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE, query, t);
@@ -379,7 +379,7 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
}
@Override
public Map<?, T> findMap() {
public <K> Map<K, T> findMap() {
return query.findMap();
}
@@ -64,7 +64,7 @@ public class FilterExpressionList<T> extends DefaultExpressionList<T> {
}
@Override
public Map<?, T> findMap() {
public <K> Map<K, T> findMap() {
return rootQuery.findMap();
}
@@ -391,7 +391,7 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
}
@Override
public Map<?, T> findMap() {
public <K> Map<K, T> findMap() {
return exprList.findMap();
}
@@ -1142,7 +1142,7 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
}
@Override
public Map<?, T> findMap() {
public <K> Map<K, T> findMap() {
return server.findMap(this, null);
}