diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java index 42841ea36b..dd0bd8287b 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java +++ b/dspace-api/src/main/java/org/dspace/eperson/SubscribeCLITool.java @@ -104,12 +104,12 @@ public class SubscribeCLITool { // Go through the list collating subscriptions for each e-person for (Subscription subscription : subscriptions) { - if (!(subscription.getdSpaceObject() != null && subscription.getdSpaceObject() instanceof Collection)) { + if (!(subscription.getDSpaceObject() != null && subscription.getDSpaceObject() instanceof Collection)) { continue; } // Does this row relate to the same e-person as the last? if ((currentEPerson == null) - || (!subscription.getePerson().getID().equals(currentEPerson + || (!subscription.getEPerson().getID().equals(currentEPerson .getID()))) { // New e-person. Send mail for previous e-person if (currentEPerson != null) { @@ -123,11 +123,11 @@ public class SubscribeCLITool { } } - currentEPerson = subscription.getePerson(); + currentEPerson = subscription.getEPerson(); collections = new ArrayList<>(); } - collections.add((Collection) subscription.getdSpaceObject()); + collections.add((Collection) subscription.getDSpaceObject()); } // Process the last person diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java index b54e7c5ec6..b92f1138d8 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java @@ -70,7 +70,7 @@ public class SubscribeServiceImpl implements SubscribeService { Subscription newSubscription = subscriptionDAO.create(context, new Subscription()); subscriptionParameterList.forEach(subscriptionParameter -> newSubscription.addParameter(subscriptionParameter)); - newSubscription.setePerson(eperson); + newSubscription.setEPerson(eperson); newSubscription.setdSpaceObject(dSpaceObject); newSubscription.setSubscriptionType(type); return newSubscription; @@ -156,7 +156,7 @@ public class SubscribeServiceImpl implements SubscribeService { subscriptionDB.setSubscriptionType(type); subscriptionDB.setdSpaceObject(dSpaceObject); subscriptionParameterList.forEach(x -> subscriptionDB.addParameter(x)); - subscriptionDB.setePerson(eperson); + subscriptionDB.setEPerson(eperson); subscriptionDAO.save(context, subscriptionDB); return subscriptionDB; } diff --git a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java index c706a1db60..7ca19c6020 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java +++ b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java @@ -71,7 +71,7 @@ public class Subscription implements ReloadableEntity { return id; } - public DSpaceObject getdSpaceObject() { + public DSpaceObject getDSpaceObject() { return this.dSpaceObject; } @@ -79,11 +79,11 @@ public class Subscription implements ReloadableEntity { this.dSpaceObject = dSpaceObject; } - public EPerson getePerson() { + public EPerson getEPerson() { return ePerson; } - public void setePerson(EPerson ePerson) { + public void setEPerson(EPerson ePerson) { this.ePerson = ePerson; } diff --git a/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java b/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java index a01a6e33a4..e017cbe2f0 100644 --- a/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java +++ b/dspace-api/src/main/java/org/dspace/subscriptions/ContentGenerator.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * Implementation class of SubscriptionGenerator * which will handle the logic of sending the emails - * in case of content subscriptions + * in case of 'content' subscriptionType */ @SuppressWarnings("rawtypes") public class ContentGenerator implements SubscriptionGenerator { diff --git a/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotification.java b/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotification.java index 04c9429c67..7cfa9bd334 100644 --- a/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotification.java +++ b/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotification.java @@ -41,7 +41,7 @@ public class SubscriptionEmailNotification @Override public void setup() throws ParseException { this.subscriptionEmailNotificationService = new DSpace().getServiceManager().getServiceByName( - SubscriptionEmailNotificationService.class.getName(), SubscriptionEmailNotificationService.class); + SubscriptionEmailNotificationServiceImpl.class.getName(), SubscriptionEmailNotificationServiceImpl.class); } @Override diff --git a/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotificationServiceImpl.java b/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotificationServiceImpl.java index 8bf5af06c7..d9937143cb 100644 --- a/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotificationServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/subscriptions/SubscriptionEmailNotificationServiceImpl.java @@ -77,12 +77,12 @@ public class SubscriptionEmailNotificationServiceImpl implements SubscriptionEma } @SuppressWarnings("unchecked") - public void perform(Context context, DSpaceRunnableHandler handler, String type, String frequency) { + public void perform(Context context, DSpaceRunnableHandler handler, String subscriptionType, String frequency) { try { - List subscriptions = findAllSubscriptionsBySubscriptionTypeAndFrequency(context, type, - frequency); - // Here is verified if type is "content" Or "statistics" as them are configured - if (subscriptionType2generators.keySet().contains(type)) { + List subscriptions = + findAllSubscriptionsBySubscriptionTypeAndFrequency(context, subscriptionType, frequency); + // Here is verified if SubscriptionType is "content" Or "statistics" as them are configured + if (subscriptionType2generators.keySet().contains(subscriptionType)) { // the list of the person who has subscribed int iterator = 0; for (Subscription subscription : subscriptions) { @@ -97,13 +97,13 @@ public class SubscriptionEmailNotificationServiceImpl implements SubscriptionEma items.addAll(contentUpdates.get(Item.class.getSimpleName().toLowerCase(Locale.ROOT)) .findUpdates(context, dSpaceObject, frequency)); } - var ePerson = subscription.getePerson(); + var ePerson = subscription.getEPerson(); if (iterator < subscriptions.size() - 1) { - if (ePerson.equals(subscriptions.get(iterator + 1).getePerson())) { + if (ePerson.equals(subscriptions.get(iterator + 1).getEPerson())) { iterator++; continue; } else { - subscriptionType2generators.get(type) + subscriptionType2generators.get(subscriptionType) .notifyForSubscriptions(context, ePerson, communities, collections, items); communities.clear(); collections.clear(); @@ -111,14 +111,14 @@ public class SubscriptionEmailNotificationServiceImpl implements SubscriptionEma } } else { //in the end of the iteration - subscriptionType2generators.get(type) + subscriptionType2generators.get(subscriptionType) .notifyForSubscriptions(context, ePerson, communities, collections, items); } iterator++; } } else { - throw new IllegalArgumentException("Currently this type:" + type + - " of subscription is not supported!"); + throw new IllegalArgumentException("Currently this SubscriptionType:" + subscriptionType + + " is not supported!"); } } catch (Exception e) { log.error(e.getMessage(), e); @@ -128,9 +128,9 @@ public class SubscriptionEmailNotificationServiceImpl implements SubscriptionEma } private DSpaceObject getdSpaceObject(Subscription subscription) { - DSpaceObject dSpaceObject = subscription.getdSpaceObject(); - if (subscription.getdSpaceObject() instanceof HibernateProxy) { - HibernateProxy hibernateProxy = (HibernateProxy) subscription.getdSpaceObject(); + DSpaceObject dSpaceObject = subscription.getDSpaceObject(); + if (subscription.getDSpaceObject() instanceof HibernateProxy) { + HibernateProxy hibernateProxy = (HibernateProxy) subscription.getDSpaceObject(); LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer(); dSpaceObject = (DSpaceObject) initializer.getImplementation(); } @@ -143,7 +143,7 @@ public class SubscriptionEmailNotificationServiceImpl implements SubscriptionEma return subscribeService.findAllSubscriptionsBySubscriptionTypeAndFrequency(context, subscriptionType, frequency) .stream() - .sorted(Comparator.comparing(s -> s.getePerson().getID())) + .sorted(Comparator.comparing(s -> s.getEPerson().getID())) .collect(Collectors.toList()); } catch (SQLException e) { log.error(e.getMessage(), e); diff --git a/dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemsUpdates.java b/dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemUpdates.java similarity index 97% rename from dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemsUpdates.java rename to dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemUpdates.java index de8bd2beb7..5c8a290a45 100644 --- a/dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemsUpdates.java +++ b/dspace-api/src/main/java/org/dspace/subscriptions/dSpaceObjectsUpdates/ItemUpdates.java @@ -46,9 +46,9 @@ import org.dspace.subscriptions.service.DSpaceObjectUpdates; * * @author Alba Aliu */ -public class ItemsUpdates implements DSpaceObjectUpdates { +public class ItemUpdates implements DSpaceObjectUpdates { - private final Logger log = LogManager.getLogger(ItemsUpdates.class); + private final Logger log = LogManager.getLogger(ItemUpdates.class); private final CollectionService collectionService; private final CommunityService communityService; @@ -181,7 +181,7 @@ public class ItemsUpdates implements DSpaceObjectUpdates { return discoverQuery; } - public ItemsUpdates(CollectionService collectionService, CommunityService communityService, ItemService itemService, + public ItemUpdates(CollectionService collectionService, CommunityService communityService, ItemService itemService, DiscoveryConfigurationService searchConfigurationService, SearchService searchService) { this.collectionService = collectionService; this.communityService = communityService; diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java index 762736d5d0..fc0907c4bf 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java @@ -45,12 +45,12 @@ public class SubscriptionDSpaceObjectLinkRepository extends AbstractDSpaceRestRe if (Objects.isNull(subscription)) { throw new ResourceNotFoundException("No such subscription: " + subscriptionId); } - if (subscription.getdSpaceObject() instanceof Item || - subscription.getdSpaceObject() instanceof Community || - subscription.getdSpaceObject() instanceof Collection) { - return converter.toRest(subscription.getdSpaceObject(), projection); + if (subscription.getDSpaceObject() instanceof Item || + subscription.getDSpaceObject() instanceof Community || + subscription.getDSpaceObject() instanceof Collection) { + return converter.toRest(subscription.getDSpaceObject(), projection); } else { - HibernateProxy hibernateProxy = (HibernateProxy) subscription.getdSpaceObject(); + HibernateProxy hibernateProxy = (HibernateProxy) subscription.getDSpaceObject(); LazyInitializer initializer = hibernateProxy.getHibernateLazyInitializer(); return converter.toRest(initializer.getImplementation(), projection); } diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java index 4857b1f2d8..dcf612e52d 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java @@ -40,7 +40,7 @@ public class SubscriptionEPersonLinkRepository extends AbstractDSpaceRestReposit if (Objects.isNull(subscription)) { throw new ResourceNotFoundException("No such subscription: " + subscriptionId); } - return converter.toRest(subscription.getePerson(), projection); + return converter.toRest(subscription.getEPerson(), projection); } catch (SQLException e) { throw new RuntimeException(e.getMessage(), e); } diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java index b92fed9435..0f637d186a 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java @@ -74,7 +74,7 @@ public class SubscriptionRestPermissionEvaluatorPlugin extends RestObjectPermiss } Subscription subscription = subscribeService.findById(context, Integer.parseInt(targetId.toString())); - return Objects.nonNull(subscription) ? currentUser.equals(subscription.getePerson()) : true; + return Objects.nonNull(subscription) ? currentUser.equals(subscription.getEPerson()) : true; } catch (SQLException e) { log.error(e.getMessage(), e); } diff --git a/dspace/config/spring/api/subscriptions_email_configuration.xml b/dspace/config/spring/api/subscriptions_email_configuration.xml index 42d6763272..597968e347 100644 --- a/dspace/config/spring/api/subscriptions_email_configuration.xml +++ b/dspace/config/spring/api/subscriptions_email_configuration.xml @@ -82,6 +82,6 @@ - +