Upgrade dans-java-utils

janvanmansum · janvanmansum · commit 8d2822ce53b5 · 2026-04-22T14:49:38.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -40,7 +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.1.0</dd-data-vault-api.version>
-        <dans-java-utils.version>2.11.0</dans-java-utils.version>
+        <dans-java-utils.version>3.0.0</dans-java-utils.version>
         <main-class>nl.knaw.dans.datavault.DdDataVaultApplication</main-class>
     </properties>
 
diff --git a/src/main/java/nl/knaw/dans/datavault/db/ConsistencyCheckDao.java b/src/main/java/nl/knaw/dans/datavault/db/ConsistencyCheckDao.java
@@ -54,7 +54,7 @@ public ConsistencyCheck finish(ConsistencyCheck check, ConsistencyCheck.Result r
         return super.persist(check);
     }
 
-    public Optional<ConsistencyCheck> nextTask() {
+    public Optional<ConsistencyCheck> nextInput() {
         var criteriaBuilder = currentSession().getCriteriaBuilder();
         var criteriaQuery = criteriaBuilder.createQuery(ConsistencyCheck.class);
         var root = criteriaQuery.from(ConsistencyCheck.class);
diff --git a/src/main/java/nl/knaw/dans/datavault/db/ImportJobDao.java b/src/main/java/nl/knaw/dans/datavault/db/ImportJobDao.java
@@ -43,7 +43,7 @@ public ImportJob get(UUID id) {
     }
 
     @Override
-    public Optional<ImportJob> nextTask() {
+    public Optional<ImportJob> nextInput() {
         var criteria = currentSession().getCriteriaBuilder();
         var query = criteria.createQuery(ImportJob.class);
         var root = query.from(ImportJob.class);

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public ConsistencyCheck finish(ConsistencyCheck check, ConsistencyCheck.Result r`
`54`	`54`	`return super.persist(check);`
`55`	`55`	`}`
`56`	`56`
`57`		`- public Optional<ConsistencyCheck> nextTask() {`
	`57`	`+ public Optional<ConsistencyCheck> nextInput() {`
`58`	`58`	`var criteriaBuilder = currentSession().getCriteriaBuilder();`
`59`	`59`	`var criteriaQuery = criteriaBuilder.createQuery(ConsistencyCheck.class);`
`60`	`60`	`var root = criteriaQuery.from(ConsistencyCheck.class);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public ImportJob get(UUID id) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public Optional<ImportJob> nextTask() {`
	`46`	`+ public Optional<ImportJob> nextInput() {`
`47`	`47`	`var criteria = currentSession().getCriteriaBuilder();`
`48`	`48`	`var query = criteria.createQuery(ImportJob.class);`
`49`	`49`	`var root = query.from(ImportJob.class);`