wip

Author: janvanmansum

pom.xml

@@ -40,6 +40,7 @@
         <dans-ocfl-java-extensions-lib.version>2.0.0</dans-ocfl-java-extensions-lib.version>
         <dans-layer-store-lib.version>2.0.0</dans-layer-store-lib.version>
         <dd-data-vault-api.version>1.0.0</dd-data-vault-api.version>
+        <dans-java-utils.version>2.10.2-SNAPSHOT</dans-java-utils.version>
         <main-class>nl.knaw.dans.datavault.DdDataVaultApplication</main-class>
     </properties>
 

src/main/java/nl/knaw/dans/datavault/DdDataVaultApplication.java

@@ -32,7 +32,6 @@
 import nl.knaw.dans.datavault.core.ImportJobTaskFactory;
 import nl.knaw.dans.datavault.core.LayerThresholdHandler;
 import nl.knaw.dans.datavault.core.OcflRepositoryProvider;
-import nl.knaw.dans.datavault.core.PollingTaskExecutor;
 import nl.knaw.dans.datavault.core.RepositoryProvider;
 import nl.knaw.dans.datavault.core.UnitOfWorkDeclaringLayerConsistencyChecker;
 import nl.knaw.dans.datavault.core.UnitOfWorkDeclaringRepositoryProviderAdapter;
@@ -53,6 +52,7 @@
 import nl.knaw.dans.layerstore.LayeredItemStore;
 import nl.knaw.dans.lib.ocflext.StoreInventoryDbBackedContentManager;
 import nl.knaw.dans.lib.util.PersistenceProviderImpl;
+import nl.knaw.dans.lib.util.pollingtaskexec.PollingTaskExecutor;
 
 import java.io.IOException;
 import java.util.regex.Pattern;
@@ -156,7 +156,6 @@ private RepositoryProvider createUnitOfWorkAwareProxy(UnitOfWorkAwareProxyFactor
             .create(UnitOfWorkDeclaringRepositoryProviderAdapter.class, new Class<?>[] { RepositoryProvider.class }, new Object[] { repositoryProvider });
     }
 
-    @SuppressWarnings("unchecked")
     private <R> PollingTaskExecutor<R> createUnitOfWorkAwareProxy(UnitOfWorkAwareProxyFactory uowFactory, PollingTaskExecutor<R> executor) {
         return uowFactory
             .create(PollingTaskExecutor.class, new Class<?>[] { PollingTaskExecutor.class }, new Object[] { executor });

src/main/java/nl/knaw/dans/datavault/core/ConsistencyCheckTaskFactory.java

@@ -18,6 +18,7 @@
 import lombok.RequiredArgsConstructor;
 import nl.knaw.dans.datavault.db.ConsistencyCheckDao;
 import nl.knaw.dans.layerstore.LayeredItemStore;
+import nl.knaw.dans.lib.util.pollingtaskexec.TaskFactory;
 
 @RequiredArgsConstructor
 public class ConsistencyCheckTaskFactory implements TaskFactory<ConsistencyCheck> {

src/main/java/nl/knaw/dans/datavault/core/ImportJobTaskFactory.java

@@ -17,6 +17,7 @@
 
 import lombok.RequiredArgsConstructor;
 import nl.knaw.dans.datavault.db.ImportJobDao;
+import nl.knaw.dans.lib.util.pollingtaskexec.TaskFactory;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/nl/knaw/dans/datavault/core/PollingTaskExecutor.java

@@ -17,6 +17,7 @@
 
 import io.dropwizard.hibernate.AbstractDAO;
 import nl.knaw.dans.datavault.core.ConsistencyCheck;
+import nl.knaw.dans.lib.util.pollingtaskexec.TaskSource;
 import org.hibernate.SessionFactory;
 
 import java.time.OffsetDateTime;

src/main/java/nl/knaw/dans/datavault/core/TaskFactory.java

@@ -17,6 +17,7 @@
 
 import io.dropwizard.hibernate.AbstractDAO;
 import nl.knaw.dans.datavault.core.ImportJob;
+import nl.knaw.dans.lib.util.pollingtaskexec.TaskSource;
 import org.hibernate.SessionFactory;
 
 import java.util.List;