You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/12/21 12:10:24 UTC
svn commit: r1647120 - in /ofbiz/branches/release13.07: ./
framework/entity/src/org/ofbiz/entity/
framework/entity/src/org/ofbiz/entity/util/ framework/minilang/dtd/
framework/minilang/src/org/ofbiz/minilang/method/entityops/
Author: jleroux
Date: Sun Dec 21 11:10:23 2014
New Revision: 1647120
URL: http://svn.apache.org/r1647120
Log:
"Applied fix from trunk for revision: 1524704"
------------------------------------------------------------------------
r1524704 | jleroux | 2013-09-19 14:03:47 +0200 (jeu. 19 sept. 2013) | 6 lignes
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/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods-v2.xsd
ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods.xsd
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 21 11:10:23 2014
@@ -5,4 +5,4 @@
/ofbiz/branches/jquery:952958-1044489
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release12.04:1557118
-/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,1561467,
1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,1612202,16131
21,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984
+/ofbiz/trunk:1506269,1506499,1506504,1506828,1509164,1510042,1511279,1512376,1512573,1516094,1517629,1517702,1517780,1517947,1518336,1518950,1519245,1519999,1520319,1520321,1520326,1524361,1524676,1524704,1524769,1524835,1524950,1525523,1526276,1526387,1526463,1527212,1527254,1527609,1527626,1527810,1528144,1528146,1528149,1528298,1529412,1529418,1529588,1530273,1530634,1530876,1530972,1530976,1531848,1532342,1532366,1533542,1533839,1535961,1536170,1536656,1537023,1537086,1537179,1537996,1538096,1539147,1539156,1539781,1542264,1542388,1542442,1543744,1543766,1543781,1543994,1544444,1547548,1548143,1549015,1550255,1550258,1550515,1551585,1551744,1552149,1552290,1552500,1552901,1552908,1554064,1554242,1554265,1554290,1554373,1554536,1554681,1554685,1554706,1554764,1554787,1555142,1557409-1557410,1557427,1557440,1557443,1557447,1557456-1557457,1557462,1557593,1558145,1558241,1558373,1558774,1559814,1560048,1560056,1560176,1560203,1560205,1560699,1561286,1561290,1561305,1561311,1561327,
1561467,1562767,1563238,1563683,1563958,1564111,1564113,1564463,1564473,1564493,1566096,1566273,1569078,1569743,1570611,1570622,1570639-1570640,1571207,1571219,1571247,1573161,1573498,1573639,1574019,1574201,1574404,1575508,1576259,1576331,1576378,1576506,1576511,1576757,1576839,1577268,1577744,1579155,1579161,1579277,1579309,1580455,1580850,1581386,1581972,1581997,1582762,1583040,1583427-1583428,1583551,1583674,1583681,1583689,1583696,1584873,1585033,1585574,1585958-1585959,1586987,1587841,1587843,1588733,1589589,1589602,1589606,1589612,1589625,1589669,1592530,1592588,1592745,1592977,1593902,1593908,1593952,1597239,1597464,1598113,1598327,1598475,1598544,1598913,1603439,1603732,1603739,1604357,1604363,1604522,1604554,1605029,1605269,1605348,1605354,1605707,1607457,1608355,1608495,1608526,1608698,1609047,1609065,1609076,1609087,1609149,1609155,1609167,1609184,1609389,1609394,1609398,1609406,1609418,1609885,1609889,1610355,1610420,1610425,1610685,1610918,1610925,1611321,1612190,16122
02,1613121,1614019,1614025,1614280,1614355,1614366,1614556,1615296-1615297,1616272,1616684,1616940,1617229,1617473,1617480,1617936,1617938,1618395,1618397,1618570,1618831,1619087,1619098,1619300,1621335,1621363,1621413,1621436,1621438-1621439,1621442,1621599,1621683,1622050,1622170,1622672,1623370,1624538,1624767,1624809,1624817,1626797,1627230,1627763,1628096,1628130,1628937,1628940,1629382,1629391,1629426,1631203,1631299-1631300,1632764,1632793,1633100,1633188,1633550,1636864,1637883,1639606,1639835,1639840-1639841,1639846,1639863,1639887,1640288,1640299,1640515,1640717,1641066,1641131,1641165,1641548,1641804,1642423,1643341,1644904,1645950,1646204,1646935,1646977,1646984
Modified: ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/Delegator.java Sun Dec 21 11:10:23 2014
@@ -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;
/**
@@ -955,7 +961,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;
/**
@@ -1006,7 +1014,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;
@@ -1055,7 +1065,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;
/**
@@ -1094,7 +1106,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;
/**
@@ -1116,7 +1130,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;
/**
@@ -1148,7 +1164,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;
/**
@@ -1170,7 +1188,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();
@@ -1213,7 +1233,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;
/**
@@ -1251,7 +1273,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;
/**
@@ -1275,6 +1299,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;
@@ -1307,7 +1332,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/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Dec 21 11:10:23 2014
@@ -680,7 +680,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");
@@ -733,6 +735,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) {
@@ -824,7 +827,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 {
@@ -881,7 +886,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 {
@@ -913,7 +920,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
@@ -954,7 +961,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 {
@@ -1012,7 +1021,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;
@@ -1082,14 +1093,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);
@@ -1104,7 +1119,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 {
@@ -1149,7 +1166,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);
@@ -1175,7 +1194,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
@@ -1204,7 +1225,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 {
@@ -1249,7 +1272,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 {
@@ -1309,13 +1334,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) {
@@ -1405,7 +1434,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;
@@ -1804,7 +1835,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 {
@@ -1862,7 +1893,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 {
@@ -1871,7 +1902,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 {
@@ -1880,7 +1911,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/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java (original)
+++ ofbiz/branches/release13.07/framework/entity/src/org/ofbiz/entity/util/EntitySaxReader.java Sun Dec 21 11:10:23 2014
@@ -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/branches/release13.07/framework/minilang/dtd/simple-methods-v2.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods-v2.xsd?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods-v2.xsd (original)
+++ ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods-v2.xsd Sun Dec 21 11:10:23 2014
@@ -3234,7 +3234,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>
@@ -4082,7 +4082,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>
@@ -4122,7 +4122,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>
@@ -4153,7 +4153,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>
@@ -4193,7 +4193,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>
@@ -4221,7 +4221,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>
@@ -4390,7 +4390,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>
@@ -4420,7 +4420,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/branches/release13.07/framework/minilang/dtd/simple-methods.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods.xsd?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods.xsd (original)
+++ ofbiz/branches/release13.07/framework/minilang/dtd/simple-methods.xsd Sun Dec 21 11:10:23 2014
@@ -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/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Sun Dec 21 11:10:23 2014
@@ -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/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java Sun Dec 21 11:10:23 2014
@@ -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/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java Sun Dec 21 11:10:23 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public final class RemoveByAnd extends EntityOperation {
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;
@@ -61,6 +61,7 @@ public final class RemoveByAnd extends E
@Override
public boolean exec(MethodContext methodContext) throws MiniLangException {
+ @Deprecated
boolean doCacheClear = !"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
String entityName = entityNameFse.expandString(methodContext.getEnvMap());
if (entityName.isEmpty()) {
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java Sun Dec 21 11:10:23 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public final class RemoveList extends EntityOperation {
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 En
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 {
Delegator delegator = getDelegator(methodContext);
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java Sun Dec 21 11:10:23 2014
@@ -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 {
value.getDelegator().removeRelated(relationName, value, doCacheClear);
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java Sun Dec 21 11:10:23 2014
@@ -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 {
value.getDelegator().removeValue(value, doCacheClear);
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java Sun Dec 21 11:10:23 2014
@@ -41,7 +41,7 @@ import org.w3c.dom.Element;
public final class StoreList extends EntityOperation {
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 Ent
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 {
Delegator delegator = getDelegator(methodContext);
Modified: ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java?rev=1647120&r1=1647119&r2=1647120&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java (original)
+++ ofbiz/branches/release13.07/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java Sun Dec 21 11:10:23 2014
@@ -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 {
value.getDelegator().store(value, doCacheClear);