Merge remote-tracking branch 'bitbucket4science/dspace-cris-2024_02_x' into dspace-cris-2024_02_x

Author: atarix83

dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java

@@ -87,7 +87,6 @@
 import org.dspace.content.Item;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.content.service.BitstreamService;
-import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.disseminate.CitationDocumentServiceImpl;
 import org.dspace.eperson.EPerson;
@@ -105,7 +104,6 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 
@@ -139,18 +137,9 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
     @Autowired
     private AuthorizeService authorizeService;
 
-    @Autowired
-    private CollectionService collectionService;
-
     @Autowired
     private BitstreamStorageService bitstreamStorageService;
 
-    @Autowired
-    private S3BitStoreService s3BitStoreService;
-
-    @Autowired
-    private ApplicationContext applicationContext;
-
     // S3Mock related fields for integration testing
     private S3Mock s3Mock;
     private AmazonS3 amazonS3Client;

dspace/config/modules/assetstore.cfg

@@ -70,5 +70,9 @@ assetstore.s3.endpoint =
 # session token
 assetstore.s3.awsToken =
 
+assetstore.s3.temp.enabled = false
+assetstore.s3.temp.bucketName =
+assetstore.s3.temp.subfolder =
+
 # Pre-signed URL expiration time in seconds (default is 15 minutes)
 # assetstore.s3.presigned.url.expiration.seconds =

dspace/config/spring/api/bitstore.xml

@@ -9,6 +9,7 @@
             <map>
                 <entry key="0" value-ref="localStore"/>
                 <entry key="1" value-ref="s3Store"/>
+                <entry key="2" value-ref="s3TempStore"/>
             </map>
         </property>
     </bean>
@@ -40,6 +41,29 @@
         <property name="endpoint" value="${assetstore.s3.endpoint}"/>
     </bean>
 
+  <bean name="s3TempStore" class="org.dspace.storage.bitstore.S3BitStoreService" scope="singleton" lazy-init="true">
+    <property name="enabled" value="${assetstore.s3.temp.enabled}"/>
+    <!-- AWS Security credentials, with policies for specified bucket -->
+    <property name="awsAccessKey" value="${assetstore.s3.awsAccessKey}"/>
+    <property name="awsSecretKey" value="${assetstore.s3.awsSecretKey}"/>
+    <property name="awsSessionToken" value="${assetstore.s3.awsToken}"/>
+    <property name="useRelativePath" value="${assetstore.s3.useRelativePath}"/>
+
+    <!-- S3 bucket name to store assets in. example: longsight-dspace-auk -->
+    <property name="bucketName" value="${assetstore.s3.temp.bucketName}"/>
+
+    <!-- AWS S3 Region to use: {us-east-1, us-west-1, eu-west-1, eu-central-1, ap-southeast-1, ... } -->
+    <!-- Optional, sdk default is us-east-1 -->
+    <property name="awsRegionName" value="${assetstore.s3.awsRegionName}"/>
+
+    <!-- Subfolder to organize assets within the bucket, in case this bucket is shared  -->
+    <!-- Optional, default is root level of bucket -->
+    <property name="subfolder" value="${assetstore.s3.temp.subfolder}"/>
+    <property name="maxConnections" value="${assetstore.s3.maxConnections}"/>
+    <property name="connectionTimeout" value="${assetstore.s3.connectionTimeout}"/>
+    <property name="endpoint" value="${assetstore.s3.endpoint}"/>
+  </bean>
+
     <!-- <bean name="localStore2 ... -->
     <!-- <bean name="s3Store2 ... -->
 </beans>