Author: jleroux
Date: Sun Dec 21 12:47:38 2014
New Revision: 1647132
URL: http://svn.apache.org/r1647132
Log:
Completes "Deprecate doCacheClear in Delegator interface and class and related
minilang classes" https://issues.apache.org/jira/browse/OFBIZ-5325
Removes useless deprecated things in trunk
Modified:
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/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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -20,7 +20,6 @@ package org.ofbiz.minilang.method.entity
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.minilang.MiniLangException;
@@ -40,8 +39,6 @@ public final class RefreshValue extends
public static final String module = RemoveValue.class.getName();
- @Deprecated
- private final FlexibleStringExpander doCacheClearFse;
private final FlexibleMapAccessor<GenericValue> valueFma;
public RefreshValue(Element element, SimpleMethod simpleMethod) throws
MiniLangException {
@@ -53,7 +50,6 @@ public final class RefreshValue extends
MiniLangValidate.noChildElements(simpleMethod, element);
}
valueFma =
FlexibleMapAccessor.getInstance(element.getAttribute("value-field"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -62,7 +58,6 @@ public final class RefreshValue extends
if (value == null) {
throw new MiniLangRuntimeException("Entity value not found with
name: " + valueFma, this);
}
- boolean doCacheClear =
!"false".equals(doCacheClearFse.expandString(methodContext.getEnvMap()));
try {
value.getDelegator().refresh(value);
} catch (GenericEntityException e) {
@@ -78,9 +73,6 @@ public final class RefreshValue extends
public String toString() {
StringBuilder sb = new StringBuilder("<refresh-value ");
sb.append("value-field=\"").append(this.valueFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -41,8 +41,6 @@ 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;
@@ -56,20 +54,18 @@ public final class RemoveByAnd extends E
}
entityNameFse =
FlexibleStringExpander.getInstance(element.getAttribute("entity-name"));
mapFma = FlexibleMapAccessor.getInstance(element.getAttribute("map"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@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()) {
throw new MiniLangRuntimeException("Entity name not found.", this);
}
try {
Delegator delegator = getDelegator(methodContext);
- delegator.removeByAnd(entityName,
mapFma.get(methodContext.getEnvMap()), doCacheClear);
+ delegator.removeByAnd(entityName,
mapFma.get(methodContext.getEnvMap()));
} catch (GenericEntityException e) {
String errMsg = "Exception thrown while removing entities: " +
e.getMessage();
Debug.logWarning(e, errMsg, module);
@@ -89,9 +85,6 @@ public final class RemoveByAnd extends E
StringBuilder sb = new StringBuilder("<remove-by-and ");
sb.append("entity-name=\"").append(this.entityNameFse).append("\" ");
sb.append("map=\"").append(this.mapFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -22,7 +22,6 @@ import java.util.List;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -41,8 +40,6 @@ 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;
public RemoveList(Element element, SimpleMethod simpleMethod) throws
MiniLangException {
@@ -54,7 +51,6 @@ public final class RemoveList extends En
MiniLangValidate.noChildElements(simpleMethod, element);
}
listFma =
FlexibleMapAccessor.getInstance(element.getAttribute("list"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -63,8 +59,6 @@ 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);
delegator.removeAll(values);
@@ -81,9 +75,6 @@ public final class RemoveList extends En
public String toString() {
StringBuilder sb = new StringBuilder("<remove-list ");
sb.append("list=\"").append(this.listFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -40,8 +40,6 @@ 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;
@@ -55,7 +53,6 @@ public final class RemoveRelated extends
}
valueFma =
FlexibleMapAccessor.getInstance(element.getAttribute("value-field"));
relationNameFse =
FlexibleStringExpander.getInstance(element.getAttribute("relation-name"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -65,8 +62,6 @@ 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);
} catch (GenericEntityException e) {
@@ -88,9 +83,6 @@ public final class RemoveRelated extends
StringBuilder sb = new StringBuilder("<remove-related ");
sb.append("value-field=\"").append(this.valueFma).append("\" ");
sb.append("relation-name=\"").append(this.relationNameFse).append("\"
");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -20,7 +20,6 @@ package org.ofbiz.minilang.method.entity
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.minilang.MiniLangException;
@@ -39,8 +38,6 @@ 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;
public RemoveValue(Element element, SimpleMethod simpleMethod) throws
MiniLangException {
@@ -52,7 +49,6 @@ public final class RemoveValue extends M
MiniLangValidate.noChildElements(simpleMethod, element);
}
valueFma =
FlexibleMapAccessor.getInstance(element.getAttribute("value-field"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -61,8 +57,6 @@ 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);
} catch (GenericEntityException e) {
@@ -78,9 +72,6 @@ public final class RemoveValue extends M
public String toString() {
StringBuilder sb = new StringBuilder("<remove-value ");
sb.append("value-field=\"").append(this.valueFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -22,7 +22,6 @@ import java.util.List;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -41,8 +40,6 @@ 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;
public StoreList(Element element, SimpleMethod simpleMethod) throws
MiniLangException {
@@ -54,7 +51,6 @@ public final class StoreList extends Ent
MiniLangValidate.noChildElements(simpleMethod, element);
}
listFma =
FlexibleMapAccessor.getInstance(element.getAttribute("list"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -63,8 +59,6 @@ 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);
delegator.storeAll(values);
@@ -81,9 +75,6 @@ public final class StoreList extends Ent
public String toString() {
StringBuilder sb = new StringBuilder("<store-list ");
sb.append("list=\"").append(this.listFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
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=1647132&r1=1647131&r2=1647132&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
Sun Dec 21 12:47:38 2014
@@ -20,7 +20,6 @@ package org.ofbiz.minilang.method.entity
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.collections.FlexibleMapAccessor;
-import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.minilang.MiniLangException;
@@ -39,8 +38,6 @@ 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;
public StoreValue(Element element, SimpleMethod simpleMethod) throws
MiniLangException {
@@ -52,7 +49,6 @@ public final class StoreValue extends Me
MiniLangValidate.noChildElements(simpleMethod, element);
}
valueFma =
FlexibleMapAccessor.getInstance(element.getAttribute("value-field"));
- doCacheClearFse =
FlexibleStringExpander.getInstance(element.getAttribute("do-cache-clear"));
}
@Override
@@ -61,8 +57,6 @@ 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);
} catch (GenericEntityException e) {
@@ -78,9 +72,6 @@ public final class StoreValue extends Me
public String toString() {
StringBuilder sb = new StringBuilder("<store-value ");
sb.append("value-field=\"").append(this.valueFma).append("\" ");
- if (!doCacheClearFse.isEmpty()) {
-
sb.append("do-cache-clear=\"").append(this.doCacheClearFse).append("\" ");
- }
sb.append("/>");
return sb.toString();
}
