Removed domain package

janvanmansum · janvanmansum · commit dedae6fe7b29 · 2024-12-07T15:58:46.000+01:00
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingService.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingService.java
@@ -15,7 +15,7 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
 import nl.knaw.dans.dvingest.core.yaml.EditFiles;
 import nl.knaw.dans.dvingest.core.yaml.EditPermissions;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java
@@ -23,7 +23,7 @@
 import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositFileListerImpl;
 import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositReader;
 import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositReaderImpl;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.DepositToDvDatasetMetadataMapper;
 import nl.knaw.dans.dvingest.core.dansbag.service.BagDataManager;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverter.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverter.java
@@ -16,7 +16,7 @@
 package nl.knaw.dans.dvingest.core.dansbag;
 
 import lombok.AllArgsConstructor;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.service.YamlService;
 import nl.knaw.dans.dvingest.core.yaml.EditFilesRoot;
 import nl.knaw.dans.dvingest.core.yaml.EditPermissionsRoot;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositSupport.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositSupport.java
@@ -23,7 +23,7 @@
 import nl.knaw.dans.dvingest.core.DataverseIngestBag;
 import nl.knaw.dans.dvingest.core.DataverseIngestDeposit;
 import nl.knaw.dans.dvingest.core.Deposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
 import nl.knaw.dans.dvingest.core.dansbag.exception.RejectedDepositException;
 import nl.knaw.dans.dvingest.core.service.YamlService;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposer.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposer.java
@@ -18,8 +18,8 @@
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import nl.knaw.dans.dvingest.core.bagprocessor.DataversePath;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.FileInfo;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.FileInfo;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.mapping.FileElement;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
 import nl.knaw.dans.dvingest.core.yaml.AddEmbargo;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposerForUpdate.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposerForUpdate.java
@@ -17,8 +17,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 import nl.knaw.dans.dvingest.core.bagprocessor.FilesInDatasetCache;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.FileInfo;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.FileInfo;
 import nl.knaw.dans.dvingest.core.service.DataverseService;
 import nl.knaw.dans.dvingest.core.yaml.FromTo;
 import nl.knaw.dans.lib.dataverse.DataverseException;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/SupportedLicenses.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/SupportedLicenses.java
@@ -15,7 +15,7 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.RejectedDepositException;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.mapping.LicenseElem;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DansBagDeposit.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DansBagDeposit.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.knaw.dans.dvingest.core.dansbag.domain;
+package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 import gov.loc.repository.bagit.domain.Bag;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFile.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFile.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.knaw.dans.dvingest.core.dansbag.domain;
+package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 import lombok.AllArgsConstructor;
 import lombok.Value;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileLister.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileLister.java
@@ -15,9 +15,6 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DepositFile;
-
 import java.io.IOException;
 import java.util.List;
 
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileListerImpl.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileListerImpl.java
@@ -15,8 +15,6 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DepositFile;
 import nl.knaw.dans.dvingest.core.dansbag.service.ManifestHelperImpl;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
 import org.w3c.dom.Node;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositReader.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositReader.java
@@ -15,7 +15,6 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
 
 import java.nio.file.Path;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositReaderImpl.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositReaderImpl.java
@@ -16,7 +16,6 @@
 package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 import gov.loc.repository.bagit.domain.Bag;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
 import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
 import nl.knaw.dans.dvingest.core.dansbag.service.BagDataManager;
 import nl.knaw.dans.dvingest.core.dansbag.service.ManifestHelper;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositState.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.knaw.dans.dvingest.core.dansbag.domain;
