multiple configuration for repository

pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>gr.cite.opendmp</groupId>
             <artifactId>repositorydepositbase</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.4</version>
         </dependency>
 
         <dependency>

src/main/java/eu/eudat/depositinterface/dspacerepository/config/ConfigLoader.java

@@ -1,6 +1,8 @@
 package eu.eudat.depositinterface.dspacerepository.config;
 
+import java.util.List;
+
 public interface ConfigLoader {
-    byte[] getLogo();
+    byte[] getLogo(String repositoryId);
-    DSpaceConfig getDSpaceConfig();
+    List<DSpaceConfig> getDSpaceConfig();
 }

src/main/java/eu/eudat/depositinterface/dspacerepository/config/ConfigLoaderImpl.java

@@ -1,5 +1,6 @@
 package eu.eudat.depositinterface.dspacerepository.config;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -8,32 +9,41 @@ import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
 
 @Service("dspaceConfigLoader")
 public class ConfigLoaderImpl implements ConfigLoader{
     private static final Logger logger = LoggerFactory.getLogger(ConfigLoaderImpl.class);
     private static final ObjectMapper mapper = new ObjectMapper();
 
-    private DSpaceConfig dspaceConfig;
+    private List<DSpaceConfig> dSpaceConfigs = new ArrayList<>();
+
+    private final Environment environment;
 
     @Autowired
-    private Environment environment;
+    public ConfigLoaderImpl(Environment environment){
+        this.environment = environment;
+    }
 
     @Override
-    public DSpaceConfig getDSpaceConfig() {
+    public List<DSpaceConfig> getDSpaceConfig() {
-        if(dspaceConfig == null){
+        if(dSpaceConfigs == null || dSpaceConfigs.isEmpty()){
             try{
-                dspaceConfig = mapper.readValue(getStreamFromPath(environment.getProperty("configuration.dspace")), DSpaceConfig.class);
+                dSpaceConfigs = mapper.readValue(getStreamFromPath(environment.getProperty("configuration.dspace")), new TypeReference<List<DSpaceConfig>>() {});
             } catch (IOException e) {
                 logger.error(e.getLocalizedMessage(), e);
             }
         }
-        return dspaceConfig;
+        return dSpaceConfigs;
     }
 
     @Override
-    public byte[] getLogo() {
+    public byte[] getLogo(String repositoryId) {
-        String logo = environment.getProperty("configuration.logo");
+        if (!dSpaceConfigs.isEmpty()) {
+            DSpaceConfig dSpaceConfig = dSpaceConfigs.stream().filter(x -> x.getRepositoryId().equals(repositoryId)).findFirst().orElse(null);
+            if (dSpaceConfig != null) {
+                String logo = dSpaceConfig.getLogo();
                 InputStream logoStream;
                 if(logo != null && !logo.isEmpty()) {
                     logoStream = getStreamFromPath(logo);
@@ -46,8 +56,11 @@ public class ConfigLoaderImpl implements ConfigLoader{
                 }
                 catch (IOException e){
                     logger.error(e.getMessage(), e);
+                }
+            }
             return null;
         }
+        return null;
     }
 
     private InputStream getStreamFromPath(String filePath) {

src/main/java/eu/eudat/depositinterface/dspacerepository/config/DSpaceConfig.java

@@ -51,6 +51,8 @@ public class DSpaceConfig {
     private String collection;
     @JsonProperty("hasLogo")
     private boolean hasLogo;
+    @JsonProperty("logo")
+    private String logo;
 
     public int getDepositType() {
         return depositType;
@@ -122,6 +124,13 @@ public class DSpaceConfig {
         this.hasLogo = hasLogo;
     }
 
+    public String getLogo() {
+        return logo;
+    }
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
     public RepositoryDepositConfiguration toRepoConfig() {
         RepositoryDepositConfiguration config = new RepositoryDepositConfiguration();
         config.setDepositType(this.depositType);

src/main/java/eu/eudat/depositinterface/dspacerepository/interfaces/DSpaceDeposit.java

@@ -32,14 +32,15 @@ import java.nio.file.Files;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Component
 public class DSpaceDeposit implements RepositoryDeposit {
     private static final Logger logger = LoggerFactory.getLogger(DSpaceDeposit.class);
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
-    private ConfigLoader configLoader;
+    private final ConfigLoader configLoader;
-    private Environment environment;
+    private final Environment environment;
 
     private String csrfToken;
     private String bearerToken;
@@ -51,13 +52,16 @@ public class DSpaceDeposit implements RepositoryDeposit {
     public DSpaceDeposit(ConfigLoader configLoader, Environment environment){
         this.configLoader = configLoader;
         this.environment = environment;
-        this.repositoryApiUrl = configLoader.getDSpaceConfig().getRepositoryUrl();
     }
 
     @Override
-    public String deposit(DMPDepositModel dmpDepositModel, String repositoryAccessToken) throws Exception {
+    public String deposit(String repositoryId, DMPDepositModel dmpDepositModel, String repositoryAccessToken) throws Exception {
 
-        DSpaceConfig dSpaceConfig = this.configLoader.getDSpaceConfig();
+        DSpaceConfig dSpaceConfig = this.configLoader.getDSpaceConfig().stream().filter(x -> x.getRepositoryId().equals(repositoryId)).findFirst().orElse(null);
+
+        if (dSpaceConfig != null) {
+
+            this.repositoryApiUrl = dSpaceConfig.getRepositoryUrl();
 
             this.setCsrfToken();
             this.setBearerToken(dSpaceConfig.getEmail(), dSpaceConfig.getPassword());
@@ -131,6 +135,10 @@ public class DSpaceDeposit implements RepositoryDeposit {
 
         }
 
+        return null;
+
+    }
+
     private void deleteFiles(String workSpaceItemId){
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = this.createHeaders();
@@ -372,23 +380,25 @@ public class DSpaceDeposit implements RepositoryDeposit {
     }
 
     @Override
-    public RepositoryDepositConfiguration getConfiguration() {
+    public List<RepositoryDepositConfiguration> getConfiguration() {
-        eu.eudat.depositinterface.dspacerepository.config.DSpaceConfig dspaceConfig = this.configLoader.getDSpaceConfig();
+        List<eu.eudat.depositinterface.dspacerepository.config.DSpaceConfig> dSpaceConfigs = this.configLoader.getDSpaceConfig();
-        return dspaceConfig.toRepoConfig();
+        return dSpaceConfigs.stream().map(DSpaceConfig::toRepoConfig).collect(Collectors.toList());
     }
 
     @Override
-    public String authenticate(String code) {
+    public String authenticate(String repositoryId, String code) {
         return null;
     }
 
     @Override
-    public String getLogo() {
+    public String getLogo(String repositoryId) {
-        RepositoryDepositConfiguration conf = this.getConfiguration();
+        RepositoryDepositConfiguration conf = this.getConfiguration().stream().filter(x -> x.getRepositoryId().equals(repositoryId)).findFirst().orElse(null);
+        if(conf != null) {
             if(conf.isHasLogo()){
-            byte[] logo = this.configLoader.getLogo();
+                byte[] logo = this.configLoader.getLogo(repositoryId);
                 return (logo != null && logo.length != 0) ? Base64.getEncoder().encodeToString(logo) : null;
             }
+        }
         return null;
     }
 }

src/main/resources/application.properties

@@ -1,3 +1,2 @@
 storage.temp=${STORAGE_TMP_DSPACE}
 configuration.dspace=${CONFIGURATION_DSPACE}
-configuration.dspace.logo=${CONFIGURATION_LOGO_DSPACE}