Bxc 4067 thumbnail retrieval (#1612)

* BXC-4067 fix null action in thumbnail request * BXC-4067 find work's assigned thumbnnail * BXC-4067 trying to fix things * BXC-4067 using thumbnails consistently * BXC-4067 remove unused import * remove new line --------- Co-authored-by: Sharon Luong <[email protected]>
UNC-Libraries · Oct 9, 2023 · 0216755 · 0216755
1 parent b0c2bd7
commit 0216755
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 17 deletions.
diff --git a/...tions/jms/thumbnail/ThumbnailRequest.java → ...ions/jms/thumbnails/ThumbnailRequest.java b/...tions/jms/thumbnail/ThumbnailRequest.java → ...ions/jms/thumbnails/ThumbnailRequest.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.operations.jms.thumbnail;
+package edu.unc.lib.boxc.operations.jms.thumbnails;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import edu.unc.lib.boxc.auth.api.models.AgentPrincipals;

diff --git a/...jms/thumbnail/ThumbnailRequestSender.java → ...ms/thumbnails/ThumbnailRequestSender.java b/...jms/thumbnail/ThumbnailRequestSender.java → ...ms/thumbnails/ThumbnailRequestSender.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.operations.jms.thumbnail;
+package edu.unc.lib.boxc.operations.jms.thumbnails;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;

diff --git a/.../ThumbnailRequestSerializationHelper.java → .../ThumbnailRequestSerializationHelper.java b/.../ThumbnailRequestSerializationHelper.java → .../ThumbnailRequestSerializationHelper.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.operations.jms.thumbnail;
+package edu.unc.lib.boxc.operations.jms.thumbnails;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectReader;

diff --git a/...thumbnail/ThumbnailRequestSenderTest.java → ...humbnails/ThumbnailRequestSenderTest.java b/...thumbnail/ThumbnailRequestSenderTest.java → ...humbnails/ThumbnailRequestSenderTest.java
@@ -1,4 +1,4 @@
-package edu.unc.lib.boxc.operations.jms.thumbnail;
+package edu.unc.lib.boxc.operations.jms.thumbnails;
 
 import edu.unc.lib.boxc.auth.api.models.AgentPrincipals;
 import edu.unc.lib.boxc.auth.fcrepo.models.AccessGroupSetImpl;

diff --git a/...p/src/main/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailRequestProcessor.java b/...p/src/main/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailRequestProcessor.java
@@ -8,8 +8,8 @@
 import edu.unc.lib.boxc.model.fcrepo.ids.PIDs;
 import edu.unc.lib.boxc.operations.jms.indexing.IndexingActionType;
 import edu.unc.lib.boxc.operations.jms.indexing.IndexingMessageSender;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequest;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSerializationHelper;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequest;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSerializationHelper;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 

diff --git a/services-camel-app/src/main/webapp/WEB-INF/service-context.xml b/services-camel-app/src/main/webapp/WEB-INF/service-context.xml
@@ -499,6 +499,13 @@
         <property name="orderNotificationService" ref="orderNotificationService" />
     </bean>
 
+    <bean id="thumbnailRequestProcessor" class="edu.unc.lib.boxc.services.camel.thumbnails.ThumbnailRequestProcessor">
+        <property name="aclService" ref="aclService" />
+        <property name="indexingMessageSender" ref="indexingMessageSender" />
+        <property name="repositoryObjectLoader" ref="repositoryObjectLoader" />
+        <property name="repositoryObjectFactory" ref="repositoryObjectFactory" />
+    </bean>
+
     <!-- Camel contexts -->
 
     <camel:camelContext id="FcrepoTriplestoreIndexer">
@@ -556,4 +563,8 @@
     <camel:camelContext id="CdrMemberOrder">
         <camel:package>edu.unc.lib.boxc.services.camel.order</camel:package>
     </camel:camelContext>
+
+    <camel:camelContext id="CdrThumbnails">
+        <camel:package>edu.unc.lib.boxc.services.camel.thumbnails</camel:package>
+    </camel:camelContext>
 </beans>
diff --git a/...-app/src/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailProcessorTest.java b/...-app/src/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailProcessorTest.java
@@ -15,8 +15,8 @@
 import org.apache.jena.rdf.model.Resource;
 import edu.unc.lib.boxc.operations.jms.indexing.IndexingActionType;
 import edu.unc.lib.boxc.operations.jms.indexing.IndexingMessageSender;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequest;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSerializationHelper;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequest;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSerializationHelper;
 import edu.unc.lib.boxc.services.camel.ProcessorTestHelper;
 import org.apache.camel.Exchange;
 import org.junit.Before;

diff --git a/...mel-app/src/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailRouterTest.java b/...mel-app/src/test/java/edu/unc/lib/boxc/services/camel/thumbnails/ThumbnailRouterTest.java
@@ -4,8 +4,8 @@
 import edu.unc.lib.boxc.auth.fcrepo.models.AccessGroupSetImpl;
 import edu.unc.lib.boxc.auth.fcrepo.models.AgentPrincipalsImpl;
 import edu.unc.lib.boxc.services.camel.ProcessorTestHelper;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequest;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSerializationHelper;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequest;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSerializationHelper;
 import org.apache.camel.BeanInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;

diff --git a/...ices-app/src/main/java/edu/unc/lib/boxc/web/services/rest/modify/ThumbnailController.java b/...ices-app/src/main/java/edu/unc/lib/boxc/web/services/rest/modify/ThumbnailController.java
@@ -12,8 +12,8 @@
 import edu.unc.lib.boxc.model.api.objects.FileObject;
 import edu.unc.lib.boxc.model.api.objects.RepositoryObjectLoader;
 import edu.unc.lib.boxc.model.fcrepo.ids.PIDs;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequest;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSender;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequest;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -115,6 +115,8 @@ public ResponseEntity<Object> assignThumbnail(@PathVariable("pidString") String
         var request = new ThumbnailRequest();
         request.setAgent(agent);
         request.setFilePidString(pidString);
+        request.setAction(ThumbnailRequest.ASSIGN);
+
         try {
             thumbnailRequestSender.sendToQueue(request);
         } catch (IOException e) {

diff --git a/web-services-app/src/main/webapp/WEB-INF/service-context.xml b/web-services-app/src/main/webapp/WEB-INF/service-context.xml
@@ -429,11 +429,11 @@
 
     <bean id="thumbnailRequestJmsTemplate" class="org.springframework.jms.core.JmsTemplate">
         <property name="connectionFactory" ref="jmsFactory" />
-        <property name="defaultDestinationName" value="${cdr.thumbnail.stream}" />
+        <property name="defaultDestinationName" value="${cdr.thumbnails.stream}" />
         <property name="pubSubDomain" value="false" />
     </bean>
 
-    <bean id="thumbnailRequestSender" class="edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSender">
+    <bean id="thumbnailRequestSender" class="edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSender">
         <property name="jmsTemplate" ref="thumbnailRequestJmsTemplate"/>
     </bean>
 

diff --git a/web-services-app/src/test/java/edu/unc/lib/boxc/web/services/rest/modify/ThumbnailIT.java b/web-services-app/src/test/java/edu/unc/lib/boxc/web/services/rest/modify/ThumbnailIT.java
@@ -23,8 +23,8 @@
 import java.nio.file.Path;
 
 import edu.unc.lib.boxc.model.api.objects.RepositoryObjectLoader;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequest;
-import edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSender;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequest;
+import edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSender;
 import org.apache.commons.io.IOUtils;
 import org.jdom2.Document;
 import org.jdom2.Element;

diff --git a/web-services-app/src/test/resources/thumb-it-servlet.xml b/web-services-app/src/test/resources/thumb-it-servlet.xml
@@ -36,6 +36,6 @@
     </bean>
 
     <bean id="thumbnailRequestSender" class="org.mockito.Mockito" factory-method="mock">
-        <constructor-arg value="edu.unc.lib.boxc.operations.jms.thumbnail.ThumbnailRequestSender" />
+        <constructor-arg value="edu.unc.lib.boxc.operations.jms.thumbnails.ThumbnailRequestSender" />
     </bean>
 </beans>