Merge branch 'master' into DD-1438-Fix-problems-found-in-DD-1419

DANS-KNAW · Apr 25, 2024 · b11601f · b11601f
2 parents 515ac46 + 254e2fd
commit b11601f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/nl/knaw/dans/managedeposit/core/DepositProperties.java b/src/main/java/nl/knaw/dans/managedeposit/core/DepositProperties.java
@@ -83,6 +83,10 @@ public String getDepositId() {
         return depositId;
     }
 
+    public String getDepositId() {
+        return depositId;
+    }
+
     public String getDepositor() {
         return depositor;
     }

diff --git a/src/main/java/nl/knaw/dans/managedeposit/core/service/DepositPropertiesAssembler.java b/src/main/java/nl/knaw/dans/managedeposit/core/service/DepositPropertiesAssembler.java
@@ -36,7 +36,6 @@ class DepositPropertiesAssembler {
     }
 
     Optional<DepositProperties> assembleObject(File depositPropertiesFile, long CalculatedFolderSize) {
-
         Path depositPath = depositPropertiesFile.getParentFile().toPath();
         log.debug("assembleObject(depositPropertiesPath:Path): '{}'", depositPropertiesFile.getAbsolutePath());
         DepositProperties dp = null;

diff --git a/src/main/java/nl/knaw/dans/managedeposit/db/DepositPropertiesDAO.java b/src/main/java/nl/knaw/dans/managedeposit/db/DepositPropertiesDAO.java
@@ -132,7 +132,6 @@ private Predicate buildQueryCriteria(Map<String, List<String>> queryParameters,
 
                     case "startdate":
                     case "enddate":
-                        //var dct = root.get("depositCreationTimestamp");
                         if (value.isEmpty()) {
                             orPredicateItem = criteriaBuilder.isNull(root.get("depositCreationTimestamp"));
                         }

diff --git a/src/main/java/nl/knaw/dans/managedeposit/resources/DepositPropertiesResource.java b/src/main/java/nl/knaw/dans/managedeposit/resources/DepositPropertiesResource.java
@@ -47,7 +47,7 @@ private String writeHelpInfoText() {
                   - Clean database: POST basePath/delete-deposit\s
                   - Query string parameters: user, state, startdate, enddate, deleted\s
                     - 'startdate'/'enddate' format: yyyy-MM-dd\s
-                    - 'deleted' is a boolean with values: 'true' or 'false'
+                    - 'deleted' is a boolean with values: 'true' or 'false'\s
                     - Possible 'state' values: ARCHIVED, DRAFT, FAILED, FINALIZING, INVALID, REJECTED, SUBMITTED, UPLOADED, PUBLISHED\s
                     - To give an undefined parameter (when column's value is empty or null): 'parameterName=' (ex. 'user=')\s
                   Examples:\s