This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit f5ded534e78b5462a1d31d07328abd4d28cddb0a
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu Nov 18 13:26:15 2021 +0100
Fixed: Fix some bugs Spotbugs reports (OFBIZ-12386)
Fixes a Spotbugs worry and clarifies code
Conflicts handled by merging cherry pick as HEAD, so several no functional
changes
---
.../org/apache/ofbiz/webtools/UtilCacheEvents.java | 89 +++++++++++++---------
1 file changed, 51 insertions(+), 38 deletions(-)
diff --git
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
index 8a9e28a..1e45dfc 100644
---
a/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
+++
b/framework/webtools/src/main/java/org/apache/ofbiz/webtools/UtilCacheEvents.java
@@ -19,13 +19,15 @@
package org.apache.ofbiz.webtools;
import java.util.Iterator;
-import java.util.Locale;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
-import java.util.LinkedList;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilDateTime;
import org.apache.ofbiz.base.util.UtilHttp;
import org.apache.ofbiz.base.util.UtilMisc;
@@ -38,9 +40,11 @@ import org.apache.ofbiz.security.Security;
*/
public final class UtilCacheEvents {
- private static final String err_resource = "WebtoolsErrorUiLabels";
+ private static final String ERR_RESOURCE = "WebtoolsErrorUiLabels";
+ private static final String MODULE = UtilCacheEvents.class.getName();
+
- private UtilCacheEvents() {}
+ private UtilCacheEvents() { }
/** An HTTP WebEvent handler the specified element from the specified cache
* @param request The HTTP request object for the current JSP or Servlet
request.
@@ -53,21 +57,21 @@ public final class UtilCacheEvents {
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.permissionEdit", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.permissionEdit", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.noCacheNameSpecified", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.noCacheNameSpecified", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
String numString = request.getParameter("UTIL_CACHE_ELEMENT_NUMBER");
if (numString == null) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.noElementNumberSpecified", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.noElementNumberSpecified", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", "");
return "error";
}
@@ -99,15 +103,17 @@ public final class UtilCacheEvents {
if (key != null) {
utilCache.remove(key);
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.removeElementWithKey", UtilMisc.toMap("key", key.toString()),
locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.removeElementWithKey", UtilMisc.toMap("key",
+ key.toString()), locale) + ".";
request.setAttribute("_EVENT_MESSAGE_", errMsg);
} else {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name", name,
"numString", numString), locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotRemoveElementNumber", UtilMisc.toMap("name",
+ name, "numString", numString), locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
} else {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotRemoveElement", UtilMisc.toMap("name", name), locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotRemoveElement", UtilMisc.toMap("name", name), locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -125,7 +131,7 @@ public final class UtilCacheEvents {
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.permissionEdit", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.permissionEdit", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -133,7 +139,7 @@ public final class UtilCacheEvents {
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotClearCache", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotClearCache", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -141,10 +147,10 @@ public final class UtilCacheEvents {
if (utilCache != null) {
utilCache.clear();
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
request.setAttribute("_EVENT_MESSAGE_", errMsg);
} else {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name),
locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name),
locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -162,17 +168,16 @@ public final class UtilCacheEvents {
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.permissionEdit", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.permissionEdit", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
UtilCache.clearAllCaches();
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.clearAllCaches", locale);
- request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" +
UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss") + ").");
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.clearAllCaches", locale);
+ request.setAttribute("_EVENT_MESSAGE_", errMsg + " (" +
UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss") + ").");
return "success";
}
-
/** An HTTP WebEvent handler that clears the selected caches
* @param request The HTTP request object for the current JSP or Servlet
request.
* @param response The HTTP response object for the current JSP or Servlet
request.
@@ -185,7 +190,7 @@ public final class UtilCacheEvents {
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.permissionEdit", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.permissionEdit", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -196,27 +201,27 @@ public final class UtilCacheEvents {
int rowCount = UtilHttp.getMultiFormRowCount(ctx);
for (int i = 0; i < rowCount; i++) {
String suffix = UtilHttp.getMultiRowDelimiter() + i;
- isSelected = (ctx.containsKey("_rowSubmit" + suffix) &&
"Y".equalsIgnoreCase((String)ctx.get("_rowSubmit" + suffix)));
+ isSelected = (ctx.containsKey("_rowSubmit" + suffix) &&
"Y".equalsIgnoreCase((String) ctx.get("_rowSubmit" + suffix)));
if (!isSelected) {
continue;
}
- String name = request.getParameter("cacheName"+suffix);
+ String name = request.getParameter("cacheName" + suffix);
if (name == null) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotClearCache", locale) + ".";
- eventList.add(errMsg);
- }
-
- UtilCache<?, ?> utilCache = UtilCache.findCache(name);
-
- if (utilCache != null) {
- utilCache.clear();
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotClearCache", locale) + ".";
eventList.add(errMsg);
} else {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotClearCacheNotFoundName", UtilMisc.toMap("name", name),
locale) + ".";
- eventList.add(errMsg);
+ UtilCache<?, ?> utilCache = UtilCache.findCache(name);
+ if (utilCache != null) {
+ utilCache.clear();
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.clearCache", UtilMisc.toMap("name", name), locale) + ".";
+ eventList.add(errMsg);
+ } else {
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotClearCacheNotFoundName",
+ UtilMisc.toMap("name", name), locale) + ".";
+ eventList.add(errMsg);
+ }
}
}
request.setAttribute("_EVENT_MESSAGE_LIST_", eventList);
@@ -234,7 +239,7 @@ public final class UtilCacheEvents {
Security security = (Security) request.getAttribute("security");
if (!security.hasPermission("UTIL_CACHE_EDIT", request.getSession())) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCacheEvents.permissionEdit", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCacheEvents.permissionEdit", locale) + ".";
request.setAttribute("_EVENT_MESSAGE_", errMsg);
return "error";
}
@@ -242,7 +247,7 @@ public final class UtilCacheEvents {
String name = request.getParameter("UTIL_CACHE_NAME");
if (name == null) {
- errMsg = UtilProperties.getMessage(err_resource,
"utilCache.couldNotUpdateCacheSetting", locale) + ".";
+ errMsg = UtilProperties.getMessage(ERR_RESOURCE,
"utilCache.couldNotUpdateCacheSetting", locale) + ".";
request.setAttribute("_ERROR_MESSAGE_", errMsg);
return "error";
}
@@ -255,18 +260,26 @@ public final class UtilCacheEvents {
try {
maxInMemory = Integer.valueOf(maxInMemoryStr);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ Debug.logError(e, MODULE);
+ }
+
try {
expireTime = Long.valueOf(expireTimeStr);
- } catch (Exception e) {}
+ } catch (Exception e) {
+ Debug.logError(e, MODULE);
+ }
+
UtilCache<?, ?> utilCache = UtilCache.findCache(name);
if (utilCache != null) {
- if (maxInMemory != null)
+ if (maxInMemory != null) {
utilCache.setMaxInMemory(maxInMemory);
- if (expireTime != null)
+ }
+ if (expireTime != null) {
utilCache.setExpireTime(expireTime);
+ }
if (useSoftReferenceStr != null) {
utilCache.setUseSoftReference("true".equals(useSoftReferenceStr));
}
