javadocs, refactor item cast to item search

4Science · Mar 4, 2024 · f2683da · f2683da
1 parent 993861a
commit f2683da
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java
@@ -66,5 +66,11 @@ public List<LDNMessageEntity> findAllMessagesByItem(
     public List<LDNMessageEntity> findAllRelatedMessagesByItem(
         Context context, LDNMessageEntity msg, Item item, String... relatedTypes) throws SQLException;
 
+    /**
+     *
+     * @param context
+     * @return the list of messages in need to be reprocessed - with queue_status as QUEUE_STATUS_QUEUED_FOR_RETRY
+     * @throws SQLException
+     */
     public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException;
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
@@ -182,8 +182,7 @@ private long ipToLong(InetAddress ip) {
 
     @Override
     public void update(Context context, LDNMessageEntity ldnMessage) throws SQLException {
-        // CST-12126 then LDNMessageService.update() when the origin is set != null,
-        // move the queue_status from UNTRUSTED to QUEUED
+        // move the queue_status from UNTRUSTED to QUEUED if origin is a known NotifyService
         if (ldnMessage.getOrigin() != null &&
             LDNMessageEntity.QUEUE_STATUS_UNTRUSTED.compareTo(ldnMessage.getQueueStatus()) == 0) {
             ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);

diff --git a/...-api/src/main/java/org/dspace/discovery/indexobject/LDNMessageEntityIndexFactoryImpl.java b/...-api/src/main/java/org/dspace/discovery/indexobject/LDNMessageEntityIndexFactoryImpl.java
@@ -89,12 +89,12 @@ public SolrInputDocument buildDocument(Context context, IndexableLDNNotification
         doc.addField("queue_status_s", LDNMessageEntity.getQueueStatus(ldnMessage));
         addFacetIndex(doc, "queue_status", String.valueOf(ldnMessage.getQueueStatus()),
             LDNMessageEntity.getQueueStatus(ldnMessage));
-        Item item = (Item) ldnMessage.getObject();
+        Item item = itemService.findByIdOrLegacyId(context, ldnMessage.getObject().getID().toString());
         if (item != null) {
             addFacetIndex(doc, "object", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
             addFacetIndex(doc, "relateditem", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
         }
-        item = (Item) ldnMessage.getContext();
+        item = itemService.findByIdOrLegacyId(context, ldnMessage.getContext().getID().toString());
         if (item != null) {
             addFacetIndex(doc, "context", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
             addFacetIndex(doc, "relateditem", item.getID().toString(), itemService.getMetadata(item, "dc.title"));

diff --git a/...-server-webapp/src/main/java/org/dspace/app/rest/converter/LDNMessageEntityConverter.java b/...-server-webapp/src/main/java/org/dspace/app/rest/converter/LDNMessageEntityConverter.java
@@ -16,7 +16,9 @@
 import org.dspace.content.DSpaceObject;
 import org.dspace.discovery.IndexableObject;
 import org.springframework.stereotype.Component;
-/*
+
+/**
+ * Converter to translate between {@link LDNMessageEntity} and {@link LDNMessageEntityRest} representations.
  *  @author Stefano Maffei (stefano.maffei at 4science.com)
  */
 @Component

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LDNMessageEntityRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LDNMessageEntityRest.java
@@ -11,8 +11,10 @@
 import java.util.UUID;
 
 import org.dspace.app.rest.RestResourceController;
-/*
- *  @author Stefano Maffei (stefano.maffei at 4science.com)
+
+/**
+ * The LDN Message REST resource.
+ * @author Stefano Maffei (stefano.maffei at 4science.com)
  */
 @SuppressWarnings("serial")
 public class LDNMessageEntityRest extends BaseObjectRest<String> {