introduce PageConfig method to get the history attribute name

vladak · vladak · commit 2f6d7b61dba7 · 2022-12-01T10:21:57.000+01:00
diff --git a/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java b/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
@@ -118,7 +118,7 @@ public final class PageConfig {
 
     public static final String DUMMY_REVISION = "unknown";
 
-    public static final String HISTORY_JSP_ATTR_NAME = "history.jsp-hist";
+    private static final String HISTORY_JSP_ATTR_NAME = "history.jsp-hist";
 
     // query parameters
     static final String PROJECT_PARAM_NAME = "project";
@@ -183,6 +183,13 @@ public Object getRequestAttribute(String attr) {
         return this.req.getAttribute(attr);
     }
 
+    /**
+     * @return name of the JSP attribute to store the {@link org.opengrok.indexer.history.History} object.
+     */
+    public String getHistoryAttrName() {
+        return HISTORY_JSP_ATTR_NAME;
+    }
+
     /**
      * Removes an attribute from the current request.
      * @param string the attribute
diff --git a/opengrok-web/src/main/webapp/history.jsp b/opengrok-web/src/main/webapp/history.jsp
@@ -98,7 +98,7 @@ org.opengrok.indexer.web.Util"
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
-        request.setAttribute(PageConfig.HISTORY_JSP_ATTR_NAME, hist);
+        request.setAttribute(cfg.getHistoryAttrName(), hist);
     }
 }
 %>
@@ -109,7 +109,8 @@ include file="/httpheader.jspf"
 %>
 <%
 {
-    if ((request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {
+    PageConfig cfg = PageConfig.get(request);
+    if ((request.getAttribute(cfg.getHistoryAttrName())) != null) {
 %>
 <body>
 <script type="text/javascript">/* <![CDATA[ */
@@ -124,7 +125,8 @@ include file="/httpheader.jspf"
     }
 }
 {
-    if (request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME) != null) {
+    PageConfig cfg = PageConfig.get(request);
+    if (request.getAttribute(cfg.getHistoryAttrName()) != null) {
 %>
     <%@include file="/pageheader.jspf" %>
 <%
@@ -136,7 +138,7 @@ include file="/httpheader.jspf"
     String path = cfg.getPath();
 
     History hist;
-    if ((hist = (History) request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {
+    if ((hist = (History) request.getAttribute(cfg.getHistoryAttrName())) != null) {
 
         int startIndex = cfg.getStartIndex();
         int max = cfg.getMaxItems();
@@ -155,7 +157,8 @@ include file="/httpheader.jspf"
     }
 }
 {
-    if (request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME) != null) {
+    PageConfig cfg = PageConfig.get(request);
+    if (request.getAttribute(cfg.getHistoryAttrName()) != null) {
 %>
         <%@
 
@@ -170,7 +173,8 @@ include file="/minisearch.jspf"
     String context = request.getContextPath();
     String path = cfg.getPath();
     History hist;
-    if ((hist = (History) request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {
+
+    if ((hist = (History) request.getAttribute(cfg.getHistoryAttrName())) != null) {
         RuntimeEnvironment env = cfg.getEnv();
         String uriEncodedName = cfg.getUriEncodedPath();
         Project project = cfg.getProject();

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ org.opengrok.indexer.web.Util"`
`98`	`98`	`response.sendError(HttpServletResponse.SC_NOT_FOUND);`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`		`- request.setAttribute(PageConfig.HISTORY_JSP_ATTR_NAME, hist);`
	`101`	`+ request.setAttribute(cfg.getHistoryAttrName(), hist);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`%>`
`@@ -109,7 +109,8 @@ include file="/httpheader.jspf"`
`109`	`109`	`%>`
`110`	`110`	`<%`
`111`	`111`	`{`
`112`		`- if ((request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {`
	`112`	`+ PageConfig cfg = PageConfig.get(request);`
	`113`	`+ if ((request.getAttribute(cfg.getHistoryAttrName())) != null) {`
`113`	`114`	`%>`
`114`	`115`	`<body>`
`115`	`116`	`<script type="text/javascript">/* <![CDATA[ */`
`@@ -124,7 +125,8 @@ include file="/httpheader.jspf"`
`124`	`125`	`}`
`125`	`126`	`}`
`126`	`127`	`{`
`127`		`- if (request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME) != null) {`
	`128`	`+ PageConfig cfg = PageConfig.get(request);`
	`129`	`+ if (request.getAttribute(cfg.getHistoryAttrName()) != null) {`
`128`	`130`	`%>`
`129`	`131`	`<%@include file="/pageheader.jspf" %>`
`130`	`132`	`<%`
`@@ -136,7 +138,7 @@ include file="/httpheader.jspf"`
`136`	`138`	`String path = cfg.getPath();`
`137`	`139`
`138`	`140`	`History hist;`
`139`		`- if ((hist = (History) request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {`
	`141`	`+ if ((hist = (History) request.getAttribute(cfg.getHistoryAttrName())) != null) {`
`140`	`142`
`141`	`143`	`int startIndex = cfg.getStartIndex();`
`142`	`144`	`int max = cfg.getMaxItems();`
`@@ -155,7 +157,8 @@ include file="/httpheader.jspf"`
`155`	`157`	`}`
`156`	`158`	`}`
`157`	`159`	`{`
`158`		`- if (request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME) != null) {`
	`160`	`+ PageConfig cfg = PageConfig.get(request);`
	`161`	`+ if (request.getAttribute(cfg.getHistoryAttrName()) != null) {`
`159`	`162`	`%>`
`160`	`163`	`<%@`
`161`	`164`
`@@ -170,7 +173,8 @@ include file="/minisearch.jspf"`
`170`	`173`	`String context = request.getContextPath();`
`171`	`174`	`String path = cfg.getPath();`
`172`	`175`	`History hist;`
`173`		`- if ((hist = (History) request.getAttribute(PageConfig.HISTORY_JSP_ATTR_NAME)) != null) {`
	`176`	`+`
	`177`	`+ if ((hist = (History) request.getAttribute(cfg.getHistoryAttrName())) != null) {`
`174`	`178`	`RuntimeEnvironment env = cfg.getEnv();`
`175`	`179`	`String uriEncodedName = cfg.getUriEncodedPath();`
`176`	`180`	`Project project = cfg.getProject();`