mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Code cleanup - move old iterator/while loops to for loops
This commit is contained in:
1 parent
0c4fc4eea3
commit
63e9f603ec
25 files changed
+360
-524
No files matched your search
@@ -3,9 +3,9 @@ package com.avaje.ebeaninternal.server.deploy;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
@@ -603,9 +603,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
|
||||
|
||||
if (isEmbedded()) {
|
||||
// initialise all the properties
|
||||
Iterator<BeanProperty> it = propertiesAll();
|
||||
while (it.hasNext()) {
|
||||
BeanProperty prop = it.next();
|
||||
for (BeanProperty prop : propertiesAll()) {
|
||||
prop.initialise();
|
||||
}
|
||||
} else {
|
||||
@@ -623,9 +621,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
|
||||
|
||||
if (!isEmbedded()) {
|
||||
// initialise all the non-id properties
|
||||
Iterator<BeanProperty> it = propertiesAll();
|
||||
while (it.hasNext()) {
|
||||
BeanProperty prop = it.next();
|
||||
for (BeanProperty prop : propertiesAll()) {
|
||||
if (!prop.isId()) {
|
||||
prop.initialise();
|
||||
}
|
||||
@@ -1028,9 +1024,7 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
|
||||
* Reset the statistics on all the query plans.
|
||||
*/
|
||||
public void clearQueryStatistics() {
|
||||
Iterator<CQueryPlan> it = queryPlanCache.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
CQueryPlan queryPlan = (CQueryPlan) it.next();
|
||||
for (CQueryPlan queryPlan : queryPlanCache.values()) {
|
||||
queryPlan.resetStatistics();
|
||||
}
|
||||
}
|
||||
@@ -1046,13 +1040,6 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the query plans for this BeanDescriptor.
|
||||
*/
|
||||
public Iterator<CQueryPlan> queryPlans() {
|
||||
return queryPlanCache.values().iterator();
|
||||
}
|
||||
|
||||
public CQueryPlan getQueryPlan(HashQueryPlan key) {
|
||||
return queryPlanCache.get(key);
|
||||
}
|
||||
@@ -1854,10 +1841,10 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
|
||||
}
|
||||
|
||||
/**
|
||||
* Return an Iterator of all BeanProperty. This includes transient properties.
|
||||
* Return a collection of all BeanProperty. This includes transient properties.
|
||||
*/
|
||||
public Iterator<BeanProperty> propertiesAll() {
|
||||
return propMap.values().iterator();
|
||||
public Collection<BeanProperty> propertiesAll() {
|
||||
return propMap.values();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -8,7 +8,6 @@ import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -512,9 +511,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
*/
|
||||
private void readEntityBeanTable() {
|
||||
|
||||
Iterator<DeployBeanInfo<?>> it = deplyInfoMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanInfo<?> info = it.next();
|
||||
for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
|
||||
BeanTable beanTable = createBeanTable(info);
|
||||
beanTableMap.put(beanTable.getBeanType(), beanTable);
|
||||
}
|
||||
@@ -528,18 +525,14 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
*/
|
||||
private void readEntityDeploymentAssociations() {
|
||||
|
||||
Iterator<DeployBeanInfo<?>> it = deplyInfoMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanInfo<?> info = it.next();
|
||||
for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
|
||||
readDeployAssociations(info);
|
||||
}
|
||||
}
|
||||
|
||||
private void readInheritedIdGenerators() {
|
||||
|
||||
Iterator<DeployBeanInfo<?>> it = deplyInfoMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanInfo<?> info = it.next();
|
||||
for (DeployBeanInfo<?> info : deplyInfoMap.values()) {
|
||||
DeployBeanDescriptor<?> descriptor = info.getDescriptor();
|
||||
InheritInfo inheritInfo = descriptor.getInheritInfo();
|
||||
if (inheritInfo != null && !inheritInfo.isRoot()) {
|
||||
@@ -615,10 +608,10 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
* @param info the new inheritance info
|
||||
*/
|
||||
private void setInheritanceInfo(DeployBeanInfo<?> info) {
|
||||
|
||||
for (DeployBeanPropertyAssocOne<?> oneProp : info.getDescriptor().propertiesAssocOne()) {
|
||||
if (!oneProp.isTransient()) {
|
||||
DeployBeanInfo<?> assoc = deplyInfoMap.get(oneProp.getTargetType());
|
||||
|
||||
if (assoc != null){
|
||||
oneProp.getTableJoin().setInheritInfo(assoc.getDescriptor().getInheritInfo());
|
||||
}
|
||||
@@ -628,7 +621,6 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
for (DeployBeanPropertyAssocMany<?> manyProp : info.getDescriptor().propertiesAssocMany()) {
|
||||
if (!manyProp.isTransient()) {
|
||||
DeployBeanInfo<?> assoc = deplyInfoMap.get(manyProp.getTargetType());
|
||||
|
||||
if (assoc != null){
|
||||
manyProp.getTableJoin().setInheritInfo(assoc.getDescriptor().getInheritInfo());
|
||||
}
|
||||
@@ -757,9 +749,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
|
||||
String searchName = name.substring(0, p).toLowerCase();
|
||||
|
||||
// search for this in the possible matches
|
||||
Iterator<String> it = matchSet.iterator();
|
||||
while (it.hasNext()) {
|
||||
String possibleMappedBy = it.next();
|
||||
for (String possibleMappedBy : matchSet) {
|
||||
String possibleLower = possibleMappedBy.toLowerCase();
|
||||
if (possibleLower.indexOf(searchName) > -1) {
|
||||
// we have a match..
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.deploy;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import javax.persistence.PersistenceException;
|
||||
@@ -806,12 +805,8 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
|
||||
private BeanProperty initMapKeyProperty() {
|
||||
|
||||
// search for the property
|
||||
|
||||
BeanDescriptor<?> targetDesc = getTargetDescriptor();
|
||||
|
||||
Iterator<BeanProperty> it = targetDesc.propertiesAll();
|
||||
while (it.hasNext()){
|
||||
BeanProperty prop = it.next();
|
||||
for (BeanProperty prop : targetDesc.propertiesAll()) {
|
||||
if (mapKey.equalsIgnoreCase(prop.getName())) {
|
||||
return prop;
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
package com.avaje.ebeaninternal.server.deploy;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import com.avaje.ebean.EbeanServer;
|
||||
import com.avaje.ebean.SqlUpdate;
|
||||
@@ -15,129 +13,113 @@ import com.avaje.ebeaninternal.util.DefaultExpressionRequest;
|
||||
|
||||
public class IntersectionRow {
|
||||
|
||||
private final String tableName;
|
||||
private final String tableName;
|
||||
|
||||
private final LinkedHashMap<String,Object> values = new LinkedHashMap<String,Object>();
|
||||
private final LinkedHashMap<String, Object> values = new LinkedHashMap<String, Object>();
|
||||
|
||||
private ArrayList<Object> excludeIds;
|
||||
private BeanDescriptor<?> excludeDescriptor;
|
||||
private ArrayList<Object> excludeIds;
|
||||
private BeanDescriptor<?> excludeDescriptor;
|
||||
|
||||
public IntersectionRow(String tableName){
|
||||
this.tableName = tableName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Id's to exclude. This is for deleting non-attached detail Id's.
|
||||
*/
|
||||
public void setExcludeIds(ArrayList<Object> excludeIds, BeanDescriptor<?> excludeDescriptor){
|
||||
this.excludeIds = excludeIds;
|
||||
this.excludeDescriptor = excludeDescriptor;
|
||||
}
|
||||
public IntersectionRow(String tableName) {
|
||||
this.tableName = tableName;
|
||||
}
|
||||
|
||||
public void put(String key, Object value){
|
||||
values.put(key, value);
|
||||
}
|
||||
/**
|
||||
* Set Id's to exclude. This is for deleting non-attached detail Id's.
|
||||
*/
|
||||
public void setExcludeIds(ArrayList<Object> excludeIds, BeanDescriptor<?> excludeDescriptor) {
|
||||
this.excludeIds = excludeIds;
|
||||
this.excludeDescriptor = excludeDescriptor;
|
||||
}
|
||||
|
||||
public void put(String key, Object value) {
|
||||
values.put(key, value);
|
||||
}
|
||||
|
||||
|
||||
public SqlUpdate createInsert(EbeanServer server){
|
||||
public SqlUpdate createInsert(EbeanServer server) {
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("insert into ").append(tableName).append(" (");
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("insert into ").append(tableName).append(" (");
|
||||
|
||||
int count = 0;
|
||||
Iterator<Entry<String, Object>> it = values.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
if (count++ > 0){
|
||||
sb.append(", ");
|
||||
}
|
||||
|
||||
Map.Entry<String, Object> entry = it.next();
|
||||
sb.append(entry.getKey());
|
||||
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
|
||||
sb.append(") values (");
|
||||
for (int i = 0; i < count; i++) {
|
||||
if (i > 0){
|
||||
sb.append(", ");
|
||||
}
|
||||
sb.append("?");
|
||||
}
|
||||
sb.append(")");
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
}
|
||||
|
||||
public SqlUpdate createDelete(EbeanServer server){
|
||||
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("delete from ").append(tableName).append(" where ");
|
||||
|
||||
int count = 0;
|
||||
Iterator<Entry<String, Object>> it = values.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
if (count++ > 0){
|
||||
sb.append(" and ");
|
||||
}
|
||||
|
||||
Map.Entry<String, Object> entry = it.next();
|
||||
|
||||
sb.append(entry.getKey());
|
||||
sb.append(" = ?");
|
||||
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
if (excludeIds != null){
|
||||
IdInExpression idIn = new IdInExpression(excludeIds);
|
||||
|
||||
DefaultExpressionRequest er = new DefaultExpressionRequest(excludeDescriptor);
|
||||
idIn.addSqlNoAlias(er);
|
||||
idIn.addBindValues(er);
|
||||
|
||||
sb.append(" and not ( ");
|
||||
sb.append(er.getSql());
|
||||
sb.append(" ) ");
|
||||
|
||||
ArrayList<Object> bindValues = er.getBindValues();
|
||||
for (int i = 0; i < bindValues.size(); i++) {
|
||||
bindParams.setParameter(++count, bindValues.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
}
|
||||
|
||||
public SqlUpdate createDeleteChildren(EbeanServer server) {
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("delete from ").append(tableName).append(" where ");
|
||||
|
||||
int count = 0;
|
||||
Iterator<Entry<String, Object>> it = values.entrySet().iterator();
|
||||
while (it.hasNext()) {
|
||||
if (count++ > 0) {
|
||||
sb.append(" and ");
|
||||
}
|
||||
|
||||
Map.Entry<String, Object> entry = it.next();
|
||||
|
||||
sb.append(entry.getKey());
|
||||
sb.append(" = ?");
|
||||
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
int count = 0;
|
||||
for (Map.Entry<String, Object> entry : values.entrySet()) {
|
||||
if (count++ > 0) {
|
||||
sb.append(", ");
|
||||
}
|
||||
sb.append(entry.getKey());
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
|
||||
sb.append(") values (");
|
||||
for (int i = 0; i < count; i++) {
|
||||
if (i > 0) {
|
||||
sb.append(", ");
|
||||
}
|
||||
sb.append("?");
|
||||
}
|
||||
sb.append(")");
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
}
|
||||
|
||||
public SqlUpdate createDelete(EbeanServer server) {
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("delete from ").append(tableName).append(" where ");
|
||||
|
||||
int count = 0;
|
||||
for (Map.Entry<String, Object> entry : values.entrySet()) {
|
||||
if (count++ > 0) {
|
||||
sb.append(" and ");
|
||||
}
|
||||
sb.append(entry.getKey());
|
||||
sb.append(" = ?");
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
|
||||
if (excludeIds != null) {
|
||||
IdInExpression idIn = new IdInExpression(excludeIds);
|
||||
|
||||
DefaultExpressionRequest er = new DefaultExpressionRequest(excludeDescriptor);
|
||||
idIn.addSqlNoAlias(er);
|
||||
idIn.addBindValues(er);
|
||||
|
||||
sb.append(" and not ( ");
|
||||
sb.append(er.getSql());
|
||||
sb.append(" ) ");
|
||||
|
||||
ArrayList<Object> bindValues = er.getBindValues();
|
||||
for (int i = 0; i < bindValues.size(); i++) {
|
||||
bindParams.setParameter(++count, bindValues.get(i));
|
||||
}
|
||||
}
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
}
|
||||
|
||||
public SqlUpdate createDeleteChildren(EbeanServer server) {
|
||||
|
||||
BindParams bindParams = new BindParams();
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
sb.append("delete from ").append(tableName).append(" where ");
|
||||
|
||||
int count = 0;
|
||||
for (Map.Entry<String, Object> entry : values.entrySet()) {
|
||||
if (count++ > 0) {
|
||||
sb.append(" and ");
|
||||
}
|
||||
|
||||
sb.append(entry.getKey());
|
||||
sb.append(" = ?");
|
||||
|
||||
bindParams.setParameter(count, entry.getValue());
|
||||
}
|
||||
|
||||
return new DefaultSqlUpdate(server, sb.toString(), bindParams);
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
@@ -229,9 +228,7 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
boolean missingMethods = false;
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (!prop.isTransient()) {
|
||||
String m = "";
|
||||
if (prop.getReadMethod() == null) {
|
||||
@@ -722,9 +719,7 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
boolean hasLazyFetch = false;
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop.isTransient()) {
|
||||
// ignore transient props etc
|
||||
} else if (prop instanceof DeployBeanPropertyAssocMany<?>) {
|
||||
@@ -797,9 +792,7 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
ArrayList<DeployBeanProperty> list = new ArrayList<DeployBeanProperty>(2);
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop.isId()) {
|
||||
list.add(prop);
|
||||
}
|
||||
@@ -828,9 +821,7 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
ArrayList<DeployBeanPropertyAssocOne<?>> list = new ArrayList<DeployBeanPropertyAssocOne<?>>();
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop instanceof DeployBeanPropertyAssocOne<?>) {
|
||||
if (!prop.isEmbedded()) {
|
||||
list.add((DeployBeanPropertyAssocOne<?>) prop);
|
||||
@@ -849,9 +840,7 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
ArrayList<DeployBeanPropertyAssocMany<?>> list = new ArrayList<DeployBeanPropertyAssocMany<?>>();
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop instanceof DeployBeanPropertyAssocMany<?>) {
|
||||
list.add((DeployBeanPropertyAssocMany<?>) prop);
|
||||
}
|
||||
@@ -869,13 +858,8 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
ArrayList<DeployBeanProperty> list = new ArrayList<DeployBeanProperty>();
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
|
||||
if (prop instanceof DeployBeanPropertyAssoc<?>) {
|
||||
|
||||
} else {
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop instanceof DeployBeanPropertyAssoc<?> == false) {
|
||||
if (!prop.isId() && prop.isVersionColumn()) {
|
||||
list.add(prop);
|
||||
}
|
||||
@@ -892,13 +876,8 @@ public class DeployBeanDescriptor<T> {
|
||||
|
||||
ArrayList<DeployBeanProperty> list = new ArrayList<DeployBeanProperty>();
|
||||
|
||||
Iterator<DeployBeanProperty> it = propMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployBeanProperty prop = it.next();
|
||||
|
||||
if (prop instanceof DeployBeanPropertyAssoc<?>) {
|
||||
|
||||
} else {
|
||||
for (DeployBeanProperty prop : propMap.values()) {
|
||||
if (prop instanceof DeployBeanPropertyAssoc<?> == false) {
|
||||
if (!prop.isId()) {
|
||||
list.add(prop);
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.deploy.parse;
|
||||
|
||||
import java.lang.annotation.Annotation;
|
||||
import java.sql.Types;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -51,9 +50,7 @@ public class DeployInherit {
|
||||
private void findInheritClasses(List<Class<?>> entityList) {
|
||||
|
||||
// go through each class and initialise the info object...
|
||||
Iterator<Class<?>> it = entityList.iterator();
|
||||
while (it.hasNext()) {
|
||||
Class<?> cls = (Class<?>) it.next();
|
||||
for (Class<?> cls : entityList) {
|
||||
if (isInheritanceClass(cls)) {
|
||||
DeployInheritInfo info = createInfo(cls);
|
||||
deployMap.put(cls, info);
|
||||
@@ -62,9 +59,8 @@ public class DeployInherit {
|
||||
}
|
||||
|
||||
private void buildDeployTree() {
|
||||
Iterator<DeployInheritInfo> it = deployMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployInheritInfo info = it.next();
|
||||
|
||||
for (DeployInheritInfo info : deployMap.values()) {
|
||||
if (!info.isRoot()) {
|
||||
DeployInheritInfo parent = getInfo(info.getParent());
|
||||
parent.addChild(info);
|
||||
@@ -74,19 +70,15 @@ public class DeployInherit {
|
||||
|
||||
private void buildFinalTree() {
|
||||
|
||||
Iterator<DeployInheritInfo> it = deployMap.values().iterator();
|
||||
while (it.hasNext()) {
|
||||
DeployInheritInfo deploy = it.next();
|
||||
for (DeployInheritInfo deploy : deployMap.values()) {
|
||||
if (deploy.isRoot()) {
|
||||
// build tree top down...
|
||||
createFinalInfo(null, null, deploy);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private InheritInfo createFinalInfo(InheritInfo root, InheritInfo parent,
|
||||
DeployInheritInfo deploy) {
|
||||
private InheritInfo createFinalInfo(InheritInfo root, InheritInfo parent, DeployInheritInfo deploy) {
|
||||
|
||||
InheritInfo node = new InheritInfo(root, parent, deploy);
|
||||
if (parent != null) {
|
||||
@@ -99,12 +91,7 @@ public class DeployInherit {
|
||||
}
|
||||
|
||||
// buildFinalChildren(root, child, deploy);
|
||||
|
||||
Iterator<DeployInheritInfo> it = deploy.children();
|
||||
|
||||
while (it.hasNext()) {
|
||||
DeployInheritInfo childDeploy = it.next();
|
||||
|
||||
for (DeployInheritInfo childDeploy : deploy.children()) {
|
||||
createFinalInfo(root, node, childDeploy);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.deploy.parse;
|
||||
|
||||
import java.sql.Types;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
|
||||
import com.avaje.ebeaninternal.server.deploy.InheritInfo;
|
||||
@@ -80,8 +79,8 @@ public class DeployInheritInfo {
|
||||
/**
|
||||
* Return the child nodes.
|
||||
*/
|
||||
public Iterator<DeployInheritInfo> children() {
|
||||
return children.iterator();
|
||||
public List<DeployInheritInfo> children() {
|
||||
return children;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user