From f15a18254ea20a11b0362a8902f74eeafb17b5bd Mon Sep 17 00:00:00 2001
From: Michael Spalti <mspalti@gmail.com>
Date: Thu, 7 Oct 2021 11:54:03 -0700
Subject: [PATCH] Added component annotations.

Added comment.

Fixed import.
---
 .../src/main/java/org/dspace/iiif/CacheEvictBeanLocator.java   | 3 +++
 .../src/main/java/org/dspace/iiif/CacheEvictService.java       | 2 ++
 .../src/main/java/org/dspace/iiif/IIIFCacheEventConsumer.java  | 1 +
 .../src/main/java/org/dspace/app/rest/Application.java         | 2 --
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/iiif/CacheEvictBeanLocator.java b/dspace-api/src/main/java/org/dspace/iiif/CacheEvictBeanLocator.java
index 58e24885ca..b82242e6e1 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/CacheEvictBeanLocator.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/CacheEvictBeanLocator.java
@@ -6,13 +6,16 @@
  * http://www.dspace.org/license/
  */
 package org.dspace.iiif;
+
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
 
 /**
  * Exposes the Spring web application's IIIF cache evict service to the DSpace event consumer.
  */
+@Component
 public class CacheEvictBeanLocator implements ApplicationContextAware {
 
     private static ApplicationContext context;
diff --git a/dspace-api/src/main/java/org/dspace/iiif/CacheEvictService.java b/dspace-api/src/main/java/org/dspace/iiif/CacheEvictService.java
index edb24b41ef..e1b9676039 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/CacheEvictService.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/CacheEvictService.java
@@ -9,10 +9,12 @@ package org.dspace.iiif;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Component;
 
 /**
  * Removes items from the iiif manifests cache.
  */
+@Component
 public class CacheEvictService {
 
     // The cache that is managed by this service.
diff --git a/dspace-api/src/main/java/org/dspace/iiif/IIIFCacheEventConsumer.java b/dspace-api/src/main/java/org/dspace/iiif/IIIFCacheEventConsumer.java
index 84537243b0..4346b11093 100644
--- a/dspace-api/src/main/java/org/dspace/iiif/IIIFCacheEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/iiif/IIIFCacheEventConsumer.java
@@ -45,6 +45,7 @@ public class IIIFCacheEventConsumer implements Consumer {
 
     @Override
     public void consume(Context ctx, Event event) throws Exception {
+        // The service null when the web application context is not provided (i.e. command line operations).
         if (cacheEvictService == null) {
             return;
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
index 517b2c0f16..4ee6570483 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
@@ -21,8 +21,6 @@ import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.dspace.app.sitemap.GenerateSitemaps;
 import org.dspace.app.util.DSpaceContextListener;
-import org.dspace.iiif.CacheEvictBeanLocator;
-import org.dspace.iiif.CacheEvictService;
 import org.dspace.utils.servlet.DSpaceWebappServletFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;