Merge remote-tracking branch 'blessed/master' into DD-1356-data-suppl…

…ier-VLT008

src/main/assembly/dist/cfg/config.yml

@@ -28,16 +28,19 @@ server:
 
 ingestFlow:
   import:
+    apiKey: 'changeme' # overrides the default
     inbox: /var/opt/dans.knaw.nl/tmp/import/inbox
     outbox: /var/opt/dans.knaw.nl/tmp/import/outbox
 
   migration:
+    apiKey: 'changeme' # overrides the default
     inbox: /var/opt/dans.knaw.nl/tmp/migration/deposits
     outbox: /var/opt/dans.knaw.nl/tmp/migration/out
     dataSuppliers:
       USER001: The Organization Name
 
   autoIngest:
+    apiKey: 'changeme' # overrides the default
     inbox: /var/opt/dans.knaw.nl/tmp/auto-ingest/inbox
     outbox: /var/opt/dans.knaw.nl/tmp/auto-ingest/outbox
     depositorRole: swordupdater

src/main/java/nl/knaw/dans/ingest/DdIngestFlowApplication.java

@@ -29,7 +29,6 @@
 import nl.knaw.dans.ingest.core.CsvMessageBodyWriter;
 import nl.knaw.dans.ingest.core.ImportArea;
 import nl.knaw.dans.ingest.core.TaskEvent;
-import nl.knaw.dans.ingest.core.config.IngestAreaConfig;
 import nl.knaw.dans.ingest.core.sequencing.TargetedTaskSequenceManager;
 import nl.knaw.dans.ingest.core.service.BlockedTargetService;
 import nl.knaw.dans.ingest.core.service.BlockedTargetServiceImpl;
@@ -48,7 +47,6 @@
 import nl.knaw.dans.ingest.resources.EventsResource;
 import nl.knaw.dans.ingest.resources.ImportsResource;
 import nl.knaw.dans.ingest.resources.MigrationsResource;
-import nl.knaw.dans.lib.dataverse.DataverseClient;
 import org.glassfish.jersey.media.multipart.MultiPartFeature;
 
 import java.io.IOException;
@@ -101,40 +99,34 @@ public void run(final DdIngestFlowConfiguration configuration, final Environment
         final BlockedTargetService blockedTargetService = new UnitOfWorkAwareProxyFactory(hibernateBundle)
             .create(BlockedTargetServiceImpl.class, BlockedTargetDAO.class, blockedTargetDAO);
 
-        // validate depositors
         final EnqueuingService enqueuingService = new EnqueuingServiceImpl(targetedTaskSequenceManager, 3 /* Must support importArea, migrationArea and autoIngestArea */);
         final TaskEventDAO taskEventDAO = new TaskEventDAO(hibernateBundle.getSessionFactory());
         final TaskEventService taskEventService = new UnitOfWorkAwareProxyFactory(hibernateBundle).create(TaskEventServiceImpl.class, TaskEventDAO.class, taskEventDAO);
+        final var taskFactoryBuilder = new DepositIngestTaskFactoryBuilder(configuration, dansBagValidator, blockedTargetService);
 
         final var importAreaConfig = ingestFlowConfig.getImportConfig();
         final var migrationAreaConfig = ingestFlowConfig.getMigration();
         final var autoIngestAreaConfig = ingestFlowConfig.getAutoIngest();
 
-        final var dataverseClientImportArea = getDataverseClient(configuration, importAreaConfig);
-        final var dataverseClientMigrationArea = getDataverseClient(configuration, migrationAreaConfig);
-        final var dataverseClientAutoIngestArea = getDataverseClient(configuration, autoIngestAreaConfig);
-
-        final var taskFactoryBuilder = new DepositIngestTaskFactoryBuilder(configuration, dansBagValidator, blockedTargetService);
-
         final ImportArea importArea = new ImportArea(
             importAreaConfig.getInbox(),
             importAreaConfig.getOutbox(),
-            taskFactoryBuilder.createTaskFactory(importAreaConfig, dataverseClientImportArea, false),
+            taskFactoryBuilder.createTaskFactory(importAreaConfig, false),
             taskEventService,
             enqueuingService);
 
         // Can be phased out after migration.
         final ImportArea migrationArea = new ImportArea(
             migrationAreaConfig.getInbox(),
             migrationAreaConfig.getOutbox(),
-            taskFactoryBuilder.createTaskFactory(migrationAreaConfig, dataverseClientMigrationArea, true),
+            taskFactoryBuilder.createTaskFactory(migrationAreaConfig, true),
             taskEventService,
             enqueuingService);
 
         final AutoIngestArea autoIngestArea = new AutoIngestArea(
             autoIngestAreaConfig.getInbox(),
             autoIngestAreaConfig.getOutbox(),
-            taskFactoryBuilder.createTaskFactory(autoIngestAreaConfig, dataverseClientAutoIngestArea, false),
+            taskFactoryBuilder.createTaskFactory(autoIngestAreaConfig, false),
             taskEventService,
             enqueuingService
         );
@@ -150,12 +142,4 @@ public void run(final DdIngestFlowConfiguration configuration, final Environment
         environment.jersey().register(new BlockedTargetsResource(blockedTargetService));
         environment.jersey().register(new CsvMessageBodyWriter());
     }
-
-    private static DataverseClient getDataverseClient(DdIngestFlowConfiguration configuration, IngestAreaConfig ingestAreaConfig) {
-        final var dataverseClientFactory = configuration.getDataverse();
-        if (ingestAreaConfig.getApiKey() != null) {
-            dataverseClientFactory.setApiKey(ingestAreaConfig.getApiKey());
-        }
-        return dataverseClientFactory.build();
-    }
 }

