This is an automated email from the ASF dual-hosted git repository.
jleroux 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 a33459d Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
a33459d is described below
commit a33459dd724a997a5d48641fc8839d4ecc6f7bfc
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Dec 5 19:07:16 2021 +0100
Improved: Fix some bugs Spotbugs reports (OFBIZ-12386)
Renames OfbizControlServlet class to CategoryControlServlet. That name
better
corresponds to the reality.
Removes unused/useless var in CatalogUrlSeoFilter and SeoControlServlet
---
.../apache/ofbiz/product/category/CatalogUrlSeoFilter.java | 14 +-------------
...fbizControlServlet.java => CategoryControlServlet.java} | 10 +++++-----
.../apache/ofbiz/product/category/SeoControlServlet.java | 4 +---
3 files changed, 7 insertions(+), 21 deletions(-)
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
index b1cb981..b4fe4f9 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CatalogUrlSeoFilter.java
@@ -28,18 +28,12 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.common.UrlServletHelper;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.product.category.ftl.CatalogUrlSeoTransform;
public class CatalogUrlSeoFilter extends CatalogUrlFilter {
- private static final String MODULE = CatalogUrlSeoFilter.class.getName();
-
- private String defaultLocaleString = null;
- private String redirectUrl = null;
-
@Override
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
@@ -52,15 +46,9 @@ public class CatalogUrlSeoFilter extends CatalogUrlFilter {
// Set request attribute and session
UrlServletHelper.setRequestAttributes(request, delegator,
servletContext);
- // set initial parameters
- String initDefaultLocalesString =
getConfig().getInitParameter("defaultLocaleString");
- String initRedirectUrl = getConfig().getInitParameter("redirectUrl");
- defaultLocaleString =
UtilValidate.isNotEmpty(initDefaultLocalesString) ? initDefaultLocalesString :
"";
- redirectUrl = UtilValidate.isNotEmpty(initRedirectUrl) ?
initRedirectUrl : "";
-
// set the ServletContext in the request for future use
httpRequest.setAttribute("servletContext",
getConfig().getServletContext());
- if (CatalogUrlSeoTransform.forwardUri(httpRequest, httpResponse,
delegator, OfbizControlServlet.getControlServlet())) {
+ if (CatalogUrlSeoTransform.forwardUri(httpRequest, httpResponse,
delegator, CategoryControlServlet.getControlServlet())) {
return;
}
super.doFilter(httpRequest, httpResponse, chain);
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/OfbizControlServlet.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
similarity index 89%
rename from
applications/product/src/main/java/org/apache/ofbiz/product/category/OfbizControlServlet.java
rename to
applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
index d514bd2..33fd73d 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/OfbizControlServlet.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/CategoryControlServlet.java
@@ -28,13 +28,13 @@ import org.apache.ofbiz.base.util.UtilValidate;
* ControlServlet.java - Master servlet for the web application.
*/
@SuppressWarnings("serial")
-public class OfbizControlServlet extends
org.apache.ofbiz.webapp.control.ControlServlet {
+public class CategoryControlServlet extends
org.apache.ofbiz.webapp.control.ControlServlet {
private static String defaultPage = null;
private static String pageNotFound = null;
private static String controlServlet = null;
- public OfbizControlServlet() {
+ public CategoryControlServlet() {
super();
}
@@ -67,7 +67,7 @@ public class OfbizControlServlet extends
org.apache.ofbiz.webapp.control.Control
}
public static void setDefaultPage(String defaultPage) {
- OfbizControlServlet.defaultPage = defaultPage;
+ CategoryControlServlet.defaultPage = defaultPage;
}
public static String getPageNotFound() {
@@ -75,7 +75,7 @@ public class OfbizControlServlet extends
org.apache.ofbiz.webapp.control.Control
}
public static void setPageNotFound(String pageNotFound) {
- OfbizControlServlet.pageNotFound = pageNotFound;
+ CategoryControlServlet.pageNotFound = pageNotFound;
}
public static String getControlServlet() {
@@ -83,7 +83,7 @@ public class OfbizControlServlet extends
org.apache.ofbiz.webapp.control.Control
}
public static void setControlServlet(String controlServlet) {
- OfbizControlServlet.controlServlet = controlServlet;
+ CategoryControlServlet.controlServlet = controlServlet;
}
}
diff --git
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
index 99c48d4..f6b0f1a 100644
---
a/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
+++
b/applications/product/src/main/java/org/apache/ofbiz/product/category/SeoControlServlet.java
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.jasper.servlet.JspServlet;
import org.apache.ofbiz.base.util.UtilValidate;
-import org.apache.ofbiz.webapp.control.ControlServlet;
import org.apache.ofbiz.webapp.SeoConfigUtil;
+import org.apache.ofbiz.webapp.control.ControlServlet;
/**
* SeoControlServlet.java - SEO Master servlet for the web application.
@@ -40,8 +40,6 @@ import org.apache.ofbiz.webapp.SeoConfigUtil;
@SuppressWarnings("serial")
public class SeoControlServlet extends ControlServlet {
- private static final String MODULE = SeoControlServlet.class.getName();
-
private static String defaultPage = null;
private static String controlServlet = null;
public static final String REQUEST_IN_ALLOW_LIST =
"_REQUEST_IN_ALLOW_LIST_";
