Author: jleroux
Date: Thu Sep 19 12:03:47 2013
New Revision: 1524704
URL: http://svn.apache.org/r1524704
Log:
A patch for "Deprecate doCacheClear in Delegator interface and class and
related minilang classes" https://issues.apache.org/jira/browse/OFBIZ-5325
* Deprecates methods in Delegator interface and class
* Deprecates cache clear related variable and methods in EntitySaxReader class
* Deprecates cache clear related variables in minilang related delegator classes
* In simple-method schema annotations, marks do-cache-clear attribute as
deprecated
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd
ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.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=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/Delegator.java Thu Sep 19
12:03:47 2013
@@ -163,7 +163,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return GenericValue instance containing the new instance
+ * @deprecated use {@link #create(GenericPK primaryKey)}
*/
+ @Deprecated
public GenericValue create(GenericPK primaryKey, boolean doCacheClear)
throws GenericEntityException;
/**
@@ -187,7 +189,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return GenericValue instance containing the new instance
+ * @deprecated use {@link #create(GenericValue value)}
*/
+ @Deprecated
public GenericValue create(GenericValue value, boolean doCacheClear)
throws GenericEntityException;
/**
@@ -227,7 +231,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return GenericValue instance containing the new or updated instance
+ * @deprecated use {@link #createOrStore(GenericValue value)}
*/
+ @Deprecated
public GenericValue createOrStore(GenericValue value, boolean
doCacheClear) throws GenericEntityException;
/**
@@ -965,7 +971,9 @@ public interface Delegator {
* boolean that specifies whether or not to automatically clear
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
+ * @deprecated use {@link #refresh(GenericValue value)}
*/
+ @Deprecated
public void refresh(GenericValue value, boolean doCacheClear) throws
GenericEntityException;
/**
@@ -1016,7 +1024,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeAll(List<? extends GenericEntity>
dummyPKs)}
*/
+ @Deprecated
public int removeAll(List<? extends GenericEntity> dummyPKs, boolean
doCacheClear) throws GenericEntityException;
public int removeAll(String entityName) throws GenericEntityException;
@@ -1065,7 +1075,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeByAnd(String entityName, Map<String, ?
extends Object> fields)}
*/
+ @Deprecated
public int removeByAnd(String entityName, Map<String, ? extends Object>
fields, boolean doCacheClear) throws GenericEntityException;
/**
@@ -1104,7 +1116,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeByCondition(String entityName,
EntityCondition condition)}
*/
+ @Deprecated
public int removeByCondition(String entityName, EntityCondition condition,
boolean doCacheClear) throws GenericEntityException;
/**
@@ -1126,7 +1140,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeByPrimaryKey(GenericPK primaryKey)}
*/
+ @Deprecated
public int removeByPrimaryKey(GenericPK primaryKey, boolean doCacheClear)
throws GenericEntityException;
/**
@@ -1158,7 +1174,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeRelated(String relationName, GenericValue
value)}
*/
+ @Deprecated
public int removeRelated(String relationName, GenericValue value, boolean
doCacheClear) throws GenericEntityException;
/**
@@ -1180,7 +1198,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #removeValue(GenericValue value)}
*/
+ @Deprecated
public int removeValue(GenericValue value, boolean doCacheClear) throws
GenericEntityException;
public void rollback();
@@ -1223,7 +1243,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #store(GenericValue value)}
*/
+ @Deprecated
public int store(GenericValue value, boolean doCacheClear) throws
GenericEntityException;
/**
@@ -1261,7 +1283,9 @@ public interface Delegator {
* cache entries related to this operation. This should always
be
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #storeAll(List<GenericValue> values)}
*/
+ @Deprecated
public int storeAll(List<GenericValue> values, boolean doCacheClear)
throws GenericEntityException;
/**
@@ -1285,6 +1309,7 @@ public interface Delegator {
* boolean that specifies whether or not to automatically create
* "dummy" place holder FKs
* @return int representing number of rows effected by this operation
+ * @deprecated use {@link #storeAll(GenericValue value, boolean
createDummyFks)}
*/
public int storeAll(List<GenericValue> values, boolean doCacheClear,
boolean createDummyFks) throws GenericEntityException;
@@ -1317,7 +1342,9 @@ public interface Delegator {
* <code>true</code> - otherwise you will lose data integrity.
* @return int representing number of rows effected by this operation
* @throws GenericEntityException
+ * @deprecated use {@link #storeByCondition(String entityName, Map<String,
? extends Object> fieldsToSet, EntityCondition condition)}
*/
+ @Deprecated
public int storeByCondition(String entityName, Map<String, ? extends
Object> fieldsToSet, EntityCondition condition, boolean doCacheClear) throws
GenericEntityException;
/**
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=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Thu
Sep 19 12:03:47 2013
@@ -679,7 +679,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#create(org.ofbiz.entity.GenericPK,
boolean)
+ * @deprecated use {@link #create(GenericPK primaryKey)}
*/
+ @Deprecated
public GenericValue create(GenericPK primaryKey, boolean doCacheClear)
throws GenericEntityException {
if (primaryKey == null) {
throw new GenericEntityException("Cannot create from a null
primaryKey");
@@ -732,6 +734,7 @@ public class GenericDelegator implements
* @see
org.ofbiz.entity.Delegator#createSetNextSeqId(org.ofbiz.entity.GenericValue)
*/
public GenericValue createSetNextSeqId(GenericValue value) throws
GenericEntityException {
+ @Deprecated
boolean doCacheClear = true;
if (value == null) {
@@ -836,7 +839,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#create(org.ofbiz.entity.GenericValue,
boolean)
+ * @deprecated use {@link #create(GenericValue value)}
*/
+ @Deprecated
public GenericValue create(GenericValue value, boolean doCacheClear)
throws GenericEntityException {
boolean beganTransaction = false;
try {
@@ -902,7 +907,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see
org.ofbiz.entity.Delegator#createOrStore(org.ofbiz.entity.GenericValue, boolean)
+ * @deprecated use {@link #createOrStore(GenericValue value)}
*/
+ @Deprecated
public GenericValue createOrStore(GenericValue value, boolean
doCacheClear) throws GenericEntityException {
boolean beganTransaction = false;
try {
@@ -943,7 +950,7 @@ public class GenericDelegator implements
*/
public GenericValue createOrStore(GenericValue value) throws
GenericEntityException {
return createOrStore(value, true);
- }
+ }
protected void saveEntitySyncRemoveInfo(GenericEntity dummyPK) throws
GenericEntityException {
// don't store remove info on entities where it is disabled
@@ -984,7 +991,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see
org.ofbiz.entity.Delegator#removeByPrimaryKey(org.ofbiz.entity.GenericPK,
boolean)
+ * @deprecated use {@link #removeByPrimaryKey(GenericPK primaryKey)}
*/
+ @Deprecated
public int removeByPrimaryKey(GenericPK primaryKey, boolean doCacheClear)
throws GenericEntityException {
boolean beganTransaction = false;
try {
@@ -1051,7 +1060,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see
org.ofbiz.entity.Delegator#removeValue(org.ofbiz.entity.GenericValue, boolean)
+ * @deprecated use {@link #removeValue(GenericValue value)}
*/
+ @Deprecated
public int removeValue(GenericValue value, boolean doCacheClear) throws
GenericEntityException {
// NOTE: this does not call the GenericDelegator.removeByPrimaryKey
method because it has more information to pass to the ECA rule hander
boolean beganTransaction = false;
@@ -1130,14 +1141,18 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#removeByAnd(java.lang.String, boolean,
java.lang.Object)
+ * @deprecated use {@link #removeByAnd(String entityName, Object...
fields)}
*/
+ @Deprecated
public int removeByAnd(String entityName, boolean doCacheClear, Object...
fields) throws GenericEntityException {
return removeByAnd(entityName, UtilMisc.<String, Object>toMap(fields),
doCacheClear);
}
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#removeByAnd(java.lang.String,
java.util.Map, boolean)
+ * @deprecated use {@link #removeByAnd(String entityName, Map<String, ?
extends Object> fields)}}
*/
+ @Deprecated
public int removeByAnd(String entityName, Map<String, ? extends Object>
fields, boolean doCacheClear) throws GenericEntityException {
EntityCondition ecl = EntityCondition.makeCondition(fields);
return removeByCondition(entityName, ecl, doCacheClear);
@@ -1152,7 +1167,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#removeByCondition(java.lang.String,
org.ofbiz.entity.condition.EntityCondition, boolean)
+ * @deprecated use {@link #removeByCondition(String entityName,
EntityCondition condition)}
*/
+ @Deprecated
public int removeByCondition(String entityName, EntityCondition condition,
boolean doCacheClear) throws GenericEntityException {
boolean beganTransaction = false;
try {
@@ -1207,7 +1224,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#removeRelated(java.lang.String,
org.ofbiz.entity.GenericValue, boolean)
+ * @deprecated use {@link #removeRelated(String relationName, GenericValue
value)}
*/
+ @Deprecated
public int removeRelated(String relationName, GenericValue value, boolean
doCacheClear) throws GenericEntityException {
ModelEntity modelEntity = value.getModelEntity();
ModelRelation relation = modelEntity.getRelation(relationName);
@@ -1233,7 +1252,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#refresh(org.ofbiz.entity.GenericValue,
boolean)
+ * @deprecated use {@link #refresh(GenericValue value)}
*/
+ @Deprecated
public void refresh(GenericValue value, boolean doCacheClear) throws
GenericEntityException {
if (doCacheClear) {
// always clear cache before the operation
@@ -1262,7 +1283,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#storeByCondition(java.lang.String,
java.util.Map, org.ofbiz.entity.condition.EntityCondition, boolean)
+ * @deprecated use {@link #storeByCondition(String entityName, Map<String,
? extends Object> fieldsToSet, EntityCondition condition)}
*/
+ @Deprecated
public int storeByCondition(String entityName, Map<String, ? extends
Object> fieldsToSet, EntityCondition condition, boolean doCacheClear) throws
GenericEntityException {
boolean beganTransaction = false;
try {
@@ -1317,7 +1340,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#store(org.ofbiz.entity.GenericValue,
boolean)
+ * @deprecated use {@link #store(GenericValue value)}
*/
+ @Deprecated
public int store(GenericValue value, boolean doCacheClear) throws
GenericEntityException {
boolean beganTransaction = false;
try {
@@ -1386,13 +1411,17 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#storeAll(java.util.List, boolean)
+ * @deprecated use {@link #storeAll(List<GenericValue> values)}
+ * TODO: JLR 2013-09-19 - doCacheClear refactoring: to be removed and
replaced by storeAll(List<GenericValue> values, boolean createDummyFks)
*/
+ @Deprecated
public int storeAll(List<GenericValue> values, boolean doCacheClear)
throws GenericEntityException {
return this.storeAll(values, doCacheClear, false);
}
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#storeAll(java.util.List, boolean,
boolean)
+ * TODO: JLR 2013-09-19 - doCacheClear refactoring: to be changed to
storeAll(List<GenericValue> values, boolean createDummyFks)
*/
public int storeAll(List<GenericValue> values, boolean doCacheClear,
boolean createDummyFks) throws GenericEntityException {
if (values == null) {
@@ -1491,7 +1520,9 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#removeAll(java.util.List, boolean)
+ * @deprecated use {@link #removeAll(List<? extends GenericEntity>
dummyPKs)}
*/
+ @Deprecated
public int removeAll(List<? extends GenericEntity> dummyPKs, boolean
doCacheClear) throws GenericEntityException {
if (dummyPKs == null) {
return 0;
@@ -1945,7 +1976,7 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getRelated(java.lang.String,
java.util.Map, java.util.List, org.ofbiz.entity.GenericValue)
- * @deprecated use {@link #getRelated(String, Map, List, GenericValue,
boolean)
+ * @deprecated use {@link #getRelated(String, Map, List, GenericValue,
boolean)}
*/
@Deprecated
public List<GenericValue> getRelated(String relationName, Map<String, ?
extends Object> byAndFields, List<String> orderBy, GenericValue value) throws
GenericEntityException {
@@ -2003,7 +2034,7 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getRelatedCache(java.lang.String,
org.ofbiz.entity.GenericValue)
- * @deprecated use {@link #getRelated(String, Map, List, GenericValue,
boolean)
+ * @deprecated use {@link #getRelated(String, Map, List, GenericValue,
boolean)}
*/
@Deprecated
public List<GenericValue> getRelatedCache(String relationName,
GenericValue value) throws GenericEntityException {
@@ -2012,7 +2043,7 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getRelatedOne(java.lang.String,
org.ofbiz.entity.GenericValue, boolean)
- * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)
+ * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)}
*/
@Deprecated
public GenericValue getRelatedOne(String relationName, GenericValue value)
throws GenericEntityException {
@@ -2021,7 +2052,7 @@ public class GenericDelegator implements
/* (non-Javadoc)
* @see org.ofbiz.entity.Delegator#getRelatedOneCache(java.lang.String,
org.ofbiz.entity.GenericValue, boolean)
- * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)
+ * @deprecated use {@link #getRelatedOne(String, GenericValue, boolean)}
*/
@Deprecated
public GenericValue getRelatedOneCache(String relationName, GenericValue
value) throws GenericEntityException {
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=1524704&r1=1524703&r2=1524704&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
Thu Sep 19 12:03:47 2013
@@ -94,6 +94,7 @@ public class EntitySaxReader implements
protected boolean maintainTxStamps = false;
protected boolean createDummyFks = false;
protected boolean checkDataOnly = false;
+ @Deprecated
protected boolean doCacheClear = true;
protected boolean disableEeca = false;
protected enum Action {CREATE, CREATE_UPDATE, CREATE_REPLACE, DELETE};
@@ -177,10 +178,12 @@ public class EntitySaxReader implements
this.checkDataOnly = checkDataOnly;
}
+ @Deprecated
public boolean getDoCacheClear() {
return this.doCacheClear;
}
+ @Deprecated
public void setDoCacheClear(boolean doCacheClear) {
this.doCacheClear = doCacheClear;
}
@@ -556,6 +559,7 @@ public class EntitySaxReader implements
}
// check the do-cache-clear flag
+ @Deprecated
CharSequence doCacheClear = attributes.getValue("do-cache-clear");
if (doCacheClear != null) {
this.setDoCacheClear("true".equalsIgnoreCase(doCacheClear.toString()));
Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods-v2.xsd Thu Sep 19
12:03:47 2013
@@ -3228,7 +3228,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant.
</xs:documentation>
</xs:annotation>
@@ -4106,7 +4106,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4146,7 +4146,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4176,7 +4176,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4215,7 +4215,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4243,7 +4243,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4411,7 +4411,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
@@ -4440,7 +4440,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Clear the cache. Defaults to "true".
-
+ Deprecated - should always be true
Optional. Attribute type: constant, ${expression}.
</xs:documentation>
</xs:annotation>
Modified: ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
--- ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/trunk/framework/minilang/dtd/simple-methods.xsd Thu Sep 19 12:03:47
2013
@@ -2990,7 +2990,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3036,7 +3037,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3101,7 +3103,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3165,7 +3168,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3205,7 +3209,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3358,7 +3363,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
@@ -3391,7 +3397,8 @@ under the License.
<xs:attribute name="do-cache-clear" default="true">
<xs:annotation>
<xs:documentation>
- Clear the cache, defaults to true
+ Clear the cache. Defaults to "true".
+ Deprecated - should always be true
</xs:documentation>
</xs:annotation>
<xs:simpleType>
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
Thu Sep 19 12:03:47 2013
@@ -39,6 +39,7 @@ public final class CreateValue extends M
public static final String module = CreateValue.class.getName();
private final boolean createOrStore;
+ @Deprecated
private final boolean doCacheClear;
private final FlexibleMapAccessor<GenericValue> valueFma;
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
Thu Sep 19 12:03:47 2013
@@ -40,6 +40,7 @@ public final class RefreshValue extends
public static final String module = RemoveValue.class.getName();
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<GenericValue> valueFma;
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
Thu Sep 19 12:03:47 2013
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
public final class RemoveByAnd extends MethodOperation {
public static final String module = RemoveByAnd.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleStringExpander entityNameFse;
private final FlexibleMapAccessor<Map<String, ? extends Object>> mapFma;
@@ -60,6 +60,7 @@ public final class RemoveByAnd extends M
@Override
public boolean exec(MethodContext methodContext) throws MiniLangException {
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
String entityName =
entityNameFse.expandString(methodContext.getEnvMap());
try {
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
Thu Sep 19 12:03:47 2013
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public final class RemoveList extends MethodOperation {
public static final String module = RemoveList.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<List<GenericValue>> listFma;
@@ -63,6 +63,7 @@ public final class RemoveList extends Me
if (values == null) {
throw new MiniLangRuntimeException("Entity value list not found
with name: " + listFma, this);
}
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
methodContext.getDelegator().removeAll(values, doCacheClear);
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
Thu Sep 19 12:03:47 2013
@@ -40,7 +40,7 @@ import org.w3c.dom.Element;
public final class RemoveRelated extends MethodOperation {
public static final String module = RemoveRelated.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleStringExpander relationNameFse;
private final FlexibleMapAccessor<GenericValue> valueFma;
@@ -65,6 +65,7 @@ public final class RemoveRelated extends
throw new MiniLangRuntimeException("Entity value not found with
name: " + valueFma, this);
}
String relationName =
relationNameFse.expandString(methodContext.getEnvMap());
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
methodContext.getDelegator().removeRelated(relationName, value,
doCacheClear);
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
Thu Sep 19 12:03:47 2013
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
public final class RemoveValue extends MethodOperation {
public static final String module = RemoveValue.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<GenericValue> valueFma;
@@ -61,6 +61,7 @@ public final class RemoveValue extends M
if (value == null) {
throw new MiniLangRuntimeException("Entity value not found with
name: " + valueFma, this);
}
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
methodContext.getDelegator().removeValue(value, doCacheClear);
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
Thu Sep 19 12:03:47 2013
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public final class StoreList extends MethodOperation {
public static final String module = StoreList.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<List<GenericValue>> listFma;
@@ -63,6 +63,7 @@ public final class StoreList extends Met
if (values == null) {
throw new MiniLangRuntimeException("Entity value list not found
with name: " + listFma, this);
}
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
methodContext.getDelegator().storeAll(values, doCacheClear);
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=1524704&r1=1524703&r2=1524704&view=diff
==============================================================================
---
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
(original)
+++
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
Thu Sep 19 12:03:47 2013
@@ -39,7 +39,7 @@ import org.w3c.dom.Element;
public final class StoreValue extends MethodOperation {
public static final String module = StoreValue.class.getName();
-
+ @Deprecated
private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<GenericValue> valueFma;
@@ -61,6 +61,7 @@ public final class StoreValue extends Me
if (value == null) {
throw new MiniLangRuntimeException("Entity value not found with
name: " + valueFma, this);
}
+ @Deprecated
boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
methodContext.getDelegator().store(value, doCacheClear);
