mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Remove Subclassing/Dynamic Proxy support - beans must be enhanced
This commit is contained in:
1 parent
66880aa340
commit
2567022d95
63 files changed
+233
-2085
No files matched your search
@@ -317,13 +317,6 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
|
||||
return queryMode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if we want to return vanilla (not enhanced) objects.
|
||||
*/
|
||||
public boolean isVanillaMode() {
|
||||
return request.isVanillaMode();
|
||||
}
|
||||
|
||||
public CQueryPredicates getPredicates() {
|
||||
return predicates;
|
||||
}
|
||||
@@ -586,11 +579,11 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
|
||||
currentDetailCollection = manyPropertyEl.elGetValue(loadedBean);
|
||||
} else {
|
||||
// create a new collection to populate and assign to the bean
|
||||
currentDetailCollection = manyProperty.createEmpty(request.isVanillaMode());
|
||||
currentDetailCollection = manyProperty.createEmpty(false);
|
||||
manyPropertyEl.elSetValue(loadedBean, currentDetailCollection, false, false);
|
||||
}
|
||||
|
||||
if (filterMany != null && !request.isVanillaMode()) {
|
||||
if (filterMany != null) {
|
||||
// remember the for use with a refresh
|
||||
((BeanCollection<?>) currentDetailCollection).setFilterMany(filterMany);
|
||||
}
|
||||
|
||||
@@ -263,10 +263,6 @@ public class CQueryFetchIds {
|
||||
return dataReader;
|
||||
}
|
||||
|
||||
public boolean isVanillaMode() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public Boolean isReadOnly() {
|
||||
return Boolean.FALSE;
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
|
||||
localType = null;
|
||||
localDesc = desc;
|
||||
} else {
|
||||
localBean = localInfo.createBean(ctx.isVanillaMode());
|
||||
localBean = localInfo.createBean();
|
||||
localType = localInfo.getType();
|
||||
localIdBinder = localInfo.getIdBinder();
|
||||
localDesc = localInfo.getBeanDescriptor();
|
||||
@@ -205,7 +205,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
|
||||
} else {
|
||||
localType = null;
|
||||
localDesc = desc;
|
||||
localBean = desc.createBean(ctx.isVanillaMode());
|
||||
localBean = desc.createBean();
|
||||
localIdBinder = idBinder;
|
||||
}
|
||||
|
||||
@@ -295,11 +295,7 @@ public class SqlTreeNodeBean implements SqlTreeNode {
|
||||
} else if (localBean != null) {
|
||||
|
||||
ctx.setCurrentPrefix(prefix, pathMap);
|
||||
if (!ctx.isVanillaMode()) {
|
||||
// only create lazy loading collection proxies
|
||||
// when not in vanilla mode
|
||||
createListProxies(localDesc, ctx, localBean);
|
||||
}
|
||||
createListProxies(localDesc, ctx, localBean);
|
||||
|
||||
localDesc.postLoad(localBean, includedProps);
|
||||
|
||||
|
||||
Reference in new issue
Block a user