diff --git a/core/pom.xml b/core/pom.xml index e391009..ae929e4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - gr.cite.opendmp + org.opencdmp file-transformer-rda-parent ${revision} ../pom.xml diff --git a/core/src/main/java/eu/eudat/file/transformer/model/FundingModel.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/FundingModel.java similarity index 75% rename from core/src/main/java/eu/eudat/file/transformer/model/FundingModel.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/FundingModel.java index 30bf847..ff79c46 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/FundingModel.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/FundingModel.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model; +package org.opencdmp.filetransformer.rda.model; -import eu.eudat.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; public class FundingModel{ private ReferenceModel grant; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/ProjectModel.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/ProjectModel.java similarity index 82% rename from core/src/main/java/eu/eudat/file/transformer/model/ProjectModel.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/ProjectModel.java index 299f0c9..8dab629 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/ProjectModel.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/ProjectModel.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model; +package org.opencdmp.filetransformer.rda.model; -import eu.eudat.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; public class ProjectModel{ private ReferenceModel project; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Contact.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contact.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Contact.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contact.java index ed3cbba..630da08 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Contact.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contact.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/ContactId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContactId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/ContactId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContactId.java index dba17a9..3da566a 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/ContactId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContactId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Contributor.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contributor.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Contributor.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contributor.java index 2ea7584..b0b9675 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Contributor.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Contributor.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/ContributorId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContributorId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/ContributorId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContributorId.java index 0f7f16e..ea551e8 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/ContributorId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/ContributorId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Cost.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Cost.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Cost.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Cost.java index c9aab55..c7dbf30 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Cost.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Cost.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Dataset.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dataset.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Dataset.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dataset.java index 3a14518..09ecef7 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Dataset.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dataset.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/DatasetId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DatasetId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/DatasetId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DatasetId.java index 93b7230..58cc24e 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/DatasetId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DatasetId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Distribution.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Distribution.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Distribution.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Distribution.java index 2c06b4f..954dddc 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Distribution.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Distribution.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Dmp.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dmp.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Dmp.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dmp.java index f1547dc..66bf3c5 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Dmp.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Dmp.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/DmpId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DmpId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/DmpId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DmpId.java index d548c49..99005d4 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/DmpId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/DmpId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/FunderId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/FunderId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/FunderId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/FunderId.java index 6c6ca93..c6b7d38 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/FunderId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/FunderId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Funding.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Funding.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Funding.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Funding.java index 2b88832..da3022c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Funding.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Funding.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/GrantId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/GrantId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/GrantId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/GrantId.java index 87e7617..abef34d 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/GrantId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/GrantId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Host.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Host.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Host.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Host.java index 47c5c7c..c4f06a1 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Host.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Host.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Language.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Language.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Language.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Language.java index ae45c88..fb41f8c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Language.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Language.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/License.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/License.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/License.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/License.java index a59bcba..21393e8 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/License.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/License.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/MetadataStandardId.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/MetadataStandardId.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/MetadataStandardId.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/MetadataStandardId.java index 6ffa51b..59fe122 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/MetadataStandardId.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/MetadataStandardId.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Metadatum.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Metadatum.java similarity index 99% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Metadatum.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Metadatum.java index 6d43e06..4038c92 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Metadatum.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Metadatum.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/PidSystem.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/PidSystem.java similarity index 96% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/PidSystem.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/PidSystem.java index e25ccd1..2d03f52 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/PidSystem.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/PidSystem.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/Project.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Project.java similarity index 98% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/Project.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Project.java index 6c42dcc..4cfe559 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/Project.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/Project.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/RDAModel.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/RDAModel.java similarity index 94% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/RDAModel.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/RDAModel.java index 6e02c0d..c076f8b 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/RDAModel.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/RDAModel.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/SecurityAndPrivacy.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/SecurityAndPrivacy.java similarity index 97% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/SecurityAndPrivacy.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/SecurityAndPrivacy.java index f9ae3b1..e7e407c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/SecurityAndPrivacy.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/SecurityAndPrivacy.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/TechnicalResource.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/TechnicalResource.java similarity index 97% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/TechnicalResource.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/TechnicalResource.java index e81f7ed..c526d86 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/TechnicalResource.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/TechnicalResource.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda; +package org.opencdmp.filetransformer.rda.model.rda; import com.fasterxml.jackson.annotation.*; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactIdRDAMapper.java similarity index 77% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactIdRDAMapper.java index b0c8aac..049ceca 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactIdRDAMapper.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.ContactId; +import org.opencdmp.filetransformer.rda.model.rda.ContactId; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactRDAMapper.java similarity index 83% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactRDAMapper.java index f446e85..9412ea6 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContactRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContactRDAMapper.java @@ -1,9 +1,9 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.enums.ContactInfoType; -import eu.eudat.commonmodels.models.UserContactInfoModel; -import eu.eudat.commonmodels.models.UserModel; -import eu.eudat.file.transformer.model.rda.Contact; +import org.opencdmp.commonmodels.enums.ContactInfoType; +import org.opencdmp.commonmodels.models.UserContactInfoModel; +import org.opencdmp.commonmodels.models.UserModel; +import org.opencdmp.filetransformer.rda.model.rda.Contact; import org.springframework.stereotype.Component; import java.util.List; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContributorIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContributorIdRDAMapper.java similarity index 90% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContributorIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContributorIdRDAMapper.java index 2b8c266..ab3fe04 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ContributorIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ContributorIdRDAMapper.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.ContributorId; +import org.opencdmp.filetransformer.rda.model.rda.ContributorId; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/CostRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/CostRDAMapper.java similarity index 85% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/CostRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/CostRDAMapper.java index 608164f..5926d2c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/CostRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/CostRDAMapper.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.Cost; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.Cost; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -15,14 +15,14 @@ import java.util.stream.Collectors; public class CostRDAMapper{ private static final Logger logger = LoggerFactory.getLogger(DatasetRDAMapper.class); - public List toRDA(List nodes, List valueFields ) { + public List toRDA(List nodes, List valueFields ) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); Map rdaMap = new HashMap<>(); for(FieldModel node: nodes){ String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.cost")).findFirst().orElse(""); - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetIdRDAMapper.java similarity index 83% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetIdRDAMapper.java index 1db21ce..b42190c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetIdRDAMapper.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.DatasetId; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.DatasetId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -14,7 +14,7 @@ public class DatasetIdRDAMapper{ private static final Logger logger = LoggerFactory.getLogger(DatasetIdRDAMapper.class); - public DatasetId toRDA(List nodes, List valueFields) { + public DatasetId toRDA(List nodes, List valueFields) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); @@ -24,7 +24,7 @@ public class DatasetIdRDAMapper{ if (node.getData() == null) { continue; } - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetRDAMapper.java similarity index 84% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetRDAMapper.java index 73eee4d..7ff5fd2 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DatasetRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DatasetRDAMapper.java @@ -1,16 +1,16 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetItemModel; -import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetModel; -import eu.eudat.commonmodels.models.description.PropertyDefinitionModel; -import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.Dataset; -import eu.eudat.file.transformer.model.rda.DatasetId; -import eu.eudat.file.transformer.model.rda.Dmp; -import eu.eudat.file.transformer.model.rda.Language; -import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetItemModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.Dataset; +import org.opencdmp.filetransformer.rda.model.rda.DatasetId; +import org.opencdmp.filetransformer.rda.model.rda.Dmp; +import org.opencdmp.filetransformer.rda.model.rda.Language; +import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -48,22 +48,22 @@ public class DatasetRDAMapper { this.keywordRDAMapper = keywordRDAMapper; } - private List findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){ - List items = new ArrayList<>(); + private List findValueField(FieldModel fieldModel, PropertyDefinitionModel descriptionTemplateModel){ + List items = new ArrayList<>(); if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items; for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){ if (propertyDefinitionFieldSetModel.getItems() == null) continue; for (PropertyDefinitionFieldSetItemModel propertyDefinitionFieldSetItemModel : propertyDefinitionFieldSetModel.getItems()){ if (propertyDefinitionFieldSetItemModel.getFields() == null) continue; - eu.eudat.commonmodels.models.description.FieldModel valueField = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(fieldModel.getId(), null); + org.opencdmp.commonmodels.models.description.FieldModel valueField = propertyDefinitionFieldSetItemModel.getFields().getOrDefault(fieldModel.getId(), null); if (valueField != null) items.add(valueField); } } return items; } - private List getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){ - List items = new ArrayList<>(); + private List getAllValueFields(PropertyDefinitionModel descriptionTemplateModel){ + List items = new ArrayList<>(); if (descriptionTemplateModel == null || descriptionTemplateModel.getFieldSets() == null) return items; for (PropertyDefinitionFieldSetModel propertyDefinitionFieldSetModel : descriptionTemplateModel.getFieldSets().values()){ if (propertyDefinitionFieldSetModel.getItems() == null) continue; @@ -102,8 +102,8 @@ public class DatasetRDAMapper { List typeNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.type"); for (FieldModel typeNode : typeNodes){ - List fieldValues = this.findValueField(typeNode, descriptionEntity.getProperties()); - if (!fieldValues.isEmpty()) rda.setType(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); + List fieldValues = this.findValueField(typeNode, descriptionEntity.getProperties()); + if (!fieldValues.isEmpty()) rda.setType(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); if (rda.getType() != null && !rda.getType().isBlank()) break;; } if (rda.getType() == null || rda.getType().isBlank()) rda.setType("DMP Dataset"); @@ -112,7 +112,7 @@ public class DatasetRDAMapper { List languageNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.language"); for (FieldModel languageNode : languageNodes){ - List fieldValues = this.findValueField(languageNode, descriptionEntity.getProperties()); + List fieldValues = this.findValueField(languageNode, descriptionEntity.getProperties()); try { if (!fieldValues.isEmpty()) rda.setLanguage(fieldValues.stream().filter(x -> x.getTextValue() != null && x.getTextValue().isBlank()).map(x -> Language.fromValue(x.getTextValue())).findFirst().orElse(null)); } @@ -175,8 +175,8 @@ public class DatasetRDAMapper { List preservationNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.preservation_statement"); for (FieldModel preservationNode : preservationNodes){ - List fieldValues = this.findValueField(preservationNode, descriptionEntity.getProperties()); - if (!fieldValues.isEmpty()) rda.setPreservationStatement(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); + List fieldValues = this.findValueField(preservationNode, descriptionEntity.getProperties()); + if (!fieldValues.isEmpty()) rda.setPreservationStatement(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); if (rda.getPreservationStatement() != null && !rda.getPreservationStatement().isBlank()) break;; } @@ -191,7 +191,7 @@ public class DatasetRDAMapper { List keywordNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.keyword"); for (FieldModel keywordNode : keywordNodes){ - List fieldValues = this.findValueField(keywordNode, descriptionEntity.getProperties()); + List fieldValues = this.findValueField(keywordNode, descriptionEntity.getProperties()); if (!fieldValues.isEmpty()) { rda.setKeyword(fieldValues.stream().filter(x -> (x.getTextValue() != null && x.getTextValue().isBlank()) || (x.getTextListValue() != null && !x.getTextListValue().isEmpty())).map(x -> { if (x.getTextListValue() != null && !x.getTextListValue().isEmpty()) { @@ -216,7 +216,7 @@ public class DatasetRDAMapper { // } List personalDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data"); for (FieldModel personalDataNode : personalDataNodes){ - List fieldValues = this.findValueField(personalDataNode, descriptionEntity.getProperties()); + List fieldValues = this.findValueField(personalDataNode, descriptionEntity.getProperties()); if (!fieldValues.isEmpty()) rda.setPersonalData(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(x-> Dataset.PersonalData.fromValue(x.getTextValue())).findFirst().orElse(null)); if (rda.getPersonalData() != null) break; } @@ -230,7 +230,7 @@ public class DatasetRDAMapper { } List sensitiveDataNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.sensitive_data"); for (FieldModel sensitiveDataNode : sensitiveDataNodes){ - List fieldValues = this.findValueField(sensitiveDataNode, descriptionEntity.getProperties()); + List fieldValues = this.findValueField(sensitiveDataNode, descriptionEntity.getProperties()); if (!fieldValues.isEmpty()) rda.setSensitiveData(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(x-> Dataset.SensitiveData.fromValue(x.getTextValue())).findFirst().orElse(null)); if (rda.getSensitiveData() != null) break; } @@ -245,8 +245,8 @@ public class DatasetRDAMapper { List issuedNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dataset.issued"); for (FieldModel issuedNode : issuedNodes){ - List fieldValues = this.findValueField(issuedNode, descriptionEntity.getProperties()); - if (!fieldValues.isEmpty()) rda.setIssued(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(eu.eudat.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); + List fieldValues = this.findValueField(issuedNode, descriptionEntity.getProperties()); + if (!fieldValues.isEmpty()) rda.setIssued(fieldValues.stream().filter(x-> x.getTextValue() != null && x.getTextValue().isBlank()).map(org.opencdmp.commonmodels.models.description.FieldModel::getTextValue).findFirst().orElse(null)); if (rda.getIssued() != null && !rda.getIssued().isBlank()) break;; } @@ -274,8 +274,8 @@ public class DatasetRDAMapper { List ethicsNodes = this.templateFieldSearcherService.searchFieldsBySemantics(descriptionEntity.getDescriptionTemplate(), "rda.dmp.ethical_issues"); if (!ethicsNodes.isEmpty()) { for(FieldModel node: ethicsNodes){ - List fieldValues = this.findValueField(node, descriptionEntity.getProperties()); - eu.eudat.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst(); + List fieldValues = this.findValueField(node, descriptionEntity.getProperties()); + org.opencdmp.commonmodels.models.description.FieldModel fieldValue = fieldValues.getFirst(); String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dmp.ethical_issues")).findFirst().orElse(""); if (fieldValue == null) { continue; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DistributionRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DistributionRDAMapper.java similarity index 92% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DistributionRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DistributionRDAMapper.java index 7d44258..e439a4c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DistributionRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DistributionRDAMapper.java @@ -1,8 +1,8 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.Distribution; -import eu.eudat.file.transformer.model.rda.License; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.Distribution; +import org.opencdmp.filetransformer.rda.model.rda.License; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -22,7 +22,7 @@ public class DistributionRDAMapper { this.hostRDAMapper = hostRDAMapper; } - public List toRDA(List nodes, List valueFields) { + public List toRDA(List nodes, List valueFields) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); Map rdaMap = new HashMap<>(); @@ -33,7 +33,7 @@ public class DistributionRDAMapper { continue; } - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || (rdaValue.getTextValue() == null && rdaValue.getReferences() == null)){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpContactModelContactRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpContactModelContactRDAMapper.java similarity index 85% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpContactModelContactRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpContactModelContactRDAMapper.java index 0ae125a..30bae29 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpContactModelContactRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpContactModelContactRDAMapper.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.dmp.DmpContactModel; -import eu.eudat.file.transformer.model.rda.Contact; +import org.opencdmp.commonmodels.models.dmp.DmpContactModel; +import org.opencdmp.filetransformer.rda.model.rda.Contact; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpIdRDAMapper.java similarity index 79% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpIdRDAMapper.java index 8994093..13eaec2 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpIdRDAMapper.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.DmpId; +import org.opencdmp.filetransformer.rda.model.rda.DmpId; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpRDAMapper.java similarity index 89% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpRDAMapper.java index 6a80aaa..0d2c421 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpRDAMapper.java @@ -1,24 +1,24 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.enums.DmpAccessType; -import eu.eudat.commonmodels.enums.DmpUserRole; -import eu.eudat.commonmodels.models.DmpUserModel; -import eu.eudat.commonmodels.models.EntityDoiModel; -import eu.eudat.commonmodels.models.UserModel; -import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.commonmodels.models.dmp.DmpContactModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; -import eu.eudat.commonmodels.models.dmp.DmpPropertiesModel; -import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; -import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.file.transformer.model.ProjectModel; -import eu.eudat.file.transformer.model.rda.DmpId; -import eu.eudat.file.transformer.model.rda.Dmp; -import eu.eudat.file.transformer.service.descriptiontemplatesearcher.TemplateFieldSearcherService; -import eu.eudat.file.transformer.service.json.JsonHandlingService; -import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; +import org.opencdmp.commonmodels.enums.DmpAccessType; +import org.opencdmp.commonmodels.enums.DmpUserRole; +import org.opencdmp.commonmodels.models.DmpUserModel; +import org.opencdmp.commonmodels.models.EntityDoiModel; +import org.opencdmp.commonmodels.models.UserModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.commonmodels.models.dmp.DmpContactModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; +import org.opencdmp.commonmodels.models.dmp.DmpPropertiesModel; +import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel; +import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.filetransformer.rda.model.ProjectModel; +import org.opencdmp.filetransformer.rda.model.rda.DmpId; +import org.opencdmp.filetransformer.rda.model.rda.Dmp; +import org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher.TemplateFieldSearcherService; +import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService; +import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpUserContributorRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpUserContributorRDAMapper.java similarity index 81% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpUserContributorRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpUserContributorRDAMapper.java index 371e977..8342e02 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/DmpUserContributorRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/DmpUserContributorRDAMapper.java @@ -1,10 +1,10 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.enums.ContactInfoType; -import eu.eudat.commonmodels.models.DmpUserModel; -import eu.eudat.commonmodels.models.UserContactInfoModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.file.transformer.model.rda.Contributor; +import org.opencdmp.commonmodels.enums.ContactInfoType; +import org.opencdmp.commonmodels.models.DmpUserModel; +import org.opencdmp.commonmodels.models.UserContactInfoModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.filetransformer.rda.model.rda.Contributor; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FunderIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FunderIdRDAMapper.java similarity index 81% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FunderIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FunderIdRDAMapper.java index 5aafc76..1a6e856 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FunderIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FunderIdRDAMapper.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.FunderId; +import org.opencdmp.filetransformer.rda.model.rda.FunderId; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FundingRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FundingRDAMapper.java similarity index 88% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FundingRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FundingRDAMapper.java index 7ed627a..aa27a39 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/FundingRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/FundingRDAMapper.java @@ -1,10 +1,10 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; -import eu.eudat.file.transformer.model.FundingModel; -import eu.eudat.file.transformer.model.rda.Funding; -import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel; +import org.opencdmp.filetransformer.rda.model.FundingModel; +import org.opencdmp.filetransformer.rda.model.rda.Funding; +import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/GrantIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/GrantIdRDAMapper.java similarity index 77% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/GrantIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/GrantIdRDAMapper.java index ca90c4f..5d2ce42 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/GrantIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/GrantIdRDAMapper.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.GrantId; +import org.opencdmp.filetransformer.rda.model.rda.GrantId; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/HostRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/HostRDAMapper.java similarity index 92% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/HostRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/HostRDAMapper.java index 3739833..114509c 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/HostRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/HostRDAMapper.java @@ -1,8 +1,8 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.Host; -import eu.eudat.file.transformer.utils.string.MyStringUtils; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.Host; +import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -14,7 +14,7 @@ import java.util.*; public class HostRDAMapper { private static final Logger logger = LoggerFactory.getLogger(HostRDAMapper.class); - public Host toRDA(List nodes, List valueFields, String numbering){ + public Host toRDA(List nodes, List valueFields, String numbering){ if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); Host rda = new Host(); @@ -24,7 +24,7 @@ public class HostRDAMapper { if (rdaProperty.contains("host")) { int firstDiff = MyStringUtils.getFirstDifference(numbering, node.getNumbering()); if (firstDiff == -1 || firstDiff >= 2) { - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/KeywordRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/KeywordRDAMapper.java similarity index 79% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/KeywordRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/KeywordRDAMapper.java index a3c34f8..bb95f28 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/KeywordRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/KeywordRDAMapper.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LanguageRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LanguageRDAMapper.java similarity index 84% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LanguageRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LanguageRDAMapper.java index fb2b551..90ebc83 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LanguageRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LanguageRDAMapper.java @@ -1,9 +1,9 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.file.transformer.model.FundingModel; -import eu.eudat.file.transformer.model.rda.Funding; -import eu.eudat.file.transformer.model.rda.Language; +import org.opencdmp.filetransformer.rda.model.FundingModel; +import org.opencdmp.filetransformer.rda.model.rda.Funding; +import org.opencdmp.filetransformer.rda.model.rda.Language; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LicenseRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LicenseRDAMapper.java similarity index 77% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LicenseRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LicenseRDAMapper.java index 31d4ac0..9e5f6fa 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/LicenseRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/LicenseRDAMapper.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.License; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.License; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -15,14 +15,14 @@ public class LicenseRDAMapper { private static final Logger logger = LoggerFactory.getLogger(LicenseRDAMapper.class); - public License toRDA(List nodes, List valueFields) { + public License toRDA(List nodes, List valueFields) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("extraData is missing"); License rda = new License(); for (FieldModel node: nodes) { String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.distribution.license")).findFirst().orElse(""); - eu.eudat.commonmodels.models.description.FieldModel valueField = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel valueField = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(valueField == null || valueField.getTextValue() == null || valueField.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataRDAMapper.java similarity index 86% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataRDAMapper.java index d2920ff..2d5d308 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataRDAMapper.java @@ -1,11 +1,11 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.file.transformer.model.rda.Metadatum; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.filetransformer.rda.model.rda.Metadatum; -import eu.eudat.file.transformer.utils.string.MyStringUtils; +import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -22,7 +22,7 @@ public class MetadataRDAMapper{ this.metadataStandardIdRDAMapper = metadataStandardIdRDAMapper; } - public List toRDA(List nodes, List valueFields) { + public List toRDA(List nodes, List valueFields) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); @@ -30,7 +30,7 @@ public class MetadataRDAMapper{ List rdas = new ArrayList<>(); for (FieldModel node : nodes) { String rdaProperty = node.getSchematics().stream().filter(schematic -> schematic.startsWith("rda.dataset.metadata")).findFirst().orElse(""); - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x -> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x -> x.getId().equals(node.getId())).findFirst().orElse(null); for (PropertyName propertyName : PropertyName.values()) { if (rdaProperty.contains(propertyName.getName())) { diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataStandardIdRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataStandardIdRDAMapper.java similarity index 78% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataStandardIdRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataStandardIdRDAMapper.java index 0f197c0..031128a 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/MetadataStandardIdRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/MetadataStandardIdRDAMapper.java @@ -1,5 +1,5 @@ -package eu.eudat.file.transformer.model.rda.mapper; -import eu.eudat.file.transformer.model.rda.MetadataStandardId; +package org.opencdmp.filetransformer.rda.model.rda.mapper; +import org.opencdmp.filetransformer.rda.model.rda.MetadataStandardId; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ProjectRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ProjectRDAMapper.java similarity index 85% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ProjectRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ProjectRDAMapper.java index 489115e..d45dbc6 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ProjectRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ProjectRDAMapper.java @@ -1,13 +1,13 @@ -package eu.eudat.file.transformer.model.rda.mapper; -import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel; -import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; -import eu.eudat.file.transformer.model.FundingModel; -import eu.eudat.file.transformer.model.ProjectModel; -import eu.eudat.file.transformer.model.rda.Funding; -import eu.eudat.file.transformer.model.rda.Project; -import eu.eudat.file.transformer.service.rdafiletransformer.RdaFileTransformerServiceProperties; +package org.opencdmp.filetransformer.rda.model.rda.mapper; +import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel; +import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel; +import org.opencdmp.filetransformer.rda.model.FundingModel; +import org.opencdmp.filetransformer.rda.model.ProjectModel; +import org.opencdmp.filetransformer.rda.model.rda.Funding; +import org.opencdmp.filetransformer.rda.model.rda.Project; +import org.opencdmp.filetransformer.rda.service.rdafiletransformer.RdaFileTransformerServiceProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ReferenceContributorRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ReferenceContributorRDAMapper.java similarity index 82% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ReferenceContributorRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ReferenceContributorRDAMapper.java index 53384c9..8ae9637 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/ReferenceContributorRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/ReferenceContributorRDAMapper.java @@ -1,11 +1,11 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel; -import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.file.transformer.model.FundingModel; -import eu.eudat.file.transformer.model.rda.Contributor; -import eu.eudat.file.transformer.model.rda.Funding; +import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel; +import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.filetransformer.rda.model.FundingModel; +import org.opencdmp.filetransformer.rda.model.rda.Contributor; +import org.opencdmp.filetransformer.rda.model.rda.Funding; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/SecurityAndPrivacyRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/SecurityAndPrivacyRDAMapper.java similarity index 84% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/SecurityAndPrivacyRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/SecurityAndPrivacyRDAMapper.java index 528696d..d3c24e4 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/SecurityAndPrivacyRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/SecurityAndPrivacyRDAMapper.java @@ -1,8 +1,8 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.SecurityAndPrivacy; -import eu.eudat.file.transformer.utils.string.MyStringUtils; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.SecurityAndPrivacy; +import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils; import org.springframework.stereotype.Component; import java.util.*; @@ -10,7 +10,7 @@ import java.util.stream.Collectors; @Component public class SecurityAndPrivacyRDAMapper { - public List toRDA(List nodes, List valueFields) { + public List toRDA(List nodes, List valueFields) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); @@ -21,7 +21,7 @@ public class SecurityAndPrivacyRDAMapper { if (node.getData() == null) { continue; } - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TagRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TagRDAMapper.java similarity index 77% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TagRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TagRDAMapper.java index 0edd944..6fad348 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TagRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TagRDAMapper.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.TagModel; +import org.opencdmp.commonmodels.models.TagModel; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TechnicalResourceRDAMapper.java b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TechnicalResourceRDAMapper.java similarity index 84% rename from core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TechnicalResourceRDAMapper.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TechnicalResourceRDAMapper.java index 7f0498a..04d6a50 100644 --- a/core/src/main/java/eu/eudat/file/transformer/model/rda/mapper/TechnicalResourceRDAMapper.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/model/rda/mapper/TechnicalResourceRDAMapper.java @@ -1,8 +1,8 @@ -package eu.eudat.file.transformer.model.rda.mapper; +package org.opencdmp.filetransformer.rda.model.rda.mapper; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; -import eu.eudat.file.transformer.model.rda.TechnicalResource; -import eu.eudat.file.transformer.utils.string.MyStringUtils; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.filetransformer.rda.model.rda.TechnicalResource; +import org.opencdmp.filetransformer.rda.utils.string.MyStringUtils; import org.springframework.stereotype.Component; import java.util.*; @@ -11,7 +11,7 @@ import java.util.stream.Collectors; @Component public class TechnicalResourceRDAMapper { - public List toRDA(List nodes, List valueFields ) { + public List toRDA(List nodes, List valueFields ) { if (nodes == null) return null; if (valueFields == null) throw new IllegalArgumentException("valueFields is missing"); Map rdaMap = new HashMap<>(); @@ -21,7 +21,7 @@ public class TechnicalResourceRDAMapper { if (node.getData() == null) { continue; } - eu.eudat.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); + org.opencdmp.commonmodels.models.description.FieldModel rdaValue = valueFields.stream().filter(x-> x.getId().equals(node.getId())).findFirst().orElse(null); if(rdaValue == null || rdaValue.getTextValue() == null || rdaValue.getTextValue().isBlank()){ continue; } diff --git a/core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java similarity index 52% rename from core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java index ce32e1d..d952e97 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherService.java @@ -1,7 +1,7 @@ -package eu.eudat.file.transformer.service.descriptiontemplatesearcher; +package org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher; -import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; import java.util.List; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java similarity index 87% rename from core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java index de2745c..9268e52 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/descriptiontemplatesearcher/TemplateFieldSearcherServiceImpl.java @@ -1,6 +1,6 @@ -package eu.eudat.file.transformer.service.descriptiontemplatesearcher; +package org.opencdmp.filetransformer.rda.service.descriptiontemplatesearcher; -import eu.eudat.commonmodels.models.descriptiotemplate.*; +import org.opencdmp.commonmodels.models.descriptiotemplate.*; import org.springframework.stereotype.Component; import java.util.ArrayList; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/json/JsonHandlingService.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/json/JsonHandlingService.java similarity index 97% rename from core/src/main/java/eu/eudat/file/transformer/service/json/JsonHandlingService.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/json/JsonHandlingService.java index d122c75..59dec14 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/json/JsonHandlingService.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/json/JsonHandlingService.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.json; +package org.opencdmp.filetransformer.rda.service.json; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerService.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerService.java similarity index 80% rename from core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerService.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerService.java index 94a5023..5122028 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerService.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerService.java @@ -1,19 +1,19 @@ -package eu.eudat.file.transformer.service.rdafiletransformer; +package org.opencdmp.filetransformer.rda.service.rdafiletransformer; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; -import eu.eudat.file.transformer.enums.FileTransformerEntityType; -import eu.eudat.file.transformer.interfaces.FileTransformerClient; -import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; -import eu.eudat.file.transformer.models.misc.FileFormat; -import eu.eudat.file.transformer.model.rda.Dataset; -import eu.eudat.file.transformer.model.rda.Dmp; -import eu.eudat.file.transformer.model.rda.RDAModel; -import eu.eudat.file.transformer.model.rda.mapper.DatasetRDAMapper; -import eu.eudat.file.transformer.model.rda.mapper.DmpRDAMapper; -import eu.eudat.file.transformer.service.json.JsonHandlingService; -import eu.eudat.file.transformer.service.storage.FileStorageService; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; +import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration; +import org.opencdmp.filetransformer.rda.model.rda.Dataset; +import org.opencdmp.filetransformer.rda.model.rda.Dmp; +import org.opencdmp.filetransformer.rda.model.rda.RDAModel; +import org.opencdmp.filetransformer.rda.model.rda.mapper.DatasetRDAMapper; +import org.opencdmp.filetransformer.rda.model.rda.mapper.DmpRDAMapper; +import org.opencdmp.filetransformer.rda.service.json.JsonHandlingService; +import org.opencdmp.filetransformer.rda.service.storage.FileStorageService; +import org.opencdmp.filetransformerbase.models.misc.FileFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Scope; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java similarity index 80% rename from core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java index 3324f38..8085840 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceConfiguration.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.rdafiletransformer; +package org.opencdmp.filetransformer.rda.service.rdafiletransformer; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceProperties.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceProperties.java similarity index 97% rename from core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceProperties.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceProperties.java index 52bd06f..8fab19b 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/rdafiletransformer/RdaFileTransformerServiceProperties.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/rdafiletransformer/RdaFileTransformerServiceProperties.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.rdafiletransformer; +package org.opencdmp.filetransformer.rda.service.rdafiletransformer; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageService.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageService.java similarity index 65% rename from core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageService.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageService.java index d9df16f..9f91d58 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageService.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageService.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.storage; +package org.opencdmp.filetransformer.rda.service.storage; public interface FileStorageService { String storeFile(byte[] data); diff --git a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceConfiguration.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceConfiguration.java similarity index 82% rename from core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceConfiguration.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceConfiguration.java index 9403933..10884d5 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceConfiguration.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceConfiguration.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.storage; +package org.opencdmp.filetransformer.rda.service.storage; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceImpl.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceImpl.java similarity index 96% rename from core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceImpl.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceImpl.java index c0a1940..449383d 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceImpl.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceImpl.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.storage; +package org.opencdmp.filetransformer.rda.service.storage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceProperties.java b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceProperties.java similarity index 91% rename from core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceProperties.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceProperties.java index 2402ec5..dc8c1f9 100644 --- a/core/src/main/java/eu/eudat/file/transformer/service/storage/FileStorageServiceProperties.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/service/storage/FileStorageServiceProperties.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.service.storage; +package org.opencdmp.filetransformer.rda.service.storage; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.bind.ConstructorBinding; diff --git a/core/src/main/java/eu/eudat/file/transformer/utils/string/MyStringUtils.java b/core/src/main/java/org/opencdmp/filetransformer/rda/utils/string/MyStringUtils.java similarity index 85% rename from core/src/main/java/eu/eudat/file/transformer/utils/string/MyStringUtils.java rename to core/src/main/java/org/opencdmp/filetransformer/rda/utils/string/MyStringUtils.java index 7a5055e..557ae4f 100644 --- a/core/src/main/java/eu/eudat/file/transformer/utils/string/MyStringUtils.java +++ b/core/src/main/java/org/opencdmp/filetransformer/rda/utils/string/MyStringUtils.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.utils.string; +package org.opencdmp.filetransformer.rda.utils.string; public class MyStringUtils { diff --git a/pom.xml b/pom.xml index 25b3068..2511fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ - gr.cite.opendmp + org.opencdmp file-transformer-rda-parent ${revision} pom @@ -28,9 +28,9 @@ 2.2 - gr.cite.opendmp + org.opencdmp file-transformer-base - 0.0.14 + 0.0.15 diff --git a/web/pom.xml b/web/pom.xml index 5fe2596..12fc2e2 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - gr.cite.opendmp + org.opencdmp file-transformer-rda-parent ${revision} ../pom.xml @@ -22,7 +22,7 @@ - gr.cite.opendmp + org.opencdmp file-transformer-rda ${revision} diff --git a/web/src/main/java/eu/eudat/file/transformer/FileTransformerApplication.java b/web/src/main/java/eu/eudat/filetransformer/rda/FileTransformerApplication.java similarity index 74% rename from web/src/main/java/eu/eudat/file/transformer/FileTransformerApplication.java rename to web/src/main/java/eu/eudat/filetransformer/rda/FileTransformerApplication.java index b08edb9..b0cb704 100644 --- a/web/src/main/java/eu/eudat/file/transformer/FileTransformerApplication.java +++ b/web/src/main/java/eu/eudat/filetransformer/rda/FileTransformerApplication.java @@ -1,10 +1,11 @@ -package eu.eudat.file.transformer; +package eu.eudat.filetransformer.rda; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication(scanBasePackages = { - "eu.eudat.file.transformer.*", + "org.opencdmp.filetransformerbase.*", + "org.opencdmp.filetransformer.rda.*", "gr.cite.tools", "gr.cite.commons" }) diff --git a/web/src/main/java/eu/eudat/file/transformer/config/SecurityConfiguration.java b/web/src/main/java/eu/eudat/filetransformer/rda/config/SecurityConfiguration.java similarity index 98% rename from web/src/main/java/eu/eudat/file/transformer/config/SecurityConfiguration.java rename to web/src/main/java/eu/eudat/filetransformer/rda/config/SecurityConfiguration.java index d0269e8..e04cbb6 100644 --- a/web/src/main/java/eu/eudat/file/transformer/config/SecurityConfiguration.java +++ b/web/src/main/java/eu/eudat/filetransformer/rda/config/SecurityConfiguration.java @@ -1,4 +1,4 @@ -package eu.eudat.file.transformer.config; +package eu.eudat.filetransformer.rda.config; import gr.cite.commons.web.oidc.configuration.WebSecurityProperties; import gr.cite.commons.web.oidc.configuration.filter.ApiKeyFilter; diff --git a/web/src/main/java/eu/eudat/file/transformer/controller/FileTransformerController.java b/web/src/main/java/eu/eudat/filetransformer/rda/controller/FileTransformerController.java similarity index 73% rename from web/src/main/java/eu/eudat/file/transformer/controller/FileTransformerController.java rename to web/src/main/java/eu/eudat/filetransformer/rda/controller/FileTransformerController.java index c01539d..0a887b1 100644 --- a/web/src/main/java/eu/eudat/file/transformer/controller/FileTransformerController.java +++ b/web/src/main/java/eu/eudat/filetransformer/rda/controller/FileTransformerController.java @@ -1,10 +1,10 @@ -package eu.eudat.file.transformer.controller; +package eu.eudat.filetransformer.rda.controller; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; -import eu.eudat.file.transformer.interfaces.FileTransformerClient; -import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,7 +12,7 @@ import java.util.List; @RestController @RequestMapping("/api/file-transformer") -public class FileTransformerController implements eu.eudat.file.transformer.interfaces.FileTransformerController { +public class FileTransformerController implements org.opencdmp.filetransformerbase.interfaces.FileTransformerController { private final FileTransformerClient fileTransformerExecutor;