+package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 public enum DepositState {
     ARCHIVED, DRAFT, FAILED, FINALIZING, INVALID, REJECTED, SUBMITTED, UPLOADED, PUBLISHED, ACCEPTED
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/FileInfo.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/FileInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.knaw.dans.dvingest.core.dansbag.domain;
+package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 import lombok.AllArgsConstructor;
 import lombok.ToString;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/VaultMetadata.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/VaultMetadata.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.knaw.dans.dvingest.core.dansbag.domain;
+package nl.knaw.dans.dvingest.core.dansbag.deposit;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/domain/DatasetAuthor.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/domain/DatasetAuthor.java
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/domain/DatasetOrganization.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/domain/DatasetOrganization.java
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/exception/RejectedDepositException.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/exception/RejectedDepositException.java
@@ -15,7 +15,7 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.exception;
 
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
 
 public class RejectedDepositException extends RuntimeException {
     public RejectedDepositException(DansBagDeposit dansBagDeposit, String message) {
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/DepositToDvDatasetMetadataMapper.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/DepositToDvDatasetMetadataMapper.java
@@ -20,7 +20,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import nl.knaw.dans.dvingest.core.dansbag.domain.VaultMetadata;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.VaultMetadata;
 import nl.knaw.dans.dvingest.core.dansbag.exception.MissingRequiredFieldException;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.builder.ArchaeologyFieldBuilder;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.builder.CitationFieldBuilder;
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/Amd.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/Amd.java
@@ -22,8 +22,8 @@
 
 import java.util.Optional;
 
-import static nl.knaw.dans.dvingest.core.dansbag.domain.DepositState.PUBLISHED;
-import static nl.knaw.dans.dvingest.core.dansbag.domain.DepositState.SUBMITTED;
+import static nl.knaw.dans.dvingest.core.dansbag.deposit.DepositState.PUBLISHED;
+import static nl.knaw.dans.dvingest.core.dansbag.deposit.DepositState.SUBMITTED;
 
 @Slf4j
 public class Amd extends Base {
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/DcxDaiAuthor.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/DcxDaiAuthor.java
@@ -15,8 +15,9 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.mapper.mapping;
 
+import lombok.Builder;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DatasetAuthor;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.builder.CompoundFieldGenerator;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
 import org.apache.commons.lang3.StringUtils;
@@ -37,6 +38,20 @@
 
 @Slf4j
 public final class DcxDaiAuthor extends Base {
+    @Data
+    @Builder
+    public static class DatasetAuthor {
+        private String titles;
+        private String initials;
+        private String insertions;
+        private String surname;
+        private String dai;
+        private String isni;
+        private String orcid;
+        private String role;
+        private String organization;
+    }
+
     public static CompoundFieldGenerator<Node> toAuthorValueObject = (builder, node) -> {
         var author = parseAuthor(node);
         var name = formatName(author);
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/DcxDaiOrganization.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/DcxDaiOrganization.java
@@ -15,8 +15,10 @@
  */
 package nl.knaw.dans.dvingest.core.dansbag.mapper.mapping;
 
+import lombok.Builder;
+import lombok.Data;
+import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DatasetOrganization;
 import nl.knaw.dans.dvingest.core.dansbag.mapper.builder.CompoundFieldGenerator;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
 import org.apache.commons.lang3.StringUtils;
@@ -35,6 +37,15 @@
 
 @Slf4j
 public final class DcxDaiOrganization {
+    @Data
+    @Builder
+    @ToString
+    public static class DatasetOrganization {
+        private String name;
+        private String role;
+        private String isni;
+        private String viaf;
+    }
 
     public static CompoundFieldGenerator<Node> toAuthorValueObject = (builder, node) -> {
         var organization = parseOrganization(node);
diff --git a/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/FileElement.java b/src/main/java/nl/knaw/dans/dvingest/core/dansbag/mapper/mapping/FileElement.java
@@ -17,8 +17,8 @@
 
 import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
-import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
-import nl.knaw.dans.dvingest.core.dansbag.domain.FileInfo;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.DansBagDeposit;
+import nl.knaw.dans.dvingest.core.dansbag.deposit.FileInfo;
 import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
 import nl.knaw.dans.lib.dataverse.model.file.FileMeta;
 import org.apache.commons.lang3.StringUtils;
