refact: extracted entity attribute name constants

vivo-project · Sep 1, 2023 · 29acac3 · 29acac3
1 parent f95e6b2
commit 29acac3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -38,7 +38,10 @@
 
 public class BaseEditController extends VitroHttpServlet {
 
-	public static final boolean FORCE_NEW = true; // when you know you're starting a new edit process
+	public static final String ENTITY_URI_ATTRIBUTE_NAME = "_permissionsEntityURI";
+    public static final String ENTITY_TYPE_ATTRIBUTE_NAME = "_permissionsEntityType";
+
+    public static final boolean FORCE_NEW = true; // when you know you're starting a new edit process
 
     public static final String JSP_PREFIX = "/templates/edit/specific/";
 
@@ -205,7 +208,7 @@ public String getDefaultLandingPage(HttpServletRequest request) {
 
     protected static void addAccessAttributes(HttpServletRequest req, String entityURI, AccessObjectType aot) {
         // Add the permissionsEntityURI (if we are creating a new property, this will be empty)
-        req.setAttribute("_permissionsEntityURI", entityURI);
+        req.setAttribute(ENTITY_URI_ATTRIBUTE_NAME, entityURI);
 
         // Get the available permission sets
         List<PermissionSet> permissionSets = buildListOfSelectableRoles(ModelAccess.on(req).getWebappDaoFactory());

diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/OperationController.java
@@ -135,14 +135,14 @@ public void doPost (HttpServletRequest request, HttpServletResponse response) {
             // If contains restrictions
             if (request.getParameter("_permissions") != null) {
                 // Get the namespace that we are editing
-                String entityUri = request.getParameter("_permissionsEntityURI");
+                String entityUri = request.getParameter(ENTITY_URI_ATTRIBUTE_NAME);
                 if (StringUtils.isEmpty(entityUri)) {
                     // If we don't have a namespace set, we are creating a new entity so use that namespace
                     if (!StringUtils.isEmpty(request.getParameter("Namespace")) && !StringUtils.isEmpty(request.getParameter("LocalName"))) {
                         entityUri = "" + request.getParameter("Namespace") + request.getParameter("LocalName");    
                     }
                 }
-                String entityType = request.getParameter("_permissionsEntityType");
+                String entityType = request.getParameter(ENTITY_TYPE_ATTRIBUTE_NAME);
                 List<PermissionSet> permissionSets = buildListOfSelectableRoles(ModelAccess.on(request).getWebappDaoFactory());
                 List<String> roleUris = new ArrayList<>();
                 for (PermissionSet permissionSet : permissionSets) {

diff --git a/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/dataprop_retry.jsp
@@ -3,6 +3,9 @@
 <%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+
+<jsp:directive.page import="edu.cornell.mannlib.vedit.controller.BaseEditController"/>
+
 <%-- colspan set to 4 in DatapropRetryController.java --%>
 <tr class="editformcell">
 	<td valign="top" colspan="2">
@@ -126,8 +129,8 @@
 <!-- Permissions -->
 <c:if test="${!empty roles}">
 	<input id="_permissions" type="hidden" name="_permissions" value="enabled" />
-	<input id="_permissionsEntityURI" type="hidden" name="_permissionsEntityURI" value="${_permissionsEntityURI}" />
-	<input id="_permissionsEntityType" type="hidden" name="_permissionsEntityType" value="DATA_PROPERTY" />
+	<input id="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" value="${_permissionsEntityURI}" />
+	<input id="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" value="DATA_PROPERTY" />
 	<tr class="editformcell">
 		<td valign="top" colspan="5">
 			<b>Display</b> permissions for this property<br/>

diff --git a/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/fauxProperty_retry.jsp
@@ -4,6 +4,8 @@
 <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
+<jsp:directive.page import="edu.cornell.mannlib.vedit.controller.BaseEditController"/>
+
 <tr class="editformcell">
     <td valign="top" colspan="2">
         <b>Base property</b><br/>
@@ -63,8 +65,8 @@
 <!-- Permissions -->
 <c:if test="${!empty roles}">
     <input id="_permissions" type="hidden" name="_permissions" value="enabled" />
-    <input id="_permissionsEntityURI" type="hidden" name="_permissionsEntityURI" value="${_permissionsEntityURI}" />
-    <input id="_permissionsEntityType" type="hidden" name="_permissionsEntityType" value="${_faux_property_type}" />
+    <input id="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" value="${_permissionsEntityURI}" />
+    <input id="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" value="${_faux_property_type}" />
     <tr class="editformcell">
         <td valign="top" colspan="5">
             <b>Display</b> permissions for this property<br/>

diff --git a/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/property_retry.jsp
@@ -4,6 +4,8 @@
 <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
+<jsp:directive.page import="edu.cornell.mannlib.vedit.controller.BaseEditController"/>
+
 <%-- colspan set to 6 in PropertyRetryController.java --%>
 <tr class="editformcell">
     <td valign="top" colspan="2">
@@ -190,8 +192,8 @@
 <!-- Permissions -->
 <c:if test="${!empty roles}">
     <input id="_permissions" type="hidden" name="_permissions" value="enabled" />
-    <input id="_permissionsEntityURI" type="hidden" name="_permissionsEntityURI" value="${_permissionsEntityURI}" />
-    <input id="_permissionsEntityType" type="hidden" name="_permissionsEntityType" value="OBJECT_PROPERTY" />
+    <input id="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" value="${_permissionsEntityURI}" />
+    <input id="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" value="OBJECT_PROPERTY" />
     <tr class="editformcell">
         <td valign="top" colspan="5">
             <b>Display</b> permissions for this property<br/>

diff --git a/webapp/src/main/webapp/templates/edit/specific/vclass_retry.jsp b/webapp/src/main/webapp/templates/edit/specific/vclass_retry.jsp
@@ -6,6 +6,8 @@
 <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
+<jsp:directive.page import="edu.cornell.mannlib.vedit.controller.BaseEditController"/>
+
 <tr class="editformcell">
 	<td valign="bottom" colspan="2">
 		<b>Class label</b><br/>
@@ -88,8 +90,8 @@
 <!-- Permissions -->
 <c:if test="${!empty roles}">
     <input id="_permissions" type="hidden" name="_permissions" value="enabled" />
-    <input id="_permissionsEntityURI" type="hidden" name="_permissionsEntityURI" value="${_permissionsEntityURI}" />
-    <input id="_permissionsEntityType" type="hidden" name="_permissionsEntityType" value="CLASS" />
+    <input id="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_URI_ATTRIBUTE_NAME}" value="${_permissionsEntityURI}" />
+    <input id="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" type="hidden" name="${BaseEditController.ENTITY_TYPE_ATTRIBUTE_NAME}" value="CLASS" />
     <tr class="editformcell">
         <td valign="top" colspan="4">
             <b>Display</b> permissions for this property<br/>