svn commit: r1467744 [2/2] - in /ofbiz/trunk/framework/entity/
Locked
 
|
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/JdbcValueHandler.java Sun Apr 14 08:16:46 2013 @@ -32,12 +32,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; import java.sql.Types; +import java.util.HashMap; import java.util.Map; import javax.sql.rowset.serial.SerialBlob; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; /** @@ -56,7 +55,7 @@ public abstract class JdbcValueHandler<T for the specified Java type. The JdbcValueHandler instances are initialized with the SQL type recommended by Sun/Oracle. */ - Map<String, JdbcValueHandler<?>> result = FastMap.newInstance(); + Map<String, JdbcValueHandler<?>> result = new HashMap<String, JdbcValueHandler<?>>(); // JDBC 1 result.put("byte[]", new ByteArrayJdbcValueHandler(Types.LONGVARBINARY)); result.put("java.lang.Boolean", new BooleanJdbcValueHandler(Types.BOOLEAN)); @@ -99,7 +98,7 @@ public abstract class JdbcValueHandler<T method must be called with the correct type, or an exception will be thrown. */ - Map<String, Integer> result = FastMap.newInstance(); + Map<String, Integer> result = new HashMap<String, Integer>(); // SQL 99 Data Types result.put("BIT", Types.BIT); result.put("BLOB", Types.BLOB); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java Sun Apr 14 08:16:46 2013 @@ -31,7 +31,9 @@ import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -40,9 +42,6 @@ import java.util.TreeSet; import javax.sql.rowset.serial.SerialBlob; import javax.sql.rowset.serial.SerialClob; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.ObjectType; import org.ofbiz.base.util.UtilGenerics; @@ -58,7 +57,6 @@ import org.ofbiz.entity.condition.Entity import org.ofbiz.entity.condition.EntityOperator; import org.ofbiz.entity.condition.OrderByList; import org.ofbiz.entity.config.DatasourceInfo; -import org.ofbiz.entity.jdbc.JdbcValueHandler; import org.ofbiz.entity.model.ModelEntity; import org.ofbiz.entity.model.ModelField; import org.ofbiz.entity.model.ModelFieldType; @@ -423,9 +421,9 @@ public class SqlJdbcUtil { sql.append(makeFromClause(modelEntity, modelFieldTypeReader, datasourceInfo)); String viewWhereClause = makeViewWhereClause(modelEntity, datasourceInfo.joinStyle); ModelViewEntity modelViewEntity = (ModelViewEntity)modelEntity; - List<EntityCondition> whereConditions = FastList.newInstance(); - List<EntityCondition> havingConditions = FastList.newInstance(); - List<String> orderByList = FastList.newInstance(); + List<EntityCondition> whereConditions = new LinkedList<EntityCondition>(); + List<EntityCondition> havingConditions = new LinkedList<EntityCondition>(); + List<String> orderByList = new LinkedList<String>(); modelViewEntity.populateViewEntityConditionInformation(modelFieldTypeReader, whereConditions, havingConditions, orderByList, null); String viewConditionClause; @@ -897,7 +895,7 @@ public class SqlJdbcUtil { } } - protected static Map<String, Integer> fieldTypeMap = FastMap.newInstance(); + protected static Map<String, Integer> fieldTypeMap = new HashMap<String, Integer>(); static { fieldTypeMap.put("java.lang.String", 1); fieldTypeMap.put("String", 1); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java Sun Apr 14 08:16:46 2013 @@ -23,17 +23,16 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.TimeZone; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.ObjectType; @@ -87,29 +86,30 @@ public class ModelEntity extends ModelIn protected Integer sequenceBankSize = null; /** A List of the Field objects for the Entity */ - protected List<ModelField> fields = FastList.newInstance(); + protected List<ModelField> fields = new LinkedList<ModelField>(); + protected Map<String, ModelField> fieldsMap = null; /** A List of the Field objects for the Entity, one for each Primary Key */ - protected List<ModelField> pks = FastList.newInstance(); + protected List<ModelField> pks = new LinkedList<ModelField>(); /** A List of the Field objects for the Entity, one for each NON Primary Key */ - protected List<ModelField> nopks = FastList.newInstance(); + protected List<ModelField> nopks = new LinkedList<ModelField>(); /** relations defining relationships between this entity and other entities */ - protected List<ModelRelation> relations = FastList.newInstance(); + protected List<ModelRelation> relations = new LinkedList<ModelRelation>(); /** indexes on fields/columns in this entity */ - protected List<ModelIndex> indexes = FastList.newInstance(); + protected List<ModelIndex> indexes = new LinkedList<ModelIndex>(); /** The reference of the dependentOn entity model */ protected ModelEntity specializationOfModelEntity = null; /** The list of entities that are specialization of on this entity */ - protected Map<String, ModelEntity> specializedEntities = FastMap.newInstance(); + protected Map<String, ModelEntity> specializedEntities = new HashMap<String, ModelEntity>(); /** map of ModelViewEntities that references this model */ - protected Set<String> viewEntities = FastSet.newInstance(); + protected Set<String> viewEntities = new HashSet<String>(); /** An indicator to specify if this entity requires locking for updates */ protected boolean doLock = false; @@ -122,6 +122,7 @@ public class ModelEntity extends ModelIn * from cache on read showing a warning messages to that effect */ protected boolean neverCache = false; + protected boolean neverCheck = false; protected boolean autoClearCache = true; @@ -221,8 +222,8 @@ public class ModelEntity extends ModelIn } } - // now that we have the pks and the fields, make the nopks vector - this.nopks = FastList.newInstance(); + // now that we have the pks and the fields, make the nopks List + this.nopks = new LinkedList<ModelField>(); for (ModelField field: this.fields) { if (!field.isPk) this.nopks.add(field); } @@ -508,8 +509,8 @@ public class ModelEntity extends ModelIn } public void updatePkLists() { - pks = FastList.newInstance(); - nopks = FastList.newInstance(); + pks = new LinkedList<ModelField>(); + nopks = new LinkedList<ModelField>(); for (ModelField field: fields) { if (field.isPk) @@ -573,7 +574,7 @@ public class ModelEntity extends ModelIn } public List<ModelField> getNopksCopy() { - List<ModelField> newList = FastList.newInstance(); + List<ModelField> newList = new LinkedList<ModelField>(); newList.addAll(this.nopks); return newList; } @@ -613,7 +614,7 @@ public class ModelEntity extends ModelIn } protected synchronized void createFieldsMap() { - Map<String, ModelField> tempMap = FastMap.newInstance(); + Map<String, ModelField> tempMap = new HashMap<String, ModelField>(); for (int i = 0; i < fields.size(); i++) { ModelField field = fields.get(i); tempMap.put(field.name, field); @@ -685,7 +686,7 @@ public class ModelEntity extends ModelIn } public List<String> getFieldNamesFromFieldVector(List<ModelField> modelFields) { - List<String> nameList = FastList.newInstance(); + List<String> nameList = new LinkedList<String>(); if (modelFields == null || modelFields.size() <= 0) return nameList; for (ModelField field: modelFields) { @@ -698,7 +699,7 @@ public class ModelEntity extends ModelIn * @return field names list, managed by entity-engine */ public List<String> getAutomaticFieldNames() { - List<String> nameList = FastList.newInstance(); + List<String> nameList = new LinkedList<String>(); if (! this.noAutoStamp) { nameList.add(STAMP_FIELD); nameList.add(STAMP_TX_FIELD); @@ -733,7 +734,7 @@ public class ModelEntity extends ModelIn } public List<ModelRelation> getRelationsList(boolean includeOne, boolean includeOneNoFk, boolean includeMany) { - List<ModelRelation> relationsList = FastList.newInstance(); + List<ModelRelation> relationsList = new LinkedList<ModelRelation>(); Iterator<ModelRelation> allIter = this.getRelationsIterator(); while (allIter.hasNext()) { ModelRelation modelRelation = allIter.next(); @@ -1567,14 +1568,14 @@ public class ModelEntity extends ModelIn final boolean useRelationshipNames = false; ModelFieldTypeReader modelFieldTypeReader = ModelFieldTypeReader.getModelFieldTypeReader(helperName); - Map<String, Object> topLevelMap = FastMap.newInstance(); + Map<String, Object> topLevelMap = new HashMap<String, Object>(); topLevelMap.put("name", this.getEntityName()); topLevelMap.put("externalName", this.getTableName(helperName)); topLevelMap.put("className", "EOGenericRecord"); // for classProperties add field names AND relationship names to get a nice, complete chart - List<String> classPropertiesList = FastList.newInstance(); + List<String> classPropertiesList = new LinkedList<String>(); topLevelMap.put("classProperties", classPropertiesList); for (ModelField field: this.fields) { if (field.getIsAutoCreatedInternal()) continue; @@ -1592,14 +1593,14 @@ public class ModelEntity extends ModelIn } // attributes - List<Map<String, Object>> attributesList = FastList.newInstance(); + List<Map<String, Object>> attributesList = new LinkedList<Map<String, Object>>(); topLevelMap.put("attributes", attributesList); for (ModelField field: this.fields) { if (field.getIsAutoCreatedInternal()) continue; ModelFieldType fieldType = modelFieldTypeReader.getModelFieldType(field.getType()); - Map<String, Object> attributeMap = FastMap.newInstance(); + Map<String, Object> attributeMap = new HashMap<String, Object>(); attributesList.add(attributeMap); if (field.getIsPk()) { @@ -1629,19 +1630,19 @@ public class ModelEntity extends ModelIn } // primaryKeyAttributes - List<String> primaryKeyAttributesList = FastList.newInstance(); + List<String> primaryKeyAttributesList = new LinkedList<String>(); topLevelMap.put("primaryKeyAttributes", primaryKeyAttributesList); for (ModelField pkField: this.pks) { primaryKeyAttributesList.add(pkField.getName()); } // relationships - List<Map<String, Object>> relationshipsMapList = FastList.newInstance(); + List<Map<String, Object>> relationshipsMapList = new LinkedList<Map<String, Object>>(); for (ModelRelation relationship: this.relations) { if (entityNameIncludeSet.contains(relationship.getRelEntityName())) { ModelEntity relEntity = entityModelReader.getModelEntity(relationship.getRelEntityName()); - Map<String, Object> relationshipMap = FastMap.newInstance(); + Map<String, Object> relationshipMap = new HashMap<String, Object>(); relationshipsMapList.add(relationshipMap); if (useRelationshipNames || relationship.isAutoRelation()) { @@ -1660,10 +1661,10 @@ public class ModelEntity extends ModelIn relationshipMap.put("joinSemantic", "EOInnerJoin"); - List<Map<String, Object>> joinsMapList = FastList.newInstance(); + List<Map<String, Object>> joinsMapList = new LinkedList<Map<String, Object>>(); relationshipMap.put("joins", joinsMapList); for (ModelKeyMap keyMap: relationship.getKeyMapsClone()) { - Map<String, Object> joinsMap = FastMap.newInstance(); + Map<String, Object> joinsMap = new HashMap<String, Object>(); joinsMapList.add(joinsMap); ModelField thisField = this.getField(keyMap.getFieldName()); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java Sun Apr 14 08:16:46 2013 @@ -19,13 +19,12 @@ package org.ofbiz.entity.model; import java.util.Collection; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeSet; -import javolution.util.FastMap; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.entity.Delegator; @@ -45,7 +44,7 @@ public class ModelEntityChecker { TreeSet<String> reservedWords = new TreeSet<String>(); initReservedWords(reservedWords); - Map<String, TreeSet<String>> packages = FastMap.newInstance(); + Map<String, TreeSet<String>> packages = new HashMap<String, TreeSet<String>>(); TreeSet<String> packageNames = new TreeSet<String>(); TreeSet<String> tableNames = new TreeSet<String>(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldTypeReader.java Sun Apr 14 08:16:46 2013 @@ -20,11 +20,10 @@ package org.ofbiz.entity.model; import java.io.Serializable; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; -import javolution.util.FastMap; - import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.MainResourceHandler; import org.ofbiz.base.config.ResourceHandler; @@ -36,7 +35,6 @@ import org.ofbiz.base.util.cache.UtilCac import org.ofbiz.entity.config.DatasourceInfo; import org.ofbiz.entity.config.EntityConfigUtil; import org.ofbiz.entity.config.FieldTypeInfo; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -52,7 +50,7 @@ public class ModelFieldTypeReader implem protected static Map<String, ModelFieldType> createFieldTypeCache(Element docElement, String location) { docElement.normalize(); - Map<String, ModelFieldType> fieldTypeMap = FastMap.newInstance(); + Map<String, ModelFieldType> fieldTypeMap = new HashMap<String, ModelFieldType>(); List<? extends Element> fieldTypeList = UtilXml.childElementList(docElement, "field-type-def"); for (Element curFieldType: fieldTypeList) { String fieldTypeName = curFieldType.getAttribute("type"); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelGroupReader.java Sun Apr 14 08:16:46 2013 @@ -20,14 +20,13 @@ package org.ofbiz.entity.model; import java.io.Serializable; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastSet; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.MainResourceHandler; @@ -191,7 +190,7 @@ public class ModelGroupReader implements getGroupCache(); if (this.groupNames == null) return null; - Set<String> newSet = FastSet.newInstance(); + Set<String> newSet = new HashSet<String>(); newSet.add(EntityConfigUtil.getDelegatorInfo(delegatorBaseName).defaultGroupName); newSet.addAll(this.groupNames); return newSet; @@ -203,7 +202,7 @@ public class ModelGroupReader implements */ public Set<String> getEntityNamesByGroup(String groupName) { Map<String, String> gc = getGroupCache(); - Set<String> enames = FastSet.newInstance(); + Set<String> enames = new HashSet<String>(); if (groupName == null || groupName.length() <= 0) return enames; if (UtilValidate.isEmpty(gc)) return enames; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelReader.java Sun Apr 14 08:16:46 2013 @@ -21,16 +21,14 @@ package org.ofbiz.entity.model; import java.io.Serializable; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.MainResourceHandler; @@ -100,9 +98,9 @@ public class ModelReader implements Seri private ModelReader(String modelName) throws GenericEntityException { this.modelName = modelName; - entityResourceHandlers = FastList.newInstance(); - resourceHandlerEntities = FastMap.newInstance(); - entityResourceHandlerMap = FastMap.newInstance(); + entityResourceHandlers = new LinkedList<ResourceHandler>(); + resourceHandlerEntities = new HashMap<ResourceHandler, Collection<String>>(); + entityResourceHandlerMap = new HashMap<String, ResourceHandler>(); EntityModelReaderInfo entityModelReaderInfo = EntityConfigUtil.getEntityModelReaderInfo(modelName); @@ -133,7 +131,7 @@ public class ModelReader implements Seri Collection<String> resourceHandlerEntityNames = resourceHandlerEntities.get(entityResourceHandler); if (resourceHandlerEntityNames == null) { - resourceHandlerEntityNames = FastList.newInstance(); + resourceHandlerEntityNames = new LinkedList<String>(); resourceHandlerEntities.put(entityResourceHandler, resourceHandlerEntityNames); } resourceHandlerEntityNames.add(entityName); @@ -196,8 +194,8 @@ public class ModelReader implements Seri numAutoRelations = 0; entityCache = new HashMap<String, ModelEntity>(); - List<ModelViewEntity> tempViewEntityList = FastList.newInstance(); - List<Element> tempExtendEntityElementList = FastList.newInstance(); + List<ModelViewEntity> tempViewEntityList = new LinkedList<ModelViewEntity>(); + List<Element> tempExtendEntityElementList = new LinkedList<Element>(); UtilTimer utilTimer = new UtilTimer(); @@ -292,12 +290,12 @@ TEMP_VIEW_LOOP: } if (!tempViewEntityList.isEmpty()) { StringBuilder sb = new StringBuilder("View entities reference non-existant members:\n"); - Set<String> allViews = FastSet.newInstance(); + Set<String> allViews = new HashSet<String>(); for (ModelViewEntity curViewEntity: tempViewEntityList) { allViews.add(curViewEntity.getEntityName()); } for (ModelViewEntity curViewEntity: tempViewEntityList) { - Set<String> perViewMissingEntities = FastSet.newInstance(); + Set<String> perViewMissingEntities = new HashSet<String>(); Iterator<ModelViewEntity.ModelMemberEntity> mmeIt = curViewEntity.getAllModelMemberEntities().iterator(); while (mmeIt.hasNext()) { ModelViewEntity.ModelMemberEntity mme = mmeIt.next(); @@ -330,7 +328,7 @@ TEMP_VIEW_LOOP: // for entities auto-create many relationships for all type one relationships // just in case we add a new relation to the same entity, keep in a separate list and add them at the end - List<ModelRelation> newSameEntityRelations = FastList.newInstance(); + List<ModelRelation> newSameEntityRelations = new LinkedList<ModelRelation>(); Iterator<ModelRelation> relationsIter = curModelEntity.getRelationsIterator(); while (relationsIter.hasNext()) { @@ -355,7 +353,7 @@ TEMP_VIEW_LOOP: newRel.setRelEntityName(curModelEntity.getEntityName()); newRel.setTitle(targetTitle); newRel.setAutoRelation(true); - Set<String> curEntityKeyFields = FastSet.newInstance(); + Set<String> curEntityKeyFields = new HashSet<String>(); for (int kmn = 0; kmn < modelRelation.getKeyMapsSize(); kmn++) { ModelKeyMap curkm = modelRelation.getKeyMap(kmn); ModelKeyMap newkm = new ModelKeyMap(); @@ -440,7 +438,7 @@ TEMP_VIEW_LOOP: * entityResourceHandlerMap Map after the initial load to make them consistent again. */ public void rebuildResourceHandlerEntities() { - resourceHandlerEntities = FastMap.newInstance(); + resourceHandlerEntities = new HashMap<ResourceHandler, Collection<String>>(); Iterator<Map.Entry<String, ResourceHandler>> entityResourceIter = entityResourceHandlerMap.entrySet().iterator(); while (entityResourceIter.hasNext()) { @@ -449,7 +447,7 @@ TEMP_VIEW_LOOP: Collection<String> resourceHandlerEntityNames = resourceHandlerEntities.get(entry.getValue()); if (resourceHandlerEntityNames == null) { - resourceHandlerEntityNames = FastList.newInstance(); + resourceHandlerEntityNames = new LinkedList<String>(); resourceHandlerEntities.put(entry.getValue(), resourceHandlerEntityNames); } resourceHandlerEntityNames.add(entry.getKey()); @@ -534,7 +532,7 @@ TEMP_VIEW_LOOP: /** Get all entities, organized by package */ public Map<String, TreeSet<String>> getEntitiesByPackage(Set<String> packageFilterSet, Set<String> entityFilterSet) throws GenericEntityException { - Map<String, TreeSet<String>> entitiesByPackage = FastMap.newInstance(); + Map<String, TreeSet<String>> entitiesByPackage = new HashMap<String, TreeSet<String>>(); //put the entityNames TreeSets in a HashMap by packageName Iterator<String> ecIter = this.getEntityNames().iterator(); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelRelation.java Sun Apr 14 08:16:46 2013 @@ -24,8 +24,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javolution.util.FastList; - import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; @@ -157,8 +155,7 @@ public class ModelRelation extends Model } public List<ModelKeyMap> getKeyMapsClone() { - List<ModelKeyMap> kmList = FastList.newInstance(); - kmList.addAll(this.keyMaps); + List<ModelKeyMap> kmList = new ArrayList<ModelKeyMap>(this.keyMaps); return kmList; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java Sun Apr 14 08:16:46 2013 @@ -24,12 +24,12 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import javolution.util.FastList; import javolution.util.FastMap; import org.ofbiz.base.util.Debug; @@ -72,25 +72,25 @@ public class ModelViewEntity extends Mod protected Map<String, ModelMemberEntity> memberModelMemberEntities = FastMap.newInstance(); /** A list of all ModelMemberEntity entries; this is mainly used to preserve the original order of member entities from the XML file */ - protected List<ModelMemberEntity> allModelMemberEntities = FastList.newInstance(); + protected List<ModelMemberEntity> allModelMemberEntities = new LinkedList<ModelMemberEntity>(); /** Contains member-entity ModelEntities: key is alias, value is ModelEntity; populated with fields */ protected Map<String, String> memberModelEntities = FastMap.newInstance(); /** List of alias-alls which act as a shortcut for easily pulling over member entity fields */ - protected List<ModelAliasAll> aliasAlls = FastList.newInstance(); + protected List<ModelAliasAll> aliasAlls = new LinkedList<ModelAliasAll>(); /** List of aliases with information in addition to what is in the standard field list */ - protected List<ModelAlias> aliases = FastList.newInstance(); + protected List<ModelAlias> aliases = new LinkedList<ModelAlias>(); /** List of view links to define how entities are connected (or "joined") */ - protected List<ModelViewLink> viewLinks = FastList.newInstance(); + protected List<ModelViewLink> viewLinks = new LinkedList<ModelViewLink>(); /** A List of the Field objects for the View Entity, one for each GROUP BY field */ - protected List<ModelField> groupBys = FastList.newInstance(); + protected List<ModelField> groupBys = new LinkedList<ModelField>(); /** List of field names to group by */ - protected List<String> groupByFields = FastList.newInstance(); + protected List<String> groupByFields = new LinkedList<String>(); protected Map<String, ModelConversion[]> conversions = FastMap.newInstance(); @@ -243,8 +243,7 @@ public class ModelViewEntity extends Mod } public List<ModelAlias> getAliasesCopy() { - List<ModelAlias> newList = FastList.newInstance(); - newList.addAll(this.aliases); + List<ModelAlias> newList = new ArrayList<ModelAlias>(this.aliases); return newList; } @@ -257,7 +256,7 @@ public class ModelViewEntity extends Mod } public List<ModelField> getGroupBysCopy(List<ModelField> selectFields) { - List<ModelField> newList = FastList.newInstance(); + List<ModelField> newList = new ArrayList<ModelField>(this.groupBys.size()); if (UtilValidate.isEmpty(selectFields)) { newList.addAll(this.groupBys); } else { @@ -284,8 +283,7 @@ public class ModelViewEntity extends Mod } public List<ModelViewLink> getViewLinksCopy() { - List<ModelViewLink> newList = FastList.newInstance(); - newList.addAll(this.viewLinks); + List<ModelViewLink> newList = new ArrayList<ModelViewLink>(this.viewLinks); return newList; } @@ -295,7 +293,7 @@ public class ModelViewEntity extends Mod public void populateViewEntityConditionInformation(ModelFieldTypeReader modelFieldTypeReader, List<EntityCondition> whereConditions, List<EntityCondition> havingConditions, List<String> orderByList, List<String> entityAliasStack) { if (entityAliasStack == null) { - entityAliasStack = FastList.newInstance(); + entityAliasStack = new LinkedList<String>(); } if (this.viewEntityCondition != null) { @@ -556,7 +554,7 @@ public class ModelViewEntity extends Mod List<String> aliases = containedModelFields.get(alias.getField()); if (aliases == null) { - aliases = FastList.newInstance(); + aliases = new LinkedList<String>(); containedModelFields.put(alias.getField(), aliases); } aliases.add(alias.getName()); @@ -616,7 +614,7 @@ public class ModelViewEntity extends Mod public List<Map<String, Object>> convert(String fromEntityName, Map<String, ? extends Object> data) { ModelConversion[] conversions = this.conversions.get(fromEntityName); if (conversions == null) return null; - List<Map<String, Object>> values = FastList.newInstance(); + List<Map<String, Object>> values = new LinkedList<Map<String, Object>>(); for (ModelConversion conversion: conversions) { conversion.convert(values, data); } @@ -979,7 +977,7 @@ public class ModelViewEntity extends Mod } public static final class ComplexAlias implements ComplexAliasMember { - protected final List<ComplexAliasMember> complexAliasMembers = FastList.newInstance(); + protected final List<ComplexAliasMember> complexAliasMembers = new LinkedList<ComplexAliasMember>(); protected final String operator; public ComplexAlias(String operator) { @@ -1100,7 +1098,7 @@ public class ModelViewEntity extends Mod protected final String entityAlias; protected final String relEntityAlias; protected final boolean relOptional; - protected final List<ModelKeyMap> keyMaps = FastList.newInstance(); + protected final List<ModelKeyMap> keyMaps = new LinkedList<ModelKeyMap>(); protected final ViewEntityCondition viewEntityCondition; public ModelViewLink(ModelViewEntity modelViewEntity, Element viewLinkElement) { @@ -1180,8 +1178,7 @@ public class ModelViewEntity extends Mod } public List<ModelKeyMap> getKeyMapsCopy() { - List<ModelKeyMap> newList = FastList.newInstance(); - newList.addAll(this.keyMaps); + List<ModelKeyMap> newList = new ArrayList<ModelKeyMap>(this.keyMaps); return newList; } @@ -1271,7 +1268,7 @@ public class ModelViewEntity extends Mod // process order-by List<? extends Element> orderByElementList = UtilXml.childElementList(element, "order-by"); if (orderByElementList.size() > 0) { - orderByList = FastList.newInstance(); + orderByList = new ArrayList<String>(orderByElementList.size()); for (Element orderByElement: orderByElementList) { orderByList.add(orderByElement.getAttribute("field-name")); } @@ -1484,7 +1481,7 @@ public class ModelViewEntity extends Mod return condition.createCondition(modelFieldTypeReader, entityAliasStack); } - List<EntityCondition> entityConditionList = FastList.<EntityCondition>newInstance(); + List<EntityCondition> entityConditionList = new LinkedList<EntityCondition>(); for (ViewCondition curCondition: conditionList) { EntityCondition econd = curCondition.createCondition(modelFieldTypeReader, entityAliasStack); if (econd != null) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityConditionPlanner.java Sun Apr 14 08:16:46 2013 @@ -18,11 +18,10 @@ */ package org.ofbiz.entity.sql; +import java.util.LinkedList; import java.util.List; import java.util.Map; -import javolution.util.FastList; - import org.ofbiz.entity.condition.EntityCondition; import org.ofbiz.entity.condition.EntityFieldValue; import org.ofbiz.entity.condition.EntityOperator; @@ -46,7 +45,7 @@ public class EntityConditionPlanner impl return EntityCondition.makeCondition(buildFieldValue(bc.getLeft()), EntityOperator.lookupComparison(bc.getOp()), buildValue(bc.getRight(), params)); } else if (condition instanceof ConditionList) { ConditionList cl = (ConditionList) condition; - List<EntityCondition> conditions = FastList.newInstance(); + List<EntityCondition> conditions = new LinkedList<EntityCondition>(); for (Condition subCondition: cl) { conditions.add(parse(subCondition, params)); } @@ -73,7 +72,7 @@ public class EntityConditionPlanner impl FieldValue fv = (FieldValue) value; return EntityFieldValue.makeFieldValue(fv.getFieldName(), fv.getTableName(), null, null); } else if (value instanceof List<?>) { - List<Object> values = FastList.newInstance(); + List<Object> values = new LinkedList<Object>(); for (Object sqlValue: (List<?>) value) { values.add(buildValue(sqlValue, params)); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Sun Apr 14 08:16:46 2013 @@ -20,6 +20,7 @@ package org.ofbiz.entity.sql; import java.util.Collections; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import javolution.util.FastList; @@ -42,12 +43,12 @@ import org.ofbiz.sql.NumberValue; import org.ofbiz.sql.OrderByItem; import org.ofbiz.sql.Planner; import org.ofbiz.sql.Relation; -import org.ofbiz.sql.SelectGroup; import org.ofbiz.sql.SQLDelete; import org.ofbiz.sql.SQLInsert; import org.ofbiz.sql.SQLSelect; import org.ofbiz.sql.SQLUpdate; import org.ofbiz.sql.SQLView; +import org.ofbiz.sql.SelectGroup; import org.ofbiz.sql.StaticValue; import org.ofbiz.sql.StringValue; import org.ofbiz.sql.Table; @@ -83,7 +84,7 @@ public class EntityPlanner extends Plann addJoined(dve, table.getTableName().getAlias(), table.getJoined()); if (selectGroup.getFieldAlls() != null) { for (FieldAll fieldAll: selectGroup.getFieldAlls()) { - List<String> excludes = FastList.newInstance(); + List<String> excludes = new LinkedList<String>(); for (String exclude: fieldAll) { excludes.add(exclude); } @@ -111,7 +112,7 @@ public class EntityPlanner extends Plann if (selectStatement.getOrderBy() == null) { orderBy = null; } else { - orderBy = FastList.newInstance(); + orderBy = new LinkedList<String>(); for (OrderByItem orderByItem: selectStatement.getOrderBy()) { orderBy.add(orderByItem.toString()); } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/JNDIFactory.java Sun Apr 14 08:16:46 2013 @@ -21,7 +21,7 @@ package org.ofbiz.entity.transaction; import java.sql.Connection; import java.sql.SQLException; -import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -31,8 +31,6 @@ import javax.sql.XADataSource; import javax.transaction.TransactionManager; import javax.transaction.UserTransaction; -import javolution.util.FastMap; - import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralException; @@ -57,7 +55,7 @@ public class JNDIFactory implements Tran static UserTransaction userTransaction = null; // protected static UtilCache dsCache = new UtilCache("entity.JndiDataSources", 0, 0); - protected static Map<String, DataSource> dsCache = FastMap.newInstance(); + protected static ConcurrentHashMap<String, DataSource> dsCache = new ConcurrentHashMap<String, DataSource>(); public TransactionManager getTransactionManager() { if (transactionManager == null) { @@ -159,9 +157,7 @@ public class JNDIFactory implements Tran public static Connection getJndiConnection(String jndiName, String jndiServerName) throws SQLException, GenericEntityException { // if (Debug.verboseOn()) Debug.logVerbose("Trying JNDI name " + jndiName, module); - DataSource ds; - - ds = dsCache.get(jndiName); + DataSource ds = dsCache.get(jndiName); if (ds != null) { if (ds instanceof XADataSource) { XADataSource xads = (XADataSource) ds; @@ -171,75 +167,45 @@ public class JNDIFactory implements Tran return ds.getConnection(); } } + try { + if (Debug.infoOn()) + Debug.logInfo("Doing JNDI lookup for name " + jndiName, module); + InitialContext ic = JNDIContextFactory.getInitialContext(jndiServerName); + + if (ic != null) { + ds = (DataSource) ic.lookup(jndiName); + } else { + Debug.logWarning("Initial Context returned was NULL for server name " + jndiServerName, module); + } - synchronized (ConnectionFactory.class) { - // try again inside the synch just in case someone when through while we were waiting - ds = dsCache.get(jndiName); if (ds != null) { + if (Debug.verboseOn()) + Debug.logVerbose("Got a Datasource object.", module); + dsCache.putIfAbsent(jndiName, ds); + ds = dsCache.get(jndiName); + Connection con; + if (ds instanceof XADataSource) { + if (Debug.infoOn()) + Debug.logInfo("Got XADataSource for name " + jndiName, module); XADataSource xads = (XADataSource) ds; + XAConnection xac = xads.getXAConnection(); - return TransactionUtil.enlistConnection(xads.getXAConnection()); - } else { - return ds.getConnection(); - } - } - - try { - if (Debug.infoOn()) Debug.logInfo("Doing JNDI lookup for name " + jndiName, module); - InitialContext ic = JNDIContextFactory.getInitialContext(jndiServerName); - - if (ic != null) { - ds = (DataSource) ic.lookup(jndiName); + con = TransactionUtil.enlistConnection(xac); } else { - Debug.logWarning("Initial Context returned was NULL for server name " + jndiServerName, module); - } + if (Debug.infoOn()) + Debug.logInfo("Got DataSource for name " + jndiName, module); - if (ds != null) { - if (Debug.verboseOn()) Debug.logVerbose("Got a Datasource object.", module); - dsCache.put(jndiName, ds); - Connection con; - - if (ds instanceof XADataSource) { - if (Debug.infoOn()) Debug.logInfo("Got XADataSource for name " + jndiName, module); - XADataSource xads = (XADataSource) ds; - XAConnection xac = xads.getXAConnection(); - - con = TransactionUtil.enlistConnection(xac); - } else { - if (Debug.infoOn()) Debug.logInfo("Got DataSource for name " + jndiName, module); - - con = ds.getConnection(); - } - - /* NOTE: This code causes problems because settting the transaction isolation level after a transaction has started is a no-no - * The question is: how should we do this? - String isolationLevel = jndiJdbcElement.getAttribute("isolation-level"); - if (UtilValidate.isNotEmpty(isolationLevel)) { - if ("Serializable".equals(isolationLevel)) { - con.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE); - } else if ("RepeatableRead".equals(isolationLevel)) { - con.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ); - } else if ("ReadUncommitted".equals(isolationLevel)) { - con.setTransactionIsolation(Connection.TRANSACTION_READ_UNCOMMITTED); - } else if ("ReadCommitted".equals(isolationLevel)) { - con.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - } else if ("None".equals(isolationLevel)) { - con.setTransactionIsolation(Connection.TRANSACTION_NONE); - } - } - */ - - // if (con != null) if (Debug.infoOn()) Debug.logInfo("[ConnectionFactory.getConnection] Got JNDI connection with catalog: " + con.getCatalog(), module); - return con; - } else { - Debug.logError("Datasource returned was NULL.", module); + con = ds.getConnection(); } - } catch (NamingException ne) { - Debug.logWarning(ne, "[ConnectionFactory.getConnection] Failed to find DataSource named " + jndiName + " in JNDI server with name " + jndiServerName + ". Trying normal database.", module); - } catch (GenericConfigException gce) { - throw new GenericEntityException("Problems with the JNDI configuration.", gce.getNested()); + return con; + } else { + Debug.logError("Datasource returned was NULL.", module); } + } catch (NamingException ne) { + Debug.logWarning(ne, "[ConnectionFactory.getConnection] Failed to find DataSource named " + jndiName + " in JNDI server with name " + jndiServerName + ". Trying normal database.", module); + } catch (GenericConfigException gce) { + throw new GenericEntityException("Problems with the JNDI configuration.", gce.getNested()); } return null; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/transaction/TransactionUtil.java Sun Apr 14 08:16:46 2013 @@ -44,9 +44,6 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import javolution.util.FastList; -import javolution.util.FastMap; - import org.apache.commons.collections.map.ListOrderedMap; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; @@ -69,8 +66,8 @@ public class TransactionUtil implements private static ThreadLocal<List<Exception>> suspendedTxLocationStack = new ThreadLocal<List<Exception>>(); private static ThreadLocal<Exception> transactionBeginStack = new ThreadLocal<Exception>(); private static ThreadLocal<List<Exception>> transactionBeginStackSave = new ThreadLocal<List<Exception>>(); - private static Map<Long, Exception> allThreadsTransactionBeginStack = Collections.<Long, Exception>synchronizedMap(FastMap.<Long, Exception>newInstance()); - private static Map<Long, List<Exception>> allThreadsTransactionBeginStackSave = Collections.<Long, List<Exception>>synchronizedMap(FastMap.<Long, List<Exception>>newInstance()); + private static Map<Long, Exception> allThreadsTransactionBeginStack = Collections.<Long, Exception>synchronizedMap(new HashMap<Long, Exception>()); + private static Map<Long, List<Exception>> allThreadsTransactionBeginStackSave = Collections.<Long, List<Exception>>synchronizedMap(new HashMap<Long, List<Exception>>()); private static ThreadLocal<RollbackOnlyCause> setRollbackOnlyCause = new ThreadLocal<RollbackOnlyCause>(); private static ThreadLocal<List<RollbackOnlyCause>> setRollbackOnlyCauseSave = new ThreadLocal<List<RollbackOnlyCause>>(); private static ThreadLocal<Timestamp> transactionStartStamp = new ThreadLocal<Timestamp>(); @@ -654,7 +651,7 @@ public class TransactionUtil implements // use the ThreadLocal one because it is more reliable than the all threads Map List<Exception> el = transactionBeginStackSave.get(); if (el == null) { - el = FastList.newInstance(); + el = new LinkedList<Exception>(); transactionBeginStackSave.set(el); } el.add(0, e); @@ -662,7 +659,7 @@ public class TransactionUtil implements Long curThreadId = Thread.currentThread().getId(); List<Exception> ctEl = allThreadsTransactionBeginStackSave.get(curThreadId); if (ctEl == null) { - ctEl = FastList.newInstance(); + ctEl = new LinkedList<Exception>(); allThreadsTransactionBeginStackSave.put(curThreadId, ctEl); } ctEl.add(0, e); @@ -696,14 +693,14 @@ public class TransactionUtil implements public static List<Exception> getTransactionBeginStackSave() { List<Exception> el = transactionBeginStackSave.get(); - List<Exception> elClone = FastList.newInstance(); + List<Exception> elClone = new LinkedList<Exception>(); elClone.addAll(el); return elClone; } public static Map<Long, List<Exception>> getAllThreadsTransactionBeginStackSave() { Map<Long, List<Exception>> attbssMap = allThreadsTransactionBeginStackSave; - Map<Long, List<Exception>> attbssMapClone = FastMap.newInstance(); + Map<Long, List<Exception>> attbssMapClone = new HashMap<Long, List<Exception>>(); attbssMapClone.putAll(attbssMap); return attbssMapClone; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/Converters.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/Converters.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/Converters.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/Converters.java Sun Apr 14 08:16:46 2013 @@ -18,12 +18,11 @@ *******************************************************************************/ package org.ofbiz.entity.util; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastSet; - import org.ofbiz.base.conversion.AbstractConverter; import org.ofbiz.base.conversion.ConversionException; import org.ofbiz.base.conversion.ConverterLoader; @@ -38,7 +37,7 @@ public class Converters implements Conve } public List<GenericValue> convert(GenericValue obj) throws ConversionException { - List<GenericValue> tempList = FastList.newInstance(); + List<GenericValue> tempList = new LinkedList<GenericValue>(); tempList.add(obj); return tempList; } @@ -50,7 +49,7 @@ public class Converters implements Conve } public Set<GenericValue> convert(GenericValue obj) throws ConversionException { - Set<GenericValue> tempSet = FastSet.newInstance(); + Set<GenericValue> tempSet = new HashSet<GenericValue>(); tempSet.add(obj); return tempSet; } Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Sun Apr 14 08:16:46 2013 @@ -25,8 +25,6 @@ import java.util.LinkedList; import java.util.List; import java.util.StringTokenizer; -import javolution.util.FastList; - import org.ofbiz.base.component.ComponentConfig; import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.config.MainResourceHandler; @@ -187,7 +185,7 @@ public class EntityDataLoader { public static List<URL> getUrlByComponentList(String helperName, List<String> components, List<String> readerNames) { List<URL> urlList = new LinkedList<URL>(); for (String readerName: readerNames) { - List<String> loadReaderNames = FastList.newInstance(); + List<String> loadReaderNames = new LinkedList<String>(); loadReaderNames.add(readerName); for (String component : components) { urlList.addAll(getUrlList(helperName, component, loadReaderNames)); @@ -198,7 +196,7 @@ public class EntityDataLoader { public static List<URL> getUrlByComponentList(String helperName, List<String> components) { DatasourceInfo datasourceInfo = EntityConfigUtil.getDatasourceInfo(helperName); - List<String> readerNames = FastList.newInstance(); + List<String> readerNames = new LinkedList<String>(); for (Object readerInfo : datasourceInfo.readDatas) { String readerName = null; if (readerInfo instanceof Element) { Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityListIterator.java Sun Apr 14 08:16:46 2013 @@ -22,11 +22,10 @@ package org.ofbiz.entity.util; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import javolution.util.FastList; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.GeneralRuntimeException; import org.ofbiz.entity.Delegator; @@ -434,7 +433,7 @@ public class EntityListIterator implemen // do a quick check to see if the ResultSet is empty resultSet.beforeFirst(); } - List<GenericValue> list = FastList.newInstance(); + List<GenericValue> list = new LinkedList<GenericValue>(); GenericValue nextValue = null; while ((nextValue = this.next()) != null) { @@ -461,8 +460,8 @@ public class EntityListIterator implemen */ public List<GenericValue> getPartialList(int start, int number) throws GenericEntityException { try { - if (number == 0) return FastList.newInstance(); - List<GenericValue> list = FastList.newInstance(); + if (number == 0) return new LinkedList<GenericValue>(); + List<GenericValue> list = new LinkedList<GenericValue>(); // just in case the caller missed the 1 based thingy if (start == 0) start = 1; Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Sun Apr 14 08:16:46 2013 @@ -27,13 +27,13 @@ import java.io.StringWriter; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import javolution.text.CharArray; import javolution.text.Text; -import javolution.util.FastList; -import javolution.util.FastMap; import javolution.xml.sax.Attributes; import javolution.xml.sax.XMLReaderImpl; @@ -191,7 +191,7 @@ public class EntitySaxReader implements public List<Object> getMessageList() { if (this.checkDataOnly && this.messageList == null) { - messageList = FastList.newInstance(); + messageList = new LinkedList<Object>(); } return this.messageList; } @@ -380,7 +380,7 @@ public class EntitySaxReader implements Template template = new Template("FMImportFilter", templateReader, config); NodeModel nodeModel = NodeModel.wrap(this.rootNodeForTemplate); - Map<String, Object> context = FastMap.newInstance(); + Map<String, Object> context = new HashMap<String, Object>(); TemplateHashModel staticModels = FreeMarkerWorker.getDefaultOfbizWrapper().getStaticModels(); context.put("Static", staticModels); Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java?rev=1467744&r1=1467743&r2=1467744&view=diff ============================================================================== --- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java (original) +++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntityUtil.java Sun Apr 14 08:16:46 2013 @@ -23,15 +23,14 @@ import java.io.Serializable; import java.sql.Timestamp; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import javolution.util.FastList; -import javolution.util.FastMap; -import javolution.util.FastSet; - import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilGenerics; @@ -54,7 +53,7 @@ public class EntityUtil { public static final String module = EntityUtil.class.getName(); public static <V> Map<String, V> makeFields(V... args) { - Map<String, V> fields = FastMap.newInstance(); + Map<String, V> fields = new HashMap<String, V>(); if (args != null) { for (int i = 0; i < args.length;) { if (!(args[i] instanceof String)) throw new IllegalArgumentException("Key(" + i + "), with value(" + args[i] + ") is not a String."); @@ -170,7 +169,7 @@ public class EntityUtil { if (fromDateName == null) fromDateName = "fromDate"; if (thruDateName == null) thruDateName = "thruDate"; - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); Iterator<T> iter = datedValues.iterator(); if (allAreSame) { @@ -245,10 +244,10 @@ public class EntityUtil { List<T> result = null; if (UtilValidate.isEmpty(fields)) { - result = FastList.newInstance(); + result = new LinkedList<T>(); result.addAll(values); } else { - result = FastList.newInstance(); + result = new LinkedList<T>(); for (T value: values) { if (value.matchesFields(fields)) { result.add(value); @@ -272,7 +271,7 @@ public class EntityUtil { return values; } - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); for (T value: values) { boolean include = true; @@ -300,7 +299,7 @@ public class EntityUtil { return values; } - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); for (T value: values) { boolean include = false; @@ -325,14 +324,14 @@ public class EntityUtil { */ public static <T extends GenericEntity> List<T> orderBy(Collection<T> values, List<String> orderBy) { if (values == null) return null; - if (values.size() == 0) return FastList.newInstance(); + if (values.size() == 0) return new LinkedList<T>(); if (UtilValidate.isEmpty(orderBy)) { - List<T> newList = FastList.newInstance(); + List<T> newList = new LinkedList<T>(); newList.addAll(values); return newList; } - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); result.addAll(values); if (Debug.verboseOn()) Debug.logVerbose("Sorting " + values.size() + " values, orderBy=" + orderBy.toString(), module); Collections.sort(result, new OrderByList(orderBy)); @@ -374,7 +373,7 @@ public class EntityUtil { public static List<GenericValue> getRelated(String relationName, Map<String, ? extends Object> fields, List<GenericValue> values, boolean useCache) throws GenericEntityException { if (values == null) return null; - List<GenericValue> result = FastList.newInstance(); + List<GenericValue> result = new LinkedList<GenericValue>(); for (GenericValue value: values) { result.addAll(value.getRelated(relationName, fields, null, useCache)); } @@ -384,7 +383,7 @@ public class EntityUtil { public static <T extends GenericEntity> List<T> filterByCondition(List<T> values, EntityCondition condition) { if (values == null) return null; - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); for (T value: values) { if (condition.entityMatches(value)) { result.add(value); @@ -396,7 +395,7 @@ public class EntityUtil { public static <T extends GenericEntity> List<T> filterOutByCondition(List<T> values, EntityCondition condition) { if (values == null) return null; - List<T> result = FastList.newInstance(); + List<T> result = new LinkedList<T>(); for (T value: values) { if (!condition.entityMatches(value)) { result.add(value); @@ -426,7 +425,7 @@ public class EntityUtil { search = null; for (GenericValue entity: entities) { if (now.equals(entity.get("fromDate"))) { - search = FastMap.newInstance(); + search = new HashMap<String, Object>(); for (Map.Entry<String, ? super Object> entry: entity.getPrimaryKey().entrySet()) { search.put(entry.getKey(), entry.getValue()); } @@ -437,14 +436,14 @@ public class EntityUtil { entity.store(); } if (search == null) { - search = FastMap.newInstance(); + search = new HashMap<String, Object>(); search.putAll(EntityUtil.getFirst(entities)); } } else { /* why is this being done? leaving out for now... search = new HashMap(search); */ - search = FastMap.newInstance(); + search = new HashMap<String, Object>(); search.putAll(find); } if (now.equals(search.get("fromDate"))) { @@ -472,10 +471,10 @@ public class EntityUtil { if (genericValueList == null || fieldName == null) { return null; } - List<T> fieldList = FastList.newInstance(); + List<T> fieldList = new LinkedList<T>(); Set<T> distinctSet = null; if (distinct) { - distinctSet = FastSet.newInstance(); + distinctSet = new HashSet<T>(); } for (GenericValue value: genericValueList) { @@ -499,10 +498,10 @@ public class EntityUtil { if (genericValueEli == null || fieldName == null) { return null; } - List<T> fieldList = FastList.newInstance(); + List<T> fieldList = new LinkedList<T>(); Set<T> distinctSet = null; if (distinct) { - distinctSet = FastSet.newInstance(); + distinctSet = new HashSet<T>(); } GenericValue value = null; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |