You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mt...@apache.org on 2019/06/28 23:04:04 UTC
svn commit: r1862294 - in /ofbiz/ofbiz-framework/trunk:
applications/content/src/main/java/org/apache/ofbiz/content/cms/
applications/order/src/main/java/org/apache/ofbiz/order/task/
applications/product/src/main/java/org/apache/ofbiz/product/category/...
Author: mthl
Date: Fri Jun 28 23:04:03 2019
New Revision: 1862294
URL: http://svn.apache.org/viewvc?rev=1862294&view=rev
Log:
Improved: Use ‘ServletRequest#getServletContext’ when possible
(OFBIZ-11129)
Avoid unecessary casts by using ‘ServletRequest#getServletContext’
instead of ‘ServletRequest#getAttribute’. This method is available
since Servlet specification 3.0.
Modified:
ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java
ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
Modified: ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java Fri Jun 28 23:04:03 2019
@@ -286,8 +286,7 @@ public class CmsEvents {
templateMap.put("statusCode", statusCode);
// make the link prefix
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
- RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
+ RequestHandler rh = (RequestHandler) request.getServletContext().getAttribute("_REQUEST_HANDLER_");
templateMap.put("_REQUEST_HANDLER_", rh);
//Cache Headers
Modified: ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/src/main/java/org/apache/ofbiz/order/task/TaskEvents.java Fri Jun 28 23:04:03 2019
@@ -89,7 +89,7 @@ public class TaskEvents {
/** Accept role assignment event */
public static String acceptRoleAssignment(HttpServletRequest request, HttpServletResponse response) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
Locale locale = UtilHttp.getLocale(request);
@@ -109,7 +109,7 @@ public class TaskEvents {
/** Delegate and accept assignment event */
public static String delegateAndAcceptAssignment(HttpServletRequest request, HttpServletResponse response) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
Locale locale = UtilHttp.getLocale(request);
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/SeoTransform.java Fri Jun 28 23:04:03 2019
@@ -90,7 +90,7 @@ public class SeoTransform implements Tem
Object prefix = env.getVariable("urlPrefix");
if (req != null) {
HttpServletRequest request = (HttpServletRequest) req.getWrappedObject();
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
HttpServletResponse response = null;
if (res != null) {
response = (HttpServletResponse) res.getWrappedObject();
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/category/ftl/UrlRegexpTransform.java Fri Jun 28 23:04:03 2019
@@ -90,7 +90,7 @@ public class UrlRegexpTransform implemen
Object prefix = env.getVariable("urlPrefix");
if (req != null) {
HttpServletRequest request = (HttpServletRequest) req.getWrappedObject();
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
HttpServletResponse response = null;
if (res != null) {
response = (HttpServletResponse) res.getWrappedObject();
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/product/product/ProductSearchSession.java Fri Jun 28 23:04:03 2019
@@ -432,7 +432,7 @@ public class ProductSearchSession {
if (keywords.contains(ovrdKeyword)) {
String targetTypeEnumId = productStoreKeywordOvrd.getString("targetTypeEnumId");
String target = productStoreKeywordOvrd.getString("target");
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
if ("KOTT_PRODCAT".equals(targetTypeEnumId)) {
String requestName = "/category/~category_id=" + target;
Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilHttp.java Fri Jun 28 23:04:03 2019
@@ -47,7 +47,6 @@ import java.util.StringTokenizer;
import java.util.TimeZone;
import javax.net.ssl.SSLContext;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -506,15 +505,14 @@ public final class UtilHttp {
Map<String, Object> servletCtxMap = new HashMap<>();
// look at all servlet context attributes
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
- Enumeration<String> applicationAttrNames = UtilGenerics.cast(servletContext.getAttributeNames());
+ Enumeration<String> applicationAttrNames = request.getServletContext().getAttributeNames();
while (applicationAttrNames.hasMoreElements()) {
String attrName = applicationAttrNames.nextElement();
if (namesToSkip != null && namesToSkip.contains(attrName)) {
continue;
}
- Object attrValue = servletContext.getAttribute(attrName);
+ Object attrValue = request.getServletContext().getAttribute(attrName);
servletCtxMap.put(attrName, attrValue);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/eventops/WebappPropertyToField.java Fri Jun 28 23:04:03 2019
@@ -63,7 +63,7 @@ public final class WebappPropertyToField
public boolean exec(MethodContext methodContext) throws MiniLangException {
if (methodContext.getMethodType() == MethodContext.EVENT) {
String resource = resourceFse.expandString(methodContext.getEnvMap());
- ServletContext servletContext = (ServletContext) methodContext.getRequest().getAttribute("servletContext");
+ ServletContext servletContext = methodContext.getRequest().getServletContext();
URL propsUrl = null;
try {
propsUrl = servletContext.getResource(resource);
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java Fri Jun 28 23:04:03 2019
@@ -1168,7 +1168,7 @@ public class RequestHandler {
try {
GenericValue webSiteValue = EntityQuery.use(delegator).from("WebSite").where("webSiteId", webSiteId).cache().queryOne();
if (webSiteValue != null) {
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
+ ServletContext application = (request.getServletContext());
String domainName = request.getLocalName();
if (application.getAttribute("MULTI_SITE_ENABLED") != null && UtilValidate.isNotEmpty(webSiteValue.getString("hostedPathAlias")) && !domainName.equals(webSiteValue.getString("httpHost"))) {
newURL.append('/');
@@ -1200,7 +1200,7 @@ public class RequestHandler {
}
public static String makeUrl(HttpServletRequest request, HttpServletResponse response, String url, boolean fullPath, boolean secure, boolean encode) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
return rh.makeLink(request, response, url, fullPath, secure, encode);
}
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/FreeMarkerViewHandler.java Fri Jun 28 23:04:03 2019
@@ -81,7 +81,7 @@ public class FreeMarkerViewHandler exten
}
public static void prepOfbizRoot(Map<String, Object> root, HttpServletRequest request, HttpServletResponse response) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
+ ServletContext servletContext = request.getServletContext();
HttpSession session = request.getSession();
// add in the OFBiz objects
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/OfbizUrlTransform.java Fri Jun 28 23:04:03 2019
@@ -142,7 +142,7 @@ public class OfbizUrlTransform implement
return;
}
if (request != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
HttpServletResponse response = FreeMarkerWorker.unwrap(env.getVariable("response"));
String requestUrl = buf.toString();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteWorker.java Fri Jun 28 23:04:03 2019
@@ -37,10 +37,8 @@ public final class WebSiteWorker {
private WebSiteWorker() {}
public static String getWebSiteId(ServletRequest request) {
- ServletContext application = ((ServletContext) request.getAttribute("servletContext"));
-
- if (application == null) return null;
- return application.getInitParameter("webSiteId");
+ ServletContext ctx = request.getServletContext();
+ return (ctx == null) ? null : ctx.getInitParameter("webSiteId");
}
public static GenericValue getWebSite(ServletRequest request) {
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java Fri Jun 28 23:04:03 2019
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.xml.parsers.ParserConfigurationException;
@@ -83,10 +82,9 @@ public class FormFactory {
String cacheKey = webappName + "::" + resourceName + "::" + formName;
ModelForm modelForm = formWebappCache.get(cacheKey);
if (modelForm == null) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
Delegator delegator = (Delegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
- URL formFileUrl = servletContext.getResource(resourceName);
+ URL formFileUrl = request.getServletContext().getResource(resourceName);
Document formFileDoc = UtilXml.readXmlDocument(formFileUrl, true, true);
Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);
modelForm = createModelForm(formElement, delegator.getModelReader(), dispatcher.getDispatchContext(), resourceName, formName);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/GridFactory.java Fri Jun 28 23:04:03 2019
@@ -84,7 +84,7 @@ public class GridFactory {
String cacheKey = webappName + "::" + resourceName + "::" + gridName;
ModelGrid modelGrid = gridWebappCache.get(cacheKey);
if (modelGrid == null) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
+ ServletContext servletContext = request.getServletContext();
Delegator delegator = (Delegator) request.getAttribute("delegator");
LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
URL gridFileUrl = servletContext.getResource(resourceName);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/IterateSectionWidget.java Fri Jun 28 23:04:03 2019
@@ -28,7 +28,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -287,8 +286,7 @@ public class IterateSectionWidget extend
HttpServletRequest request = (HttpServletRequest) context.get("request");
HttpServletResponse response = (HttpServletResponse) context.get("response");
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
- RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
+ RequestHandler rh = (RequestHandler) request.getServletContext().getAttribute("_REQUEST_HANDLER_");
writer.append("<table border=\"0\" width=\"100%\" cellpadding=\"2\">\n");
writer.append(" <tr>\n");
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MenuFactory.java Fri Jun 28 23:04:03 2019
@@ -61,7 +61,7 @@ public class MenuFactory {
Map<String, ModelMenu> modelMenuMap = menuWebappCache.get(cacheKey);
if (modelMenuMap == null) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
+ ServletContext servletContext = request.getServletContext();
URL menuFileUrl = servletContext.getResource(resourceName);
Document menuFileDoc = UtilXml.readXmlDocument(menuFileUrl, true, true);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScreenFactory.java Fri Jun 28 23:04:03 2019
@@ -144,7 +144,7 @@ public class ScreenFactory {
synchronized (ScreenFactory.class) {
modelScreenMap = screenWebappCache.get(cacheKey);
if (modelScreenMap == null) {
- ServletContext servletContext = (ServletContext) request.getAttribute("servletContext");
+ ServletContext servletContext = request.getServletContext();
URL screenFileUrl = servletContext.getResource(resourceName);
Document screenFileDoc = UtilXml.readXmlDocument(screenFileUrl, true, true);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuRenderer.java Fri Jun 28 23:04:03 2019
@@ -63,7 +63,7 @@ public class HtmlMenuRenderer extends Ht
}
public void appendOfbizUrl(Appendable writer, String location) throws IOException {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
if (ctx == null) {
HttpSession session = request.getSession();
if (session != null) {
@@ -80,7 +80,7 @@ public class HtmlMenuRenderer extends Ht
}
public void appendContentUrl(Appendable writer, String location) throws IOException {
- ServletContext ctx = (ServletContext) this.request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
if (ctx == null) {
HttpSession session = request.getSession();
if (session != null) {
@@ -492,8 +492,7 @@ public class HtmlMenuRenderer extends Ht
HttpServletRequest request = (HttpServletRequest) context.get("request");
if (urlMode != null && "ofbiz".equalsIgnoreCase(urlMode)) {
if (request != null && response != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
- RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
+ RequestHandler rh = (RequestHandler) request.getServletContext().getAttribute("_REQUEST_HANDLER_");
String urlString = rh.makeLink(request, response, src, fullPath, secure, encode);
writer.append(urlString);
} else {
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlMenuWrapper.java Fri Jun 28 23:04:03 2019
@@ -24,7 +24,6 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -104,8 +103,7 @@ public class HtmlMenuWrapper {
public String renderMenuString() throws IOException {
HttpServletRequest req = ((HtmlMenuRenderer)renderer).request;
- ServletContext ctx = (ServletContext) req.getAttribute("servletContext");
- if (ctx == null) {
+ if (req.getServletContext() == null) {
if (Debug.infoOn()) {
Debug.logInfo("in renderMenuString, ctx is null(0)" , "");
}
@@ -115,8 +113,7 @@ public class HtmlMenuWrapper {
modelMenu.renderMenuString(writer, context, renderer);
HttpServletRequest req2 = ((HtmlMenuRenderer)renderer).request;
- ServletContext ctx2 = (ServletContext) req2.getAttribute("servletContext");
- if (ctx2 == null) {
+ if (req2.getServletContext() == null) {
if (Debug.infoOn()) {
Debug.logInfo("in renderMenuString, ctx is null(2)" , "");
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlTreeRenderer.java Fri Jun 28 23:04:03 2019
@@ -315,7 +315,7 @@ public class HtmlTreeRenderer extends Ht
HttpServletRequest request = (HttpServletRequest) context.get("request");
if (urlMode != null && "intra-app".equalsIgnoreCase(urlMode)) {
if (request != null && response != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
String urlString = rh.makeLink(request, response, src, fullPath, secure, encode);
writer.append(urlString);
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Fri Jun 28 23:04:03 2019
@@ -36,7 +36,6 @@ import java.util.UUID;
import java.util.WeakHashMap;
import java.util.stream.Collectors;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -124,8 +123,7 @@ public final class MacroFormRenderer imp
this.request = request;
this.response = response;
this.visualTheme = ThemeFactory.resolveVisualTheme(request);
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
- this.rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
+ this.rh = (RequestHandler) request.getServletContext().getAttribute("_REQUEST_HANDLER_");
this.javaScriptEnabled = UtilHttp.isJavaScriptEnabled(request);
internalEncoder = UtilCodec.getEncoder("string");
}
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroMenuRenderer.java Fri Jun 28 23:04:03 2019
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -85,8 +84,7 @@ public class MacroMenuRenderer implement
boolean fullPath = false;
boolean secure = false;
boolean encode = false;
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
- RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
+ RequestHandler rh = (RequestHandler) request.getServletContext().getAttribute("_REQUEST_HANDLER_");
src = rh.makeLink(request, response, src, fullPath, secure, encode);
} else if ("content".equalsIgnoreCase(urlMode)) {
StringBuilder newURL = new StringBuilder();
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroScreenRenderer.java Fri Jun 28 23:04:03 2019
@@ -198,7 +198,7 @@ public class MacroScreenRenderer impleme
containerId = getNextElementId();
}
HttpServletResponse response = (HttpServletResponse) context.get("response");
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
autoUpdateLink = rh.makeLink(request, response, autoUpdateTarget);
}
@@ -349,7 +349,7 @@ public class MacroScreenRenderer impleme
String urlString = "";
if (urlMode != null && "intra-app".equalsIgnoreCase(urlMode)) {
if (request != null && response != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, src, fullPath, secure, encode);
} else {
@@ -477,7 +477,7 @@ public class MacroScreenRenderer impleme
editRequest += "&";
}
editRequest += "contentId=" + expandedContentId;
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, editRequest, false, false, false);
}
@@ -500,7 +500,7 @@ public class MacroScreenRenderer impleme
HttpServletRequest request = (HttpServletRequest) context.get("request");
HttpServletResponse response = (HttpServletResponse) context.get("response");
if (request != null && response != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
fullUrlString = rh.makeLink(request, response, urlString, true, false, false);
}
@@ -592,7 +592,7 @@ public class MacroScreenRenderer impleme
if (UtilValidate.isNotEmpty(expandedMapKey)) {
editRequest += "&mapKey=" + expandedMapKey;
}
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, editRequest, false, false, false);
}
@@ -769,7 +769,7 @@ public class MacroScreenRenderer impleme
viewSizeParam = "VIEW_SIZE" + "_" + paginatorNumber;
}
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
Map<String, Object> inputFields = UtilGenerics.toMap(context.get("requestParameters"));
Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java?rev=1862294&r1=1862293&r2=1862294&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java (original)
+++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroTreeRenderer.java Fri Jun 28 23:04:03 2019
@@ -324,7 +324,7 @@ public class MacroTreeRenderer implement
if (urlMode != null && "intra-app".equalsIgnoreCase(urlMode)) {
if (request != null && response != null) {
- ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
+ ServletContext ctx = request.getServletContext();
RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
urlString = rh.makeLink(request, response, src, fullPath, secure, encode);
} else {