diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java index 9838e58697..1737490fbb 100644 --- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java +++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemMetadataStrategy.java @@ -63,7 +63,7 @@ public class RequestItemMetadataStrategy extends RequestItemSubmitterStrategy { } else { // Uses the basic strategy to look for the original submitter author = super.getRequestItemAuthor(context, item); - // Is the author or his email null, so get the help desk or admin name and email + // Is the author or their email null. If so get the help desk or admin name and email if (null == author || null == author.getEmail()) { String email = null; String name = null; diff --git a/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java b/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java index be804a9bbb..673a30d2dd 100644 --- a/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java +++ b/dspace-api/src/main/java/org/dspace/content/LicenseUtils.java @@ -59,7 +59,7 @@ public class LicenseUtils { * {6} the eperson object that will be formatted using the appropriate * LicenseArgumentFormatter plugin (if defined)
* {x} any addition argument supplied wrapped in the - * LicenseArgumentFormatter based on his type (map key) + * LicenseArgumentFormatter based on its type (map key) * * @param locale Formatter locale * @param collection collection to get license from diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java index f0776d5d98..c705be3284 100644 --- a/dspace-api/src/main/java/org/dspace/core/Context.java +++ b/dspace-api/src/main/java/org/dspace/core/Context.java @@ -718,7 +718,7 @@ public class Context implements AutoCloseable { } /** - * Restore the user bound to the context and his special groups + * Restore the user bound to the context and their special groups * * @throws IllegalStateException if no switch was performed before */ diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java index 1152ee669c..a8ffbb4b40 100644 --- a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java +++ b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetTimeGenerator.java @@ -187,7 +187,7 @@ public class DatasetTimeGenerator extends DatasetGenerator { cal2.clear(Calendar.HOUR); cal1.clear(Calendar.HOUR_OF_DAY); cal2.clear(Calendar.HOUR_OF_DAY); - //yet i know calendar just won't clear his hours + //yet i know calendar just won't clear its hours cal1.set(Calendar.HOUR_OF_DAY, 0); cal2.set(Calendar.HOUR_OF_DAY, 0); } diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java index c651097fcb..aecdccd55a 100644 --- a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java @@ -100,7 +100,7 @@ public class WorkflowRequirementsServiceImpl implements WorkflowRequirementsServ //Then remove the current user from the inProgressUsers inProgressUserService.delete(context, inProgressUserService.findByWorkflowItemAndEPerson(context, wfi, user)); - //Make sure the removed user has his custom rights removed + //Make sure the removed user has their custom rights removed xmlWorkflowService.removeUserItemPolicies(context, wfi.getItem(), user); Workflow workflow = workflowFactory.getWorkflow(wfi.getCollection()); diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java index fbe06245ab..90f180ec87 100644 --- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java @@ -447,7 +447,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService { enteredNewStep); } } else if (enteredNewStep) { - // If the user finished his/her step, we keep processing until there is a UI step action or no + // If the user finished their step, we keep processing until there is a UI step action or no // step at all nextStep = workflow.getNextStep(c, wfi, currentStep, currentOutcome.getResult()); c.turnOffAuthorisationSystem(); @@ -938,7 +938,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService { authorizeService.removeEPersonPolicies(context, bitstream, e); } } - // Ensure that the submitter always retains his resource policies + // Ensure that the submitter always retains their resource policies if (e.getID().equals(item.getSubmitter().getID())) { grantSubmitterReadPolicies(context, item); } diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java index f64f1b3942..fb673725e1 100644 --- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java @@ -92,7 +92,7 @@ public class PoolTaskServiceImpl implements PoolTaskService { return poolTask; } else { //If the user has a is processing or has finished the step for a workflowitem, there is no need to look - // for pooltasks for one of his + // for pooltasks for one of their //groups because the user already has the task claimed if (inProgressUserService.findByWorkflowItemAndEPerson(context, workflowItem, ePerson) != null) { return null; diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java index ebeb6714c0..e9c84a0632 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanChangePasswordFeature.java @@ -18,11 +18,11 @@ import org.dspace.core.Context; import org.springframework.stereotype.Component; /** - * The canChangePassword feature. It can be used to verify if the user can change his password. + * The canChangePassword feature. It can be used to verify if the user can change their password. */ @Component @AuthorizationFeatureDocumentation(name = CanChangePasswordFeature.NAME, - description = "It can be used to verify if the user can change his password") + description = "It can be used to verify if the user can change their password") public class CanChangePasswordFeature implements AuthorizationFeature { public static final String NAME = "canChangePassword"; diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java index 4bfce24935..6af9d904a3 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchFilterToAppliedFilterConverter.java @@ -29,7 +29,7 @@ public class SearchFilterToAppliedFilterConverter { AuthorityValue authorityValue = null; if (searchFilter.hasAuthorityOperator()) { // FIXME this is obviously wrong as it assumes that the authorityValueService is able to retrieve the label - // for each Authority. Indeed, the AuthorityValueService regardless to his name is specific of the + // for each Authority. Indeed, the AuthorityValueService regardless of its name is specific of the // "SOLRAuthority" implementation and should not have a prominent role. // Moreover, it is not possible to discover which authority is responsible for the value selected in the // facet as the authority is bind at the metadata level and so a facet could contains values from multiple diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java index 0e208a68a2..ce6783ae15 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java @@ -34,7 +34,7 @@ import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; /** - * An authenticated user is allowed to view, update or delete his or her own data. This {@link RestPermissionEvaluatorPlugin} + * An authenticated user is allowed to view, update or delete their own data. This {@link RestPermissionEvaluatorPlugin} * implements that requirement. */ @Component diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java index 32162acea9..d145dae449 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java @@ -30,7 +30,7 @@ import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; /** - * An authenticated user is allowed to interact with a pool task only if it is in his list. + * An authenticated user is allowed to interact with a pool task only if it is in their list. * * @author Andrea Bollini (andrea.bollini at 4science.it) */ diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java index 66cc873db2..0e0f608078 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java @@ -29,7 +29,7 @@ import org.springframework.stereotype.Component; /** * - * An authenticated user is allowed to view, update or delete his or her own + * An authenticated user is allowed to view, update or delete their own * data. This {@link RestPermissionEvaluatorPlugin} implements that requirement. * * @author Luca Giamminonni (luca.giamminonni at 4science.it) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java index 7068072fb0..3e45455909 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java @@ -4165,7 +4165,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest context.restoreAuthSystemState(); //** WHEN ** - // each submitter, including the administrator should see only her submission + // each submitter, including the administrator should see only their submission String submitterToken = getAuthToken(submitter.getEmail(), password); String adminToken = getAuthToken(admin.getEmail(), password); diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java index f66f68b958..70009d049f 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java @@ -520,7 +520,7 @@ public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegra } /** - * Verify that a user can delete his profile using the delete endpoint. + * Verify that a user can delete their profile using the delete endpoint. * * @throws Exception */ @@ -558,7 +558,7 @@ public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegra } /** - * Verify that a user can hard delete his profile using the delete endpoint. + * Verify that a user can hard delete their profile using the delete endpoint. * * @throws Exception */ @@ -667,7 +667,7 @@ public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegra } /** - * Verify that an user can delete his profile using the delete endpoint even if + * Verify that an user can delete their profile using the delete endpoint even if * was created by an admin. * * @throws Exception @@ -859,7 +859,7 @@ public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegra } /** - * Verify that an user can change the visibility of his profile using the patch + * Verify that an user can change the visibility of their profile using the patch * endpoint even if was created by an admin. * * @throws Exception