You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2009/11/18 07:13:53 UTC
svn commit: r881681 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity:
./ cache/ condition/ datasource/ finder/ jdbc/ model/ testtools/
Author: doogie
Date: Wed Nov 18 06:13:52 2009
New Revision: 881681
URL: http://svn.apache.org/viewvc?rev=881681&view=rev
Log:
Some space changes.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/SqlJdbcUtil.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelViewEntity.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java Wed Nov 18 06:13:52 2009
@@ -63,7 +63,7 @@
* Remove a CACHED Generic Entity from the cache by its primary key, does
* NOT check to see if the passed GenericPK is a complete primary key. Also
* tries to clear the corresponding all cache entry.
- *
+ *
* @param primaryKey
* The primary key to clear by.
*/
@@ -76,7 +76,7 @@
* tries to remove entries from the all cache, the by primary key cache, and
* the by and cache. This is the ONLY method that tries to clear
* automatically from the by and cache.
- *
+ *
* @param value
* The GenericValue to clear by.
*/
@@ -86,7 +86,7 @@
/**
* Remove all CACHED Generic Entity (List) from the cache
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
*/
@@ -95,7 +95,7 @@
/**
* Remove a CACHED Generic Entity (List) from the cache, either a PK, ByAnd,
* or All
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -107,7 +107,7 @@
/**
* Remove a CACHED Generic Entity (List) from the cache, either a PK, ByAnd,
* or All
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -127,7 +127,7 @@
* complete primary key it will remove the cache line from the andCache. If
* the fields map is empty, then the allCache for the entity will be
* cleared.
- *
+ *
* @param dummyPK
* The dummy primary key to clear by.
*/
@@ -142,7 +142,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* datasource
- *
+ *
* @param primaryKey
* The GenericPK to create a value in the datasource from
* @return GenericValue instance containing the new instance
@@ -152,7 +152,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* datasource
- *
+ *
* @param primaryKey
* The GenericPK to create a value in the datasource from
* @param doCacheClear
@@ -165,7 +165,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* datasource
- *
+ *
* @param value
* The GenericValue to create a value in the datasource from
* @return GenericValue instance containing the new instance
@@ -175,7 +175,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* datasource
- *
+ *
* @param value
* The GenericValue to create a value in the datasource from
* @param doCacheClear
@@ -188,7 +188,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* database
- *
+ *
* @return GenericValue instance containing the new instance
*/
public GenericValue create(String entityName, Map<String, ? extends Object> fields) throws GenericEntityException;
@@ -196,14 +196,14 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* database
- *
+ *
* @return GenericValue instance containing the new instance
*/
public GenericValue create(String entityName, Object... fields) throws GenericEntityException;
/**
* Creates or stores an Entity
- *
+ *
* @param value
* The GenericValue instance containing the new or existing
* instance
@@ -213,7 +213,7 @@
/**
* Creates or stores an Entity
- *
+ *
* @param value
* The GenericValue instance containing the new or existing
* instance
@@ -229,7 +229,7 @@
* then does a create in the database as normal. The reason to do it this
* way is that it will retry and fix the sequence if somehow the sequencer
* is in a bad state and returning a value that already exists.
- *
+ *
* @param value
* The GenericValue to create a value in the datasource from
* @return GenericValue instance containing the new instance
@@ -239,7 +239,7 @@
/**
* Creates a Entity in the form of a GenericValue and write it to the
* database
- *
+ *
* @return GenericValue instance containing the new instance
*/
public GenericValue createSingle(String entityName, Object singlePkValue) throws GenericEntityException;
@@ -258,7 +258,7 @@
* Finds GenericValues by the conditions specified in the EntityCondition
* object, the the EntityCondition javadoc for more details. NOTE 20080502:
* 3 references
- *
+ *
* @param entityName
* The name of the Entity as defined in the entity XML file
* @param whereEntityCondition
@@ -289,7 +289,7 @@
/**
* Finds Generic Entity records by all of the specified fields (ie: combined
* using AND) NOTE 20080502: 264 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -302,7 +302,7 @@
/**
* Finds Generic Entity records by all of the specified fields (ie: combined
* using AND) NOTE 20080502: 72 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -319,7 +319,7 @@
/**
* Finds Generic Entity records by all of the specified fields (ie: combined
* using AND) NOTE 20080502: 1 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -333,7 +333,7 @@
* Finds Generic Entity records by all of the specified fields (ie: combined
* using AND), looking first in the cache; uses orderBy for lookup, but only
* keys results on the entityName and fields NOTE 20080502: 91 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -347,7 +347,7 @@
* Finds Generic Entity records by all of the specified fields (ie: combined
* using AND), looking first in the cache; uses orderBy for lookup, but only
* keys results on the entityName and fields NOTE 20080502: 56 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -365,7 +365,7 @@
* Find a Generic Entity by its Primary Key NOTE 20080502: 550 references
* (20080503 521 left); needs to be deprecated, should use findOne instead,
* but lots of stuff to replace!
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -378,7 +378,7 @@
/**
* Find a CACHED Generic Entity by its Primary Key NOTE 20080502: 218
* references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -391,7 +391,7 @@
/**
* Find a CACHED Generic Entity by its Primary Key NOTE 20080502: 2
* references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -404,7 +404,7 @@
/**
* Find a Generic Entity by its Primary Key and only returns the values
* requested by the passed keys (names) NOTE 20080502: 3 references
- *
+ *
* @param primaryKey
* The primary key to find by.
* @param keys
@@ -423,7 +423,7 @@
* Finds GenericValues by the conditions specified in the EntityCondition
* object, the the EntityCondition javadoc for more details. NOTE 20080502:
* 12 references
- *
+ *
* @param entityName
* The name of the Entity as defined in the entity XML file
* @param entityCondition
@@ -448,7 +448,7 @@
* Finds GenericValues by the conditions specified in the EntityCondition
* object, the the EntityCondition javadoc for more details. NOTE 20080502:
* 9 references
- *
+ *
* @param dynamicViewEntity
* The DynamicViewEntity to use for the entity model for this
* query; generally created on the fly for limited use
@@ -479,7 +479,7 @@
/**
* Find a Generic Entity by its Primary Key NOTE 20080502: 6 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -491,7 +491,7 @@
/**
* Find a Generic Entity by its Primary Key NOTE 20080502: 6 references
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -510,7 +510,7 @@
/**
* Gets a field type instance by name from the helper that corresponds to
* the specified entity
- *
+ *
* @param entity
* The entity
* @param type
@@ -523,7 +523,7 @@
/**
* Gets field type names from the helper that corresponds to the specified
* entity
- *
+ *
* @param entity
* The entity
* @return Collection of field type names from the helper that corresponds
@@ -534,7 +534,7 @@
/**
* Gets the helper name that corresponds to this delegator and the specified
* entityName
- *
+ *
* @param entityName
* The name of the entity to get the helper for
* @return String with the helper name that corresponds to this delegator
@@ -545,7 +545,7 @@
/**
* Gets the an instance of helper that corresponds to this delegator and the
* specified entity
- *
+ *
* @param entity
* The entity to get the helper for
* @return GenericHelper that corresponds to this delegator and the
@@ -556,7 +556,7 @@
/**
* Gets the an instance of helper that corresponds to this delegator and the
* specified entityName
- *
+ *
* @param entityName
* The name of the entity to get the helper for
* @return GenericHelper that corresponds to this delegator and the
@@ -567,7 +567,7 @@
/**
* Gets the helper name that corresponds to this delegator and the specified
* entity
- *
+ *
* @param entity
* The entity to get the helper for
* @return String with the helper name that corresponds to this delegator
@@ -578,7 +578,7 @@
/**
* Gets the helper name that corresponds to this delegator and the specified
* entityName
- *
+ *
* @param entityName
* The name of the entity to get the helper name for
* @return String with the helper name that corresponds to this delegator
@@ -591,7 +591,7 @@
/**
* Gets the helper name that corresponds to this delegator and the specified
* entityName
- *
+ *
* @param groupName
* The name of the group to get the helper name for
* @return String with the helper name that corresponds to this delegator
@@ -602,7 +602,7 @@
/**
* Gets the instance of ModelEntity that corresponds to this delegator and
* the specified entityName
- *
+ *
* @param entityName
* The name of the entity to get
* @return ModelEntity that corresponds to this delegator and the specified
@@ -613,7 +613,7 @@
/**
* Gets a Map of entity name & entity model pairs that are in the named
* group
- *
+ *
* @param groupName
* The name of the group
* @return Map of entityName String keys and ModelEntity instance values
@@ -624,14 +624,14 @@
/**
* Gets the instance of ModelGroupReader that corresponds to this delegator
- *
+ *
* @return ModelGroupReader that corresponds to this delegator
*/
public ModelGroupReader getModelGroupReader();
/**
* Gets the instance of ModelReader that corresponds to this delegator
- *
+ *
* @return ModelReader that corresponds to this delegator
*/
public ModelReader getModelReader();
@@ -640,7 +640,7 @@
* Get the named Related Entity for the GenericValue from the persistent
* store across another Relation. Helps to get related Values in a
* multi-to-multi relationship. NOTE 20080502: 0 references
- *
+ *
* @param relationNameOne
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -660,7 +660,7 @@
* Get the named Related Entity for the GenericValue from the persistent
* store across another Relation. Helps to get related Values in a
* multi-to-multi relationship. NOTE 20080502: 3 references
- *
+ *
* @param relationNameOne
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -681,7 +681,7 @@
/**
* Get the next guaranteed unique seq id from the sequence with the given
* sequence name; if the named sequence doesn't exist, it will be created
- *
+ *
* @param seqName
* The name of the sequence to get the next seq id from
* @return String with the next sequenced id for the given sequence name
@@ -691,7 +691,7 @@
/**
* Get the next guaranteed unique seq id from the sequence with the given
* sequence name; if the named sequence doesn't exist, it will be created
- *
+ *
* @param seqName
* The name of the sequence to get the next seq id from
* @param staggerMax
@@ -706,7 +706,7 @@
/**
* Get the next guaranteed unique seq id from the sequence with the given
* sequence name; if the named sequence doesn't exist, it will be created
- *
+ *
* @param seqName
* The name of the sequence to get the next seq id from
* @return Long with the next sequenced id for the given sequence name
@@ -716,7 +716,7 @@
/**
* Get the next guaranteed unique seq id from the sequence with the given
* sequence name; if the named sequence doesn't exist, it will be created
- *
+ *
* @param seqName
* The name of the sequence to get the next seq id from
* @param staggerMax
@@ -731,7 +731,7 @@
/**
* Gets the name of the server configuration that corresponds to this
* delegator
- *
+ *
* @return server configuration name
*/
public String getOriginalDelegatorName();
@@ -739,7 +739,7 @@
/**
* Get the named Related Entity for the GenericValue from the persistent
* store NOTE 20080502: 5 references
- *
+ *
* @param relationName
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -761,7 +761,7 @@
* Get the named Related Entity for the GenericValue from the persistent
* store, checking first in the cache to see if the desired value is there
* NOTE 20080502: 4 references
- *
+ *
* @param relationName
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -776,7 +776,7 @@
/**
* Get a dummy primary key for the named Related Entity for the GenericValue
* NOTE 20080502: 2 references
- *
+ *
* @param relationName
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -793,7 +793,7 @@
/**
* Get related entity where relation is of type one, uses findByPrimaryKey
* NOTE 20080502: 7 references
- *
+ *
* @throws IllegalArgumentException
* if the list found has more than one item
*/
@@ -803,7 +803,7 @@
* Get related entity where relation is of type one, uses findByPrimaryKey,
* checking first in the cache to see if the desired value is there NOTE
* 20080502: 1 references
- *
+ *
* @throws IllegalArgumentException
* if the list found has more than one item
*/
@@ -864,7 +864,7 @@
/**
* Refresh the Entity for the GenericValue from the persistent store
- *
+ *
* @param value
* GenericValue instance containing the entity to refresh
*/
@@ -872,7 +872,7 @@
/**
* Refresh the Entity for the GenericValue from the persistent store
- *
+ *
* @param value
* GenericValue instance containing the entity to refresh
* @param doCacheClear
@@ -883,7 +883,7 @@
/**
* Refresh the Entity for the GenericValue from the cache
- *
+ *
* @param value
* GenericValue instance containing the entity to refresh
*/
@@ -902,7 +902,7 @@
* the removeByAnd method. <br/>These updates all happen in one transaction,
* so they will either all succeed or all fail, if the data source supports
* transactions.
- *
+ *
* @param dummyPKs
* Collection of GenericEntity instances containing the entities
* or by and fields to remove
@@ -920,7 +920,7 @@
* the removeByAnd method. <br/>These updates all happen in one transaction,
* so they will either all succeed or all fail, if the data source supports
* transactions.
- *
+ *
* @param dummyPKs
* Collection of GenericEntity instances containing the entities
* or by and fields to remove
@@ -936,7 +936,7 @@
/**
* Removes/deletes Generic Entity records found by all of the specified
* fields (ie: combined using AND)
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param doCacheClear
@@ -952,7 +952,7 @@
/**
* Removes/deletes Generic Entity records found by all of the specified
* fields (ie: combined using AND)
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -965,7 +965,7 @@
/**
* Removes/deletes Generic Entity records found by all of the specified
* fields (ie: combined using AND)
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -981,7 +981,7 @@
/**
* Removes/deletes Generic Entity records found by all of the specified
* fields (ie: combined using AND)
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param fields
@@ -993,7 +993,7 @@
/**
* Removes/deletes Generic Entity records found by the condition
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param condition
@@ -1004,7 +1004,7 @@
/**
* Removes/deletes Generic Entity records found by the condition
- *
+ *
* @param entityName
* The Name of the Entity as defined in the entity XML file
* @param condition
@@ -1018,7 +1018,7 @@
/**
* Remove a Generic Entity corresponding to the primaryKey
- *
+ *
* @param primaryKey
* The primary key of the entity to remove.
* @return int representing number of rows effected by this operation
@@ -1027,7 +1027,7 @@
/**
* Remove a Generic Entity corresponding to the primaryKey
- *
+ *
* @param primaryKey
* The primary key of the entity to remove.
* @param doCacheClear
@@ -1040,7 +1040,7 @@
/**
* Remove the named Related Entity for the GenericValue from the persistent
* store
- *
+ *
* @param relationName
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -1054,7 +1054,7 @@
/**
* Remove the named Related Entity for the GenericValue from the persistent
* store
- *
+ *
* @param relationName
* String containing the relation name which is the combination
* of relation.title and relation.rel-entity-name as specified in
@@ -1070,7 +1070,7 @@
/**
* Remove a Generic Value from the database
- *
+ *
* @param value
* The GenericValue object of the entity to remove.
* @return int representing number of rows effected by this operation
@@ -1079,7 +1079,7 @@
/**
* Remove a Generic Value from the database
- *
+ *
* @param value
* The GenericValue object of the entity to remove.
* @param doCacheClear
@@ -1112,7 +1112,7 @@
/**
* Store the Entity from the GenericValue to the persistent store
- *
+ *
* @param value
* GenericValue instance containing the entity
* @return int representing number of rows effected by this operation
@@ -1121,7 +1121,7 @@
/**
* Store the Entity from the GenericValue to the persistent store
- *
+ *
* @param value
* GenericValue instance containing the entity
* @param doCacheClear
@@ -1140,7 +1140,7 @@
* will either all succeed or all fail, if the data source supports
* transactions. This is just like to othersToStore feature of the
* GenericEntity on a create or store.
- *
+ *
* @param values
* List of GenericValue instances containing the entities to
* store
@@ -1157,7 +1157,7 @@
* will either all succeed or all fail, if the data source supports
* transactions. This is just like to othersToStore feature of the
* GenericEntity on a create or store.
- *
+ *
* @param values
* List of GenericValue instances containing the entities to
* store
@@ -1177,7 +1177,7 @@
* will either all succeed or all fail, if the data source supports
* transactions. This is just like to othersToStore feature of the
* GenericEntity on a create or store.
- *
+ *
* @param values
* List of GenericValue instances containing the entities to
* store
@@ -1193,7 +1193,7 @@
/**
* Store a group of values
- *
+ *
* @param entityName
* The name of the Entity as defined in the entity XML file
* @param fieldsToSet
@@ -1207,7 +1207,7 @@
/**
* Store a group of values
- *
+ *
* @param entityName
* The name of the Entity as defined in the entity XML file
* @param fieldsToSet
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/DelegatorFactoryImpl.java Wed Nov 18 06:13:52 2009
@@ -54,5 +54,5 @@
}
return delegator;
}
-
+
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Wed Nov 18 06:13:52 2009
@@ -118,7 +118,7 @@
private boolean testRollbackInProgress = false;
private List<TestOperation> testOperations = null;
private enum OperationType {INSERT, UPDATE, DELETE};
-
+
private String originalDelegatorName = null;
/** @deprecated Use Delegator delegator = DelegatorFactory.getDelegator(delegatorName);
@@ -341,7 +341,7 @@
public String getDelegatorName() {
return this.delegatorName;
}
-
+
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getOriginalDelegatorName()
*/
@@ -481,7 +481,7 @@
public ModelFieldType getEntityFieldType(ModelEntity entity, String type) throws GenericEntityException {
return this.getModelFieldTypeReader(entity).getModelFieldType(type);
}
-
+
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getModelFieldTypeReader(org.ofbiz.entity.model.ModelEntity)
*/
@@ -3181,7 +3181,7 @@
public GenericDelegator cloneDelegator() {
return this.cloneDelegator(this.delegatorName);
}
-
+
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#makeTestDelegator(java.lang.String)
*/
@@ -3200,7 +3200,7 @@
this.testOperations.clear();
}
}
-
+
private void storeForTestRollback(TestOperation testOperation) {
if (!this.testMode || this.testRollbackInProgress) {
throw new IllegalStateException("An attempt was made to store a TestOperation during rollback or outside of test mode");
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericEntity.java Wed Nov 18 06:13:52 2009
@@ -591,7 +591,7 @@
* The field's Java data type can be either <code>String</code> or
* <code>Number</code>. Invalid Java data types will throw
* <code>IllegalArgumentException</code>.
- *
+ *
* @param name The name of the desired field
* @return A <code>TimeDuration</code> instance or <code>null</code>
*/
@@ -601,11 +601,11 @@
return null;
}
try {
- Number number = (Number) obj;
+ Number number = (Number) obj;
return TimeDuration.fromNumber(number);
} catch (Exception e) {}
try {
- String duration = (String) obj;
+ String duration = (String) obj;
return TimeDuration.parseDuration(duration);
} catch (Exception e) {}
throw new IllegalArgumentException("getDuration could not map the object '" + obj.toString() + "' to TimeDuration type, incompatible object type: " + obj.getClass().getName());
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/cache/AbstractEntityConditionCache.java Wed Nov 18 06:13:52 2009
@@ -109,7 +109,7 @@
return conditionCache;
}
- protected static final <K,V> boolean isNull(Map<K,V> value) {
+ protected static final <K,V> boolean isNull(Map<K,V> value) {
return value == null || value == GenericEntity.NULL_ENTITY || value == GenericValue.NULL_VALUE;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java Wed Nov 18 06:13:52 2009
@@ -106,26 +106,26 @@
}
}
-
+
@Override
public EntityConditionValue freeze() {
return new EntityConditionSubSelect(localModelEntity, keyFieldName, (whereCond != null ? whereCond.freeze() : null), requireAll);
}
-
+
public String getKeyFieldName() {
return this.keyFieldName;
}
-
+
public ModelEntity getModelEntity() {
return this.localModelEntity;
}
-
+
@Override
public ModelField getModelField(ModelEntity modelEntity) {
// do nothing for now
return null;
}
-
+
@Override
public Comparable<?> getValue(Delegator delegator, Map<String, ? extends Object> map) {
// do nothing for now
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityExpr.java Wed Nov 18 06:13:52 2009
@@ -284,7 +284,7 @@
throw new IllegalArgumentException("Type " + curField.getType() + " not found for entity [" + modelEntity.getEntityName() + "]; probably because there is no datasource (helper) setup for the entity group that this entity is in: [" + delegator.getEntityGroupName(modelEntity.getEntityName()) + "]");
}
if (value instanceof EntityConditionSubSelect){
- ModelFieldType valueType=null;
+ ModelFieldType valueType = null;
try {
ModelEntity valueModelEntity= ((EntityConditionSubSelect) value).getModelEntity();
valueType = delegator.getEntityFieldType(valueModelEntity, valueModelEntity.getField(((EntityConditionSubSelect) value).getKeyFieldName()).getType());
@@ -303,7 +303,7 @@
String errMsg = "In entity field [" + modelEntity.getEntityName() + "." + curField.getName() + "] set the value passed in [" + value.getClass().getName() + "] is not compatible with the Java type of the field [" + type.getJavaType() + "]";
// eventually we should do this, but for now we'll do a "soft" failure: throw new IllegalArgumentException(errMsg);
Debug.logWarning(new Exception("Location of database type warning"), "=-=-=-=-=-=-=-=-= Database type warning in EntityExpr =-=-=-=-=-=-=-=-= " + errMsg, module);
- }
+ }
}
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java Wed Nov 18 06:13:52 2009
@@ -136,7 +136,7 @@
public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix, DatasourceInfo datasourceInfo) {
if (this.modelViewEntity != null) {
// NOTE: this section is a bit of a hack; the other code is terribly complex and really needs to be refactored to incorporate support for this
-
+
if (UtilValidate.isNotEmpty(entityAlias)) {
ModelEntity memberModelEntity = modelViewEntity.getMemberModelEntity(entityAlias);
ModelField modelField = memberModelEntity.getField(fieldName);
@@ -152,7 +152,7 @@
sql.append(".");
dotUsed = true;
}
-
+
}
sql.append(entityAlias);
sql.append("_");
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityJoinOperator.java Wed Nov 18 06:13:52 2009
@@ -107,11 +107,10 @@
visitor.visit(rhs);
}
-
public Boolean eval(GenericEntity entity, EntityCondition lhs, EntityCondition rhs) {
return entityMatches(entity, lhs, rhs) ? Boolean.TRUE : Boolean.FALSE;
}
-
+
@Override
public boolean entityMatches(GenericEntity entity, EntityCondition lhs, EntityCondition rhs) {
if (lhs.entityMatches(entity) == shortCircuitValue) return shortCircuitValue;
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityOperator.java Wed Nov 18 06:13:52 2009
@@ -229,7 +229,7 @@
}
if (obj instanceof EntityOperator) {
EntityOperator<?,?,?> otherOper = UtilGenerics.cast(obj);
- return this.idInt == otherOper.idInt;
+ return this.idInt == otherOper.idInt;
}
return false;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java Wed Nov 18 06:13:52 2009
@@ -621,7 +621,7 @@
if (modelEntity == null) {
return null;
}
-
+
ModelViewEntity modelViewEntity = null;
if (modelEntity instanceof ModelViewEntity) {
modelViewEntity = (ModelViewEntity) modelEntity;
@@ -683,7 +683,7 @@
// FROM clause and when necessary the JOIN or LEFT JOIN clause(s) as well
sqlBuffer.append(SqlJdbcUtil.makeFromClause(modelEntity, datasourceInfo));
-
+
// WHERE clause
List<EntityConditionParam> whereEntityConditionParams = FastList.newInstance();
StringBuilder whereString = makeConditionWhereString(modelEntity, whereEntityCondition, viewWhereConditions, whereEntityConditionParams);
@@ -691,7 +691,7 @@
sqlBuffer.append(" WHERE ");
sqlBuffer.append(whereString.toString());
}
-
+
// GROUP BY clause for view-entity
if (modelViewEntity != null) {
String groupByString = modelViewEntity.colNameString(modelViewEntity.getGroupBysCopy(selectFields), ", ", "", false);
@@ -721,7 +721,7 @@
orderByExpanded.addAll(viewOrderByList);
}
sqlBuffer.append(SqlJdbcUtil.makeOrderByClause(modelEntity, orderByExpanded, datasourceInfo));
-
+
// make the final SQL String
String sql = sqlBuffer.toString();
@@ -760,13 +760,13 @@
}
return new EntityListIterator(sqlP, modelEntity, selectFields, modelFieldTypeReader, this, whereEntityCondition, havingEntityCondition, findOptions.getDistinct());
}
-
+
protected StringBuilder makeConditionWhereString(ModelEntity modelEntity, EntityCondition whereEntityCondition, List<EntityCondition> viewWhereConditions, List<EntityConditionParam> whereEntityConditionParams) throws GenericEntityException {
ModelViewEntity modelViewEntity = null;
if (modelEntity instanceof ModelViewEntity) {
modelViewEntity = (ModelViewEntity) modelEntity;
}
-
+
String entityCondWhereString = "";
if (whereEntityCondition != null) {
entityCondWhereString = whereEntityCondition.makeWhereString(modelEntity, whereEntityConditionParams, this.datasourceInfo);
@@ -790,7 +790,7 @@
whereString.append(entityCondWhereString);
if (addParens) whereString.append(")");
}
-
+
if (UtilValidate.isNotEmpty(viewEntityCondWhereString)) {
if (whereString.length() > 0) whereString.append(" AND ");
boolean addParens = false;
@@ -808,21 +808,21 @@
whereString.append(viewClause);
if (addParens) whereString.append(")");
}
-
+
return whereString;
}
-
+
protected StringBuilder makeConditionHavingString(ModelEntity modelEntity, EntityCondition havingEntityCondition, List<EntityCondition> viewHavingConditions, List<EntityConditionParam> havingEntityConditionParams) throws GenericEntityException {
ModelViewEntity modelViewEntity = null;
if (modelEntity instanceof ModelViewEntity) {
modelViewEntity = (ModelViewEntity) modelEntity;
}
-
+
String entityCondHavingString = "";
if (havingEntityCondition != null) {
entityCondHavingString = havingEntityCondition.makeWhereString(modelEntity, havingEntityConditionParams, this.datasourceInfo);
}
-
+
String viewEntityCondHavingString = null;
if (modelViewEntity != null) {
EntityCondition viewHavingEntityCondition = EntityCondition.makeCondition(viewHavingConditions);
@@ -847,7 +847,7 @@
havingString.append(viewEntityCondHavingString);
if (addParens) havingString.append(")");
}
-
+
return havingString;
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/EntityFinderUtil.java Wed Nov 18 06:13:52 2009
@@ -211,7 +211,7 @@
value = StringUtil.split((String)value, delim);
}
}
-
+
if (modelEntity.getField(fieldName) == null) {
throw new IllegalArgumentException("Error in Entity Find: could not find field [" + fieldName + "] in entity with name [" + modelEntity.getEntityName() + "]");
}
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/finder/ListFinder.java Wed Nov 18 06:13:52 2009
@@ -237,7 +237,7 @@
throw new GeneralException(errMsg, e);
}
}
-
+
public List<String> getOrderByFieldList(Map<String, Object> context) {
List<String> orderByFields = EntityFinderUtil.makeOrderByFieldList(this.orderByExpanderList, context);
return orderByFields;
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=881681&r1=881680&r2=881681&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 Wed Nov 18 06:13:52 2009
@@ -177,10 +177,10 @@
if (condBuffer.length() == 0) {
throw new GenericModelException("No view-link/join key-maps found for the " + viewLink.getEntityAlias() + " and the " + viewLink.getRelEntityAlias() + " member-entities of the " + modelViewEntity.getEntityName() + " view-entity.");
}
-
+
// TODO add expression from entity-condition on view-link
-
-
+
+
restOfStatement.append(condBuffer.toString());
// don't put ending parenthesis
@@ -540,7 +540,7 @@
}
// ------------------------------------------
-
+
String fieldType = mft.getJavaType();
try {
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelFieldType.java Wed Nov 18 06:13:52 2009
@@ -57,7 +57,7 @@
/** The sql-type-alias of the Field, this is optional */
protected String sqlTypeAlias = null;
-
+
protected Converter<?, ?> sqlToJavaConverter = null;
/** validators to be called when an update is done */
@@ -137,7 +137,7 @@
}
/** Sets the SQL <code>Class</code> for this field.
- *
+ *
* @param sqlClass
*/
public synchronized void setSqlClass(Class<?> sqlClass) {
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=881681&r1=881680&r2=881681&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 Wed Nov 18 06:13:52 2009
@@ -93,7 +93,7 @@
protected List<String> groupByFields = FastList.newInstance();
protected Map<String, Map<String, ModelConversion>> conversions = FastMap.newInstance();
-
+
protected ViewEntityCondition viewEntityCondition = null;
public ModelViewEntity(ModelReader reader, Element entityElement, UtilTimer utilTimer, ModelInfo def) {
@@ -134,7 +134,7 @@
if (utilTimer != null) utilTimer.timerString(" createModelEntity: before relations");
this.populateRelated(reader, entityElement);
-
+
Element entityConditionElement = UtilXml.firstChildElement(entityElement, "entity-condition");
if (entityConditionElement != null) {
this.viewEntityCondition = new ViewEntityCondition(this, null, entityConditionElement);
@@ -290,26 +290,26 @@
public void addViewLink(ModelViewLink viewLink) {
this.viewLinks.add(viewLink);
}
-
+
public void populateViewEntityConditionInformation(ModelFieldTypeReader modelFieldTypeReader, List<EntityCondition> whereConditions, List<EntityCondition> havingConditions, List<String> orderByList, List<String> entityAliasStack) {
if (entityAliasStack == null) {
entityAliasStack = FastList.newInstance();
}
-
+
if (this.viewEntityCondition != null) {
EntityCondition whereCondition = this.viewEntityCondition.getWhereCondition(modelFieldTypeReader, entityAliasStack);
if (whereCondition != null) {
whereConditions.add(whereCondition);
}
}
-
+
if (this.viewEntityCondition != null) {
EntityCondition havingCondition = this.viewEntityCondition.getHavingCondition(modelFieldTypeReader, entityAliasStack);
if (havingCondition != null) {
havingConditions.add(havingCondition);
}
}
-
+
// add the current one first so it overrides the lower level ones
if (this.viewEntityCondition != null) {
List<String> currentOrderByList = this.viewEntityCondition.getOrderByList();
@@ -317,7 +317,7 @@
orderByList.addAll(currentOrderByList);
}
}
-
+
for (Map.Entry<String, ModelEntity> memberEntityEntry: this.memberModelEntities.entrySet()) {
if (memberEntityEntry.getValue() instanceof ModelViewEntity) {
ModelViewEntity memberViewEntity = (ModelViewEntity) memberEntityEntry.getValue();
@@ -1145,7 +1145,7 @@
}
}
}
-
+
public static class ViewEntityCondition {
protected ModelViewEntity modelViewEntity;
protected ModelViewLink modelViewLink;
@@ -1168,7 +1168,7 @@
orderByList.add(orderByElement.getAttribute("field-name"));
}
}
-
+
Element conditionExprElement = UtilXml.firstChildElement(element, "condition-expr");
Element conditionListElement = UtilXml.firstChildElement(element, "condition-list");
if (conditionExprElement != null) {
@@ -1182,11 +1182,11 @@
this.havingCondition = new ViewConditionList(this, havingConditionListElement);
}
}
-
+
public List<String> getOrderByList() {
return this.orderByList;
}
-
+
public EntityCondition getWhereCondition(ModelFieldTypeReader modelFieldTypeReader, List<String> entityAliasStack) {
if (this.whereCondition != null) {
return this.whereCondition.createCondition(modelFieldTypeReader, entityAliasStack);
@@ -1194,7 +1194,7 @@
return null;
}
}
-
+
public EntityCondition getHavingCondition(ModelFieldTypeReader modelFieldTypeReader, List<String> entityAliasStack) {
if (this.havingCondition != null) {
return this.havingCondition.createCondition(modelFieldTypeReader, entityAliasStack);
@@ -1207,7 +1207,7 @@
public static interface ViewCondition extends Serializable {
public EntityCondition createCondition(ModelFieldTypeReader modelFieldTypeReader, List<String> entityAliasStack);
}
-
+
public static class ViewConditionExpr implements ViewCondition {
protected ViewEntityCondition viewEntityCondition;
protected String entityAlias;
@@ -1228,7 +1228,7 @@
this.relFieldName = conditionExprElement.getAttribute("rel-field-name");
this.value = conditionExprElement.getAttribute("value");
this.ignoreCase = "true".equals(conditionExprElement.getAttribute("ignore-case"));
-
+
// if we are in a view-link, default to the entity-alias and rel-entity-alias there
if (this.viewEntityCondition.modelViewLink != null) {
if (UtilValidate.isEmpty(this.entityAlias)) {
@@ -1239,7 +1239,7 @@
}
}
}
-
+
public EntityCondition createCondition(ModelFieldTypeReader modelFieldTypeReader, List<String> entityAliasStack) {
EntityOperator<?,?,?> operator = EntityOperator.lookup(this.operator);
if (operator == null) {
@@ -1259,7 +1259,7 @@
value = StringUtil.split((String) value, delim);
}
}
-
+
if (this.viewEntityCondition.modelViewEntity.getField(fieldName) == null) {
throw new IllegalArgumentException("Error in Entity Find: could not find field [" + fieldName + "] in entity with name [" + this.viewEntityCondition.modelViewEntity.getEntityName() + "]");
}
@@ -1272,7 +1272,7 @@
}
if (Debug.verboseOn()) Debug.logVerbose("Got value for fieldName [" + fieldName + "]: " + value, module);
-
+
EntityConditionValue lhs = EntityFieldValue.makeFieldValue(this.fieldName, this.entityAlias, entityAliasStack, this.viewEntityCondition.modelViewEntity);
Object rhs = null;
if (value != null) {
@@ -1280,7 +1280,7 @@
} else {
rhs = EntityFieldValue.makeFieldValue(this.relFieldName, this.relEntityAlias, entityAliasStack, this.viewEntityCondition.modelViewEntity);
}
-
+
if (operator.equals(EntityOperator.NOT_EQUAL) && value != null) {
// since some databases don't consider nulls in != comparisons, explicitly include them
// this makes more sense logically, but if anyone ever needs it to not behave this way we should add an "or-null" attribute that is true by default
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java?rev=881681&r1=881680&r2=881681&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/testtools/EntityTestCase.java Wed Nov 18 06:13:52 2009
@@ -34,7 +34,7 @@
public void setDelegator(Delegator delegator) {
this.delegator = delegator;
}
-
+
public Delegator getDelegator() {
return delegator;
}