src/main/java/nl/knaw/dans/ingest/core/service/DepositIngestTaskFactoryBuilder.java

@@ -30,7 +30,6 @@
 import nl.knaw.dans.ingest.core.io.FileServiceImpl;
 import nl.knaw.dans.ingest.core.service.mapper.DepositToDvDatasetMetadataMapperFactory;
 import nl.knaw.dans.ingest.core.validation.DepositorAuthorizationValidatorImpl;
-import nl.knaw.dans.lib.dataverse.DataverseClient;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -64,7 +63,12 @@ public DepositIngestTaskFactoryBuilder(DdIngestFlowConfiguration configuration,
         this.blockedTargetService = blockedTargetService;
     }
 
-    public DepositIngestTaskFactory createTaskFactory(IngestAreaConfig ingestAreaConfig, DataverseClient dataverseClient, boolean isMigration) throws IOException, URISyntaxException {
+    public DepositIngestTaskFactory createTaskFactory(IngestAreaConfig ingestAreaConfig, boolean isMigration) throws IOException, URISyntaxException {
+        final var dataverseClientFactory = configuration.getDataverse();
+        if (ingestAreaConfig.getApiKey() != null) {
+            dataverseClientFactory.setApiKey(ingestAreaConfig.getApiKey());
+        }
+        final var dataverseClient = dataverseClientFactory.build();
         final var ingestFlowConfig = configuration.getIngestFlow();
         final var mapperFactory = new DepositToDvDatasetMetadataMapperFactory(
             ingestFlowConfig.getIso1ToDataverseLanguage(),

src/test/java/nl/knaw/dans/ingest/core/service/DepositIngestTaskFactoryBuilderTest.java

@@ -20,11 +20,9 @@
 import io.dropwizard.jackson.Jackson;
 import io.dropwizard.jersey.validation.Validators;
 import nl.knaw.dans.ingest.DdIngestFlowConfiguration;
-import nl.knaw.dans.ingest.core.config.IngestAreaConfig;
 import org.junit.jupiter.api.Test;
 
 import java.io.FileInputStream;
-import java.nio.file.Paths;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
@@ -39,6 +37,6 @@ public void debug_etc_does_not_throw() throws Exception {
         final var areaConfig = config.getIngestFlow().getAutoIngest();
 
         assertDoesNotThrow(() -> new DepositIngestTaskFactoryBuilder(config, null, null)
-            .createTaskFactory(areaConfig, null, false));
+            .createTaskFactory(areaConfig, false));
     }
 }

src/test/resources/debug-etc/config.yml

@@ -13,18 +13,21 @@ server:
 
 ingestFlow:
   import:
+    apiKey: 'changeme' # overrides the default
     inbox: data/import/inbox
     outbox: data/import/outbox
     dataSuppliers:
       someUserAccount123: The Organization Name
 
   migration:
+    apiKey: 'changeme' # overrides the default
     inbox: data/migration/deposits
     outbox: data/migration/out
     dataSuppliers:
       USER001: The Organization Name
 
   autoIngest:
+    apiKey: 'changeme' # overrides the default
     inbox: data/auto-ingest/inbox
     outbox: data/auto-ingest/outbox
     authorization:
@@ -66,7 +69,7 @@ ingestFlow:
 #
 dataverse:
   baseUrl: 'http://dar.dans.knaw.nl:8080'
-  apiKey: 'changeme'
+  apiKey: 'changeme' # define override value per ingest area
   unblockKey: 's3kretKey'
   awaitLockStateMaxNumberOfRetries: 30
   awaitLockStateMillisecondsBetweenRetries: 500