This is an automated email from the ASF dual-hosted git repository.
mbrohl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 625b80dbc626db35dddbaa62057e34b20ae7c38c
Author: Michael Brohl <michael.br...@ecomify.de>
AuthorDate: Fri Feb 2 13:06:38 2024 +0100
Implemented: Use the rendered cache in content wrappers (OFBIZ-10194)
---
.../org/apache/ofbiz/product/category/CategoryContentWrapper.java | 4 +++-
.../ofbiz/product/config/ProductConfigItemContentWrapper.java | 4 +++-
.../org/apache/ofbiz/product/product/ProductContentWrapper.java | 5 +++--
.../apache/ofbiz/product/product/ProductPromoContentWrapper.java | 4 +++-
.../apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java | 6 ++++--
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
index 529a1d9c87..d6a5e8ecac 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryContentWrapper.java
@@ -118,8 +118,10 @@ public class CategoryContentWrapper implements
ContentWrapper {
String outString = null;
try {
Writer outWriter = new StringWriter();
+ // Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+ // may be configured with short expire time
getProductCategoryContentAsText(null, productCategory,
prodCatContentTypeId, locale, mimeTypeId, delegator,
- dispatcher, outWriter, false);
+ dispatcher, outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering CategoryContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
index 2100a45c57..a1e47ef70e 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/config/ProductConfigItemContentWrapper.java
@@ -149,8 +149,10 @@ public class ProductConfigItemContentWrapper implements
ContentWrapper {
try {
Writer outWriter = new StringWriter();
+ // Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+ // may be configured with short expire time
getProductConfigItemContentAsText(null, productConfigItem,
confItemContentTypeId, locale, mimeTypeId, delegator, dispatcher,
- outWriter, false);
+ outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering ProdConfItemContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
index 473e5d4606..f80918aa33 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductContentWrapper.java
@@ -124,9 +124,10 @@ public class ProductContentWrapper implements
ContentWrapper {
String outString = null;
try {
Writer outWriter = new StringWriter();
+ // Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+ // may be configured with short expire time
getProductContentAsText(null, product, productContentTypeId,
locale, mimeTypeId, partyId, roleTypeId,
- delegator, dispatcher,
- outWriter, false);
+ delegator, dispatcher, outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering ProductContent", MODULE);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
index 86f2aa8141..175b31d0c0 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductPromoContentWrapper.java
@@ -130,8 +130,10 @@ public class ProductPromoContentWrapper implements
ContentWrapper {
String outString = null;
try {
Writer outWriter = new StringWriter();
+ // Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+ // may be configured with short expire time
getProductPromoContentAsText(null, productPromo,
productPromoContentTypeId, locale, mimeTypeId, partyId, roleTypeId,
- delegator, dispatcher, outWriter, false);
+ delegator, dispatcher, outWriter, true);
outString = outWriter.toString();
} catch (GeneralException | IOException e) {
Debug.logError(e, "Error rendering ProductPromoContent", MODULE);
diff --git
a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
index 0305450c45..fe672f312e 100644
---
a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
+++
b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/content/WorkEffortContentWrapper.java
@@ -287,8 +287,10 @@ public class WorkEffortContentWrapper implements
ContentWrapper {
}
Writer outWriter = new StringWriter();
- getWorkEffortContentAsText(contentId, null, workEffort,
workEffortContentTypeId, locale, mimeTypeId, delegator, dispatcher,
- outWriter, false);
+ // Use cache == true to have entity-cache managed content from
cache while (not managed) rendered cache above
+ // may be configured with short expire time
+ getWorkEffortContentAsText(contentId, null, workEffort,
workEffortContentTypeId, locale, mimeTypeId,
+ delegator, dispatcher, outWriter, true);
String outString = outWriter.toString();
if (UtilValidate.isEmpty(outString)) {
outString =
workEffort.getModelEntity().isField(candidateFieldName) ?
workEffort.getString(candidateFieldName) : "";
