OFBiz › OFBiz - Commits

[ofbiz-framework] branch trunk updated (2da6de1 -> d0f522a)

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

6 messages Options

mthl

[ofbiz-framework] branch trunk updated (2da6de1 -> d0f522a)

This is an automated email from the ASF dual-hosted git repository.

mthl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.

from 2da6de1 Fixed: https://github.com/apache/ofbiz-framework/pull/3
new 815fb52 Improved: Remove some explicit transitive dependencies
new 81f82b1 Improved: Upgrade some dependencies
new 22f1da7 Improved: Remove unnecessary ‘ofbizDebug’ task type (OFBIZ-11302)
new c764a90 Improved: Lint ‘SEOContextFilter#doFilter’ (OFBIZ-11278)
new d0f522a Fixed: Remove obsolete references to WorkflowActivity (OFBIZ-11303)

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

Summary of changes:
README.adoc | 13 ++---
.../order/groovyScripts/order/OrderView.groovy | 10 ----
applications/order/template/order/Transitions.ftl | 41 ----------------
.../ofbiz/product/category/SeoContextFilter.java | 55 +++++++++++++---------
build.gradle | 22 ++-------
5 files changed, 41 insertions(+), 100 deletions(-)

mthl

[ofbiz-framework] 01/05: Improved: Remove some explicit transitive dependencies

mthl

[ofbiz-framework] 02/05: Improved: Upgrade some dependencies

In reply to this post by mthl

mthl

[ofbiz-framework] 03/05: Improved: Remove unnecessary ‘ofbizDebug’ task type (OFBIZ-11302)

In reply to this post by mthl

mthl

[ofbiz-framework] 04/05: Improved: Lint ‘SEOContextFilter#doFilter’ (OFBIZ-11278)

In reply to this post by mthl

This is an automated email from the ASF dual-hosted git repository.

mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit c764a90b181df054c9623958bcaf1fd02e2e8b85
Author: Mathieu Lirzin <[hidden email]>
AuthorDate: Sun Dec 1 16:54:15 2019 +0100

