github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1612 - query.setMapKey("customer.id") throws NullPointerException (ie. mapKey is a path rather than local property)

Browse Source
This commit is contained in:
rob bygrave
2019-01-21 21:57:30 +13:00
parent ab48f796c6
commit 4a0806e453
5 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/deploy/BeanCollectionHelpFactory.java
+11 -6
View File
@@ -2,6 +2,8 @@ package io.ebeaninternal.server.deploy;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.server.core.OrmQueryRequest;
import io.ebeaninternal.server.el.ElPropertyValue;
import io.ebeaninternal.server.query.CQueryCollectionAdd;
/**
@@ -10,10 +12,10 @@ import io.ebeaninternal.server.core.OrmQueryRequest;
public class BeanCollectionHelpFactory {
@SuppressWarnings("rawtypes")
static final BeanListHelp LIST_HELP = new BeanListHelp();
private static final BeanListHelp LIST_HELP = new BeanListHelp();
@SuppressWarnings("rawtypes")
static final BeanSetHelp SET_HELP = new BeanSetHelp();
private static final BeanSetHelp SET_HELP = new BeanSetHelp();
/**
* Create the helper based on the many property.
@@ -36,7 +38,7 @@ public class BeanCollectionHelpFactory {
}
@SuppressWarnings("unchecked")
public static <T> BeanCollectionHelp<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
public static <T> CQueryCollectionAdd<T> create(SpiQuery.Type manyType, OrmQueryRequest<T> request) {
if (manyType == SpiQuery.Type.LIST) {
return LIST_HELP;
@@ -44,10 +46,13 @@ public class BeanCollectionHelpFactory {
} else if (manyType == SpiQuery.Type.SET) {
return SET_HELP;
} else {
} else if (manyType == SpiQuery.Type.MAP) {
BeanDescriptor<T> target = request.getBeanDescriptor();
String mapKey = request.getQuery().getMapKey();
return new BeanMapHelp<>(target, mapKey);
ElPropertyValue elProperty = target.getElGetValue(request.getQuery().getMapKey());
return new BeanMapQueryHelp<>(elProperty);
} else {
return null;
}
}