This is an automated email from the ASF dual-hosted git repository.
danwatford pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new e69f58fe4a Improved: Minor refactoring in Product Category classes
(OFBIZ-10134)
e69f58fe4a is described below
commit e69f58fe4af1b06f361ac2328daff3e510031295
Author: cshan-ecomify <117295991+cshan-ecom...@users.noreply.github.com>
AuthorDate: Tue Feb 7 09:23:47 2023 +0100
Improved: Minor refactoring in Product Category classes (OFBIZ-10134)
Refactoring applied to improve readability.
Thanks Dennis Balkir and cshan-ecomify for changes and PR.
---
.../product/category/CatalogUrlDirective.java | 2 ++
.../ofbiz/product/category/CatalogUrlServlet.java | 8 +++--
.../ofbiz/product/category/CategoryWorker.java | 35 ++++++++++++----------
.../product/category/SeoCatalogUrlServlet.java | 8 +++--
.../ofbiz/product/category/SeoContextFilter.java | 1 -
5 files changed, 34 insertions(+), 20 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
index 81df3592b7..858d688769 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlDirective.java
@@ -35,10 +35,12 @@ import freemarker.template.utility.DeepUnwrap;
/**
* CatalogUrlDirective - Freemarker Template Directive for generating URLs
suitable for use by the CatalogUrlServlet
+ *
* Accepts the following arguments (see CatalogUrlServlet for their
definition):
* productId
* currentCategoryId
* previousCategoryId
+ *
*/
public class CatalogUrlDirective implements TemplateDirectiveModel {
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
index f609df817b..d6bb07655e 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlServlet.java
@@ -161,7 +161,9 @@ public class CatalogUrlServlet extends HttpServlet {
List<String> trail = CategoryWorker.getTrail(request);
trail = CategoryWorker.adjustTrail(trail, currentCategoryId,
previousCategoryId);
for (String trailCategoryId: trail) {
- if ("TOP".equals(trailCategoryId)) continue;
+ if ("TOP".equals(trailCategoryId)) {
+ continue;
+ }
urlBuilder.append("/");
urlBuilder.append(trailCategoryId);
}
@@ -187,7 +189,9 @@ public class CatalogUrlServlet extends HttpServlet {
if (UtilValidate.isNotEmpty(currentCategoryId)) {
crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId,
previousCategoryId);
for (String trailCategoryId: crumb) {
- if ("TOP".equals(trailCategoryId)) continue;
+ if ("TOP".equals(trailCategoryId)) {
+ continue;
+ }
urlBuilder.append("/");
urlBuilder.append(trailCategoryId);
}
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
index 2ed9f01039..441c1fffc1 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryWorker.java
@@ -216,7 +216,9 @@ public final class CategoryWorker {
}
public static long categoryMemberCount(GenericValue category) {
- if (category == null) return 0;
+ if (category == null) {
+ return 0;
+ }
Delegator delegator = category.getDelegator();
long count = 0;
try {
@@ -229,7 +231,9 @@ public final class CategoryWorker {
}
public static long categoryRollupCount(GenericValue category) {
- if (category == null) return 0;
+ if (category == null) {
+ return 0;
+ }
Delegator delegator = category.getDelegator();
long count = 0;
try {
@@ -281,13 +285,12 @@ public final class CategoryWorker {
}
}
return trail;
- } else {
- // current category is not in the list, and no previous
category was specified, go back to the beginning
- trail.clear();
- trail.add("TOP");
- if (UtilValidate.isNotEmpty(previousCategoryId)) {
- trail.add(previousCategoryId);
- }
+ }
+ // current category is not in the list, and no previous category
was specified, go back to the beginning
+ trail.clear();
+ trail.add("TOP");
+ if (UtilValidate.isNotEmpty(previousCategoryId)) {
+ trail.add(previousCategoryId);
}
}
@@ -339,14 +342,17 @@ public final class CategoryWorker {
if (UtilValidate.isNotEmpty(crumb)) {
return crumb.get(crumb.size() - 1);
- } else {
- return null;
}
+ return null;
}
public static boolean isProductInCategory(Delegator delegator, String
productId, String productCategoryId) throws GenericEntityException {
- if (productCategoryId == null) return false;
- if (UtilValidate.isEmpty(productId)) return false;
+ if (productCategoryId == null) {
+ return false;
+ }
+ if (UtilValidate.isEmpty(productId)) {
+ return false;
+ }
List<GenericValue> productCategoryMembers =
EntityQuery.use(delegator).from("ProductCategoryMember")
.where("productCategoryId", productCategoryId, "productId",
productId)
@@ -446,9 +452,8 @@ public final class CategoryWorker {
parentProductCategoryId = trailCategoryId;
if (trailElements.contains(trailCategoryId)) {
break;
- } else {
- trailElements.add(trailCategoryId);
}
+ trailElements.add(trailCategoryId);
}
} else {
parentProductCategoryId = null;
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
index 60fe57da53..6f46604972 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoCatalogUrlServlet.java
@@ -150,7 +150,9 @@ public class SeoCatalogUrlServlet extends HttpServlet {
List<String> trail = CategoryWorker.getTrail(request);
trail = CategoryWorker.adjustTrail(trail, currentCategoryId,
previousCategoryId);
for (String trailCategoryId : trail) {
- if ("TOP".equals(trailCategoryId)) continue;
+ if ("TOP".equals(trailCategoryId)) {
+ continue;
+ }
urlBuilder.append("/");
urlBuilder.append(trailCategoryId);
}
@@ -176,7 +178,9 @@ public class SeoCatalogUrlServlet extends HttpServlet {
if (UtilValidate.isNotEmpty(currentCategoryId)) {
crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId,
previousCategoryId);
for (String trailCategoryId : crumb) {
- if ("TOP".equals(trailCategoryId)) continue;
+ if ("TOP".equals(trailCategoryId)) {
+ continue;
+ }
urlBuilder.append("/");
urlBuilder.append(trailCategoryId);
}
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
index eee52f8e99..bea4d8a7ae 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoContextFilter.java
@@ -213,7 +213,6 @@ public final class SeoContextFilter implements Filter {
if
(!redirectPath.toLowerCase(Locale.getDefault()).startsWith("http")) {
redirectPath = httpRequest.getContextPath() +
redirectPath;
}
- // httpResponse.sendRedirect(redirectPath);
if ("".equals(uri) || "/".equals(uri)) {
// redirect without any url change in browser
RequestDispatcher rd =
request.getRequestDispatcher(redirectPath);