Improved: Lint ‘SEOContextFilter#doFilter’ (OFBIZ-11278)
---
.../ofbiz/product/category/SeoContextFilter.java | 55 +++++++++++++---------
build.gradle | 2 +-
2 files changed, 34 insertions(+), 23 deletions(-)

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 de9030f..9bc6868 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
@@ -58,11 +58,11 @@ import org.apache.oro.text.regex.Perl5Matcher;
/**
* SeoContextFilter - Restricts access to raw files and configures servlet objects.
*/
-public class SeoContextFilter implements Filter {
+public final class SeoContextFilter implements Filter {

- public static final String module = SeoContextFilter.class.getName();
+ private static final String MODULE = SeoContextFilter.class.getName();

- protected Set<String> webServlets = new HashSet<>();
+ private Set<String> webServlets = new HashSet<>();
private FilterConfig config;
private String allowedPaths = "";
private String redirectPath = "";
@@ -79,7 +79,8 @@ public class SeoContextFilter implements Filter {
allowedPathList = StringUtil.split(allowedPaths, ":");
}

- Map<String, ? extends ServletRegistration> servletRegistrations = config.getServletContext().getServletRegistrations();
+ Map<String, ? extends ServletRegistration> servletRegistrations = config.getServletContext()
+ .getServletRegistrations();
for (Entry<String, ? extends ServletRegistration> entry : servletRegistrations.entrySet()) {
Collection<String> servlets = entry.getValue().getMappings();
for (String servlet : servlets) {
@@ -94,24 +95,25 @@ public class SeoContextFilter implements Filter {
}

@Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
HttpServletResponse httpResponse = (HttpServletResponse) response;

String uri = httpRequest.getRequestURI();

- Map<String, String[]> parameterMap =request.getParameterMap();
+ Map<String, String[]> parameterMap = request.getParameterMap();
if (!parameterMap.isEmpty()) {
- List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
- request.getParameterMap().forEach((name, values) -> {
- for(String value : values) {
+ List<BasicNameValuePair> params = new ArrayList<>();
+ parameterMap.forEach((name, values) -> {
+ for (String value : values) {
params.add(new BasicNameValuePair(name, value));
}
});
String queryString = URLEncodedUtils.format(params, Charset.forName("UTF-8"));
uri = uri + "?" + queryString;
}
-
+
boolean forwarded = forwardUri(httpResponse, uri);
if (forwarded) {
return;
@@ -124,7 +126,7 @@ public class SeoContextFilter implements Filter {
controllerConfig = ConfigXMLReader.getControllerConfig(controllerConfigURL);
requestMaps = controllerConfig.getRequestMapMap();
} catch (WebAppConfigurationException e) {
- Debug.logError(e, "Exception thrown while parsing controller.xml file: ", module);
+ Debug.logError(e, "Exception thrown while parsing controller.xml file: ", MODULE);
throw new ServletException(e);
}
Set<String> uris = requestMaps.keySet();
@@ -134,7 +136,9 @@ public class SeoContextFilter implements Filter {
String contextUri = null;
if (httpRequest.getAttribute(ControlFilter.FORWARDED_FROM_SERVLET) == null) {
requestPath = httpRequest.getServletPath();
- if (requestPath == null) requestPath = "";
+ if (requestPath == null) {
+ requestPath = "";
+ }
if (requestPath.lastIndexOf('/') > 0) {
if (requestPath.indexOf('/') == 0) {
requestPath = '/' + requestPath.substring(1, requestPath.indexOf('/', 1));
@@ -144,7 +148,9 @@ public class SeoContextFilter implements Filter {
}

String requestInfo = httpRequest.getServletPath();
- if (requestInfo == null) requestInfo = "";
+ if (requestInfo == null) {
+ requestInfo = "";
+ }
if (requestInfo.lastIndexOf('/') >= 0) {
requestInfo = requestInfo.substring(0, requestInfo.lastIndexOf('/')) + "/*";
}
@@ -166,13 +172,15 @@ public class SeoContextFilter implements Filter {
if (pathItemList != null) {
viewName = pathItemList.get(0);
}
-
+
String requestUri = UtilHttp.getRequestUriFromTarget(httpRequest.getRequestURI());

// check to make sure the requested url is allowed
- if (!allowedPathList.contains(requestPath) && !allowedPathList.contains(requestInfo) && !allowedPathList.contains(httpRequest.getServletPath())
+ if (!allowedPathList.contains(requestPath) && !allowedPathList.contains(requestInfo)
+ && !allowedPathList.contains(httpRequest.getServletPath())
&& !allowedPathList.contains(requestUri) && !allowedPathList.contains("/" + viewName)
- && (UtilValidate.isEmpty(requestPath) && UtilValidate.isEmpty(httpRequest.getServletPath()) && !uris.contains(viewName))) {
+ && (UtilValidate.isEmpty(requestPath) && UtilValidate.isEmpty(httpRequest.getServletPath())
+ && !uris.contains(viewName))) {
String filterMessage = "[Filtered request]: " + contextUri;

if (redirectPath == null) {
@@ -186,7 +194,8 @@ public class SeoContextFilter implements Filter {
try {
error = Integer.parseInt(errorCode);
} catch (NumberFormatException nfe) {
- Debug.logWarning(nfe, "Error code specified would not parse to Integer : " + errorCode, module);
+ Debug.logWarning(nfe,
+ "Error code specified would not parse to Integer : " + errorCode, MODULE);
}
}
filterMessage = filterMessage + " (" + error + ")";
@@ -209,9 +218,10 @@ public class SeoContextFilter implements Filter {
httpResponse.setHeader("Location", redirectPath);
}
}
- Debug.logWarning(filterMessage, module);
+ Debug.logWarning(filterMessage, MODULE);
return;
- } else if ((allowedPathList.contains(requestPath) || allowedPathList.contains(requestInfo) || allowedPathList.contains(httpRequest.getServletPath())
+ } else if ((allowedPathList.contains(requestPath) || allowedPathList.contains(requestInfo)
+ || allowedPathList.contains(httpRequest.getServletPath())
|| allowedPathList.contains(requestUri) || allowedPathList.contains("/" + viewName))
&& !webServlets.contains(httpRequest.getServletPath())) {
request.setAttribute(SeoControlServlet.REQUEST_IN_ALLOW_LIST, Boolean.TRUE);
@@ -230,7 +240,7 @@ public class SeoContextFilter implements Filter {

/**
* Forward a uri according to forward pattern regular expressions. Note: this is developed for Filter usage.
- *
+ *
* @param uri String to reverse transform
* @return String
*/
@@ -239,7 +249,8 @@ public class SeoContextFilter implements Filter {
boolean foundMatch = false;
Integer responseCodeInt = null;

- if (SeoConfigUtil.checkUseUrlRegexp() && SeoConfigUtil.getSeoPatterns() != null && SeoConfigUtil.getForwardReplacements() != null) {
+ if (SeoConfigUtil.checkUseUrlRegexp() && SeoConfigUtil.getSeoPatterns() != null
+ && SeoConfigUtil.getForwardReplacements() != null) {
Iterator<String> keys = SeoConfigUtil.getSeoPatterns().keySet().iterator();
while (keys.hasNext()) {
String key = keys.next();
@@ -265,7 +276,7 @@ public class SeoContextFilter implements Filter {
}
response.setHeader("Location", uri);
} else {
- Debug.logInfo("Can NOT forward this url: " + uri, module);
+ Debug.logInfo("Can NOT forward this url: " + uri, MODULE);
}
return foundMatch;
}
diff --git a/build.gradle b/build.gradle
index b8465bc..9d1981c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -285,7 +285,7 @@ checkstyle {
// the sum of errors that were present before introducing the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
- tasks.checkstyleMain.maxErrors = 37776
+ tasks.checkstyleMain.maxErrors = 37769
// Currently there are a lot of errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false

mthl

[ofbiz-framework] 05/05: Fixed: Remove obsolete references to WorkflowActivity (OFBIZ-11303)

In reply to this post by mthl