reuse strings

Author: qqmyers

src/main/java/edu/harvard/iq/dataverse/api/AbstractApiBean.java

@@ -672,32 +672,31 @@ protected Response getRoleAssignmentHistoryResponse(DvObject dvObject, Authentic
 
         // Get the role assignment history
         List<DataverseRoleServiceBean.RoleAssignmentHistoryEntry> history = null;
-        String definitionPoint;
         if (forFiles == false) {
             history = rolesSvc.getRoleAssignmentHistory(dvObject.getId());
-            definitionPoint = BundleUtil.getStringFromBundle("datasets.api.permissions.history.definitionPoint");
         } else {
             history = rolesSvc.getFilesRoleAssignmentHistory(dvObject.getId());
-            definitionPoint = BundleUtil.getStringFromBundle("datasets.api.permissions.history.definitionPoints");
         }
 
         List<MediaType> acceptedTypes = headers.getAcceptableMediaTypes();
         boolean wantCSV = acceptedTypes.stream()
                 .anyMatch(mt -> mt.toString().equals("text/csv"));
 
         if (wantCSV) {
-            String assigneeHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.assignee");
-            String roleHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.role");
-            String assignedByHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.assignedBy");
-            String assignedAtHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.assignedAt");
-            String revokedByHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.revokedBy");
-            String revokedAtHeader = BundleUtil.getStringFromBundle("datasets.api.permissions.history.revokedAt");
+            //Reusing strings from history panel
+            String definedOn = BundleUtil.getStringFromBundle("dataverse.permissions.history.definedOn");
+            String assigneeHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.assignee");
+            String roleHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.role");
+            String assignedByHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.assignedBy");
+            String assignedAtHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.assignedAt");
+            String revokedByHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.revokedBy");
+            String revokedAtHeader = BundleUtil.getStringFromBundle("dataverse.permissions.history.revokedAt");
 
             // Generate CSV response
             StringBuilder csvBuilder = new StringBuilder();
             // Add CSV header with internationalized column names
                 csvBuilder
-                    .append(definitionPoint).append(",")
+                    .append(definedOn).append(",")
                     .append(assigneeHeader).append(",")
                     .append(roleHeader).append(",")
                     .append(assignedByHeader).append(",")
@@ -736,7 +735,7 @@ protected Response getRoleAssignmentHistoryResponse(DvObject dvObject, Authentic
         JsonArrayBuilder jsonArray = Json.createArrayBuilder();
         for (DataverseRoleServiceBean.RoleAssignmentHistoryEntry entry : history) {
             JsonObjectBuilder job = Json.createObjectBuilder()
-                    .add(definitionPoint, entry.getDefinitionPointIdsAsString())
+                    .add("definedOn", entry.getDefinitionPointIdsAsString())
                     .add("assigneeIdentifier", entry.getAssigneeIdentifier())
                     .add("roleName", entry.getRoleName())
                     .add("assignedBy", entry.getAssignedBy())

src/main/java/propertyFiles/Bundle.properties

@@ -3292,15 +3292,6 @@ updateDatasetFieldsCommand.api.processDatasetUpdate.parseError=Error parsing dat
 
 #AbstractApiBean.java
 abstractApiBean.error.datasetInternalVersionNumberIsOutdated=Dataset internal version number {0} is outdated
-# Role Assignment History (used in the AbstractApiBean)
-datasets.api.permissions.history.definitionPoint=Definition Point
-datasets.api.permissions.history.definitionPoints=Definition Points
-datasets.api.permissions.history.assignee=Assignee
-datasets.api.permissions.history.role=Role
-datasets.api.permissions.history.assignedBy=Assigned By
-datasets.api.permissions.history.assignedAt=Assigned At
-datasets.api.permissions.history.revokedBy=Revoked By
-datasets.api.permissions.history.revokedAt=Revoked At
 
 #RoleAssigneeServiceBean.java
 roleAssigneeServiceBean.error.dataverseRequestCannotBeNull=DataverseRequest cannot be null.