From 96f160476a229dd4866b5950623c1dfc6dd0c3af Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 26 Apr 2024 14:33:42 +0300 Subject: [PATCH] rename to OpenCDMP --- backend/core/pom.xml | 12 +++++------ .../DepositConfigurationBuilder.java | 6 +++--- ...riptionTemplateTypeCommonModelBuilder.java | 2 +- .../DmpUserCommonModelBuilder.java | 6 +++--- .../EntityDoiCommonModelBuilder.java | 2 +- .../ReferenceTypeCommonModelBuilder.java | 2 +- .../commonmodels/TagCommonModelBuilder.java | 2 +- .../commonmodels/UserCommonModelBuilder.java | 6 +++--- .../UserContactInfoCommonModelBuilder.java | 4 ++-- .../DescriptionCommonModelBuilder.java | 8 ++++---- .../ExternalIdentifierCommonModelBuilder.java | 2 +- .../description/FieldCommonModelBuilder.java | 6 +++--- .../PropertyDefinitionCommonModelBuilder.java | 2 +- ...yDefinitionFieldSetCommonModelBuilder.java | 2 +- ...onFieldSetItemModelCommonModelBuilder.java | 2 +- .../VisibilityStateModelBuilder.java | 2 +- .../DefinitionCommonModelBuilder.java | 2 +- ...DescriptionTemplateCommonModelBuilder.java | 4 ++-- .../FieldCommonModelBuilder.java | 8 ++++---- .../FieldSetCommonModelBuilder.java | 2 +- .../MultiplicityCommonModelBuilder.java | 2 +- .../PageCommonModelBuilder.java | 2 +- .../SectionCommonModelBuilder.java | 2 +- .../BaseFieldDataCommonModelBuilder.java | 4 ++-- ...AndMultiplicityDataCommonModelBuilder.java | 2 +- .../LabelDataCommonModelBuilder.java | 2 +- .../RadioBoxDataCommonModelBuilder.java | 2 +- .../ReferenceTypeDataCommonModelBuilder.java | 2 +- .../SelectDataCommonModelBuilder.java | 2 +- .../UploadDataCommonModelBuilder.java | 2 +- .../DmpBlueprintValueCommonModelBuilder.java | 2 +- .../dmp/DmpCommonModelBuilder.java | 20 +++++++++---------- .../dmp/DmpContactCommonModelBuilder.java | 4 ++-- .../dmp/DmpPropertiesCommonModelBuilder.java | 2 +- .../DefinitionCommonModelBuilder.java | 2 +- .../DmpBlueprintCommonModelBuilder.java | 4 ++-- .../ExtraFieldCommonModelBuilder.java | 4 ++-- .../dmpblueprint/FieldCommonModelBuilder.java | 4 ++-- .../ReferenceTypeFieldCommonModelBuilder.java | 2 +- .../SectionCommonModelBuilder.java | 2 +- .../SystemFieldCommonModelBuilder.java | 4 ++-- .../DmpReferenceCommonModelBuilder.java | 4 ++-- .../DmpReferenceDataCommonModelBuilder.java | 2 +- .../ReferenceCommonModelBuilder.java | 6 +++--- ...ReferenceDefinitionCommonModelBuilder.java | 2 +- .../ReferenceFieldCommonModelBuilder.java | 2 +- .../model/deposit/DepositConfiguration.java | 2 +- .../model/file/RepositoryFileFormat.java | 4 ++-- .../service/deposit/DepositClientImpl.java | 6 +++--- .../DepositConfigurationCacheService.java | 2 +- .../service/deposit/DepositServiceImpl.java | 8 ++++---- .../BaseFieldDataHelperService.java | 2 +- .../FieldDataHelperService.java | 2 +- ...AndMultiplicityFieldDataHelperService.java | 4 ++-- .../LabelFieldDataHelperService.java | 2 +- .../RadioBoxFieldDataHelperService.java | 4 ++-- .../ReferenceTypeFieldDataHelperService.java | 2 +- .../SelectFieldDataHelperService.java | 4 ++-- .../UploadFieldDataHelperService.java | 4 ++-- ...eTransformerConfigurationCacheService.java | 2 +- .../FileTransformerRepository.java | 10 +++++----- .../FileTransformerServiceImpl.java | 8 ++++---- .../org/opencdmp/OpenCDMPApplication.java | 2 +- 63 files changed, 119 insertions(+), 119 deletions(-) diff --git a/backend/core/pom.xml b/backend/core/pom.xml index afe6aa264..23a32a3f6 100644 --- a/backend/core/pom.xml +++ b/backend/core/pom.xml @@ -49,19 +49,19 @@ 2.1.0 - gr.cite.opendmp + org.opencdmp repositorydepositbase - 2.0.7 + 2.0.8 - gr.cite.opendmp + org.opencdmp common-models - 0.0.10 + 0.0.11 - gr.cite.opendmp + org.opencdmp file-transformer-base - 0.0.14 + 0.0.15 gr.cite diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DepositConfigurationBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DepositConfigurationBuilder.java index 6bdc20793..129c1144c 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DepositConfigurationBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DepositConfigurationBuilder.java @@ -18,7 +18,7 @@ import java.util.*; @Component @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class DepositConfigurationBuilder extends BaseBuilder { +public class DepositConfigurationBuilder extends BaseBuilder { private EnumSet authorize = EnumSet.of(AuthorizationFlags.None); @@ -34,14 +34,14 @@ public class DepositConfigurationBuilder extends BaseBuilder build(FieldSet fields, List data) throws MyApplicationException { + public List build(FieldSet fields, List data) throws MyApplicationException { this.logger.debug("building for {} items requesting {} fields", Optional.ofNullable(data).map(List::size).orElse(0), Optional.ofNullable(fields).map(FieldSet::getFields).map(Set::size).orElse(0)); this.logger.trace(new DataLogEntry("requested fields", fields)); if (fields == null || data == null || fields.isEmpty()) return new ArrayList<>(); List models = new ArrayList<>(); - for (eu.eudat.depositinterface.repository.DepositConfiguration d : data) { + for (org.opencdmp.depositbase.repository.DepositConfiguration d : data) { DepositConfiguration m = new DepositConfiguration(); if (fields.hasField(this.asIndexer(DepositConfiguration._depositType))) m.setDepositType(d.getDepositType()); if (fields.hasField(this.asIndexer(DepositConfiguration._redirectUri))) m.setRedirectUri(d.getRedirectUri()); diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DescriptionTemplateTypeCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DescriptionTemplateTypeCommonModelBuilder.java index d832a8dc3..3a6fb1ac2 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DescriptionTemplateTypeCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DescriptionTemplateTypeCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.DescriptionTemplateTypeModel; +import org.opencdmp.commonmodels.models.DescriptionTemplateTypeModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.DescriptionTemplateTypeEntity; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java index 845b2fdc2..02c286927 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java @@ -1,9 +1,9 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.DmpUserRole; -import eu.eudat.commonmodels.models.DmpUserModel; -import eu.eudat.commonmodels.models.UserModel; +import org.opencdmp.commonmodels.enums.DmpUserRole; +import org.opencdmp.commonmodels.models.DmpUserModel; +import org.opencdmp.commonmodels.models.UserModel; import org.opencdmp.commons.enums.IsActive; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.DmpUserEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/EntityDoiCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/EntityDoiCommonModelBuilder.java index 13fc68c78..ad26bd63a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/EntityDoiCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/EntityDoiCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.EntityDoiModel; +import org.opencdmp.commonmodels.models.EntityDoiModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.EntityDoiEntity; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/ReferenceTypeCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/ReferenceTypeCommonModelBuilder.java index fc9bb3594..f54d4c0ad 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/ReferenceTypeCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/ReferenceTypeCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; +import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.ReferenceTypeEntity; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/TagCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/TagCommonModelBuilder.java index 1cfabfbc7..b67868cb5 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/TagCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/TagCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.TagModel; +import org.opencdmp.commonmodels.models.TagModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.TagEntity; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserCommonModelBuilder.java index a2e853190..920c00115 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserCommonModelBuilder.java @@ -1,9 +1,9 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.DmpUserModel; -import eu.eudat.commonmodels.models.UserContactInfoModel; -import eu.eudat.commonmodels.models.UserModel; +import org.opencdmp.commonmodels.models.DmpUserModel; +import org.opencdmp.commonmodels.models.UserContactInfoModel; +import org.opencdmp.commonmodels.models.UserModel; import org.opencdmp.commons.enums.IsActive; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.DmpEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserContactInfoCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserContactInfoCommonModelBuilder.java index fd68330c0..5a480bd39 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserContactInfoCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserContactInfoCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.ContactInfoType; -import eu.eudat.commonmodels.models.UserContactInfoModel; +import org.opencdmp.commonmodels.enums.ContactInfoType; +import org.opencdmp.commonmodels.models.UserContactInfoModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.data.UserContactInfoEntity; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java index 6a80c66b9..c3b143aa3 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java @@ -1,10 +1,10 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.DescriptionStatus; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; +import org.opencdmp.commonmodels.enums.DescriptionStatus; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.types.description.PropertyDefinitionEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/ExternalIdentifierCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/ExternalIdentifierCommonModelBuilder.java index fe9b3b833..f1c22707a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/ExternalIdentifierCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/ExternalIdentifierCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.description.ExternalIdentifierModel; +import org.opencdmp.commonmodels.models.description.ExternalIdentifierModel; import org.opencdmp.commons.types.description.ExternalIdentifierEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java index 33317f8cf..a30e4c7b6 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java @@ -1,9 +1,9 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.description.FieldModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.description.FieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commons.enums.FieldType; import org.opencdmp.commons.enums.StorageType; import org.opencdmp.commons.scope.user.UserScope; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionCommonModelBuilder.java index a4751029e..96408e95a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.description.PropertyDefinitionModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionModel; import org.opencdmp.commons.types.description.PropertyDefinitionEntity; import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetCommonModelBuilder.java index 1e5c0677e..f5f265f63 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetModel; import org.opencdmp.commons.types.description.PropertyDefinitionFieldSetEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetItemModelCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetItemModelCommonModelBuilder.java index 48a703ed3..cbb499fb0 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetItemModelCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetItemModelCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.description.PropertyDefinitionFieldSetItemModel; +import org.opencdmp.commonmodels.models.description.PropertyDefinitionFieldSetItemModel; import org.opencdmp.commons.types.description.PropertyDefinitionFieldSetItemEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/VisibilityStateModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/VisibilityStateModelBuilder.java index 31b341ebb..5370a1198 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/VisibilityStateModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/VisibilityStateModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.description; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.description.VisibilityStateModel; +import org.opencdmp.commonmodels.models.description.VisibilityStateModel; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java index 67f58839f..11d37f108 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.DefinitionModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DefinitionModel; import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DescriptionTemplateCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DescriptionTemplateCommonModelBuilder.java index a335f5446..37ac940df 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DescriptionTemplateCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DescriptionTemplateCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.DescriptionTemplateTypeModel; -import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; +import org.opencdmp.commonmodels.models.DescriptionTemplateTypeModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java index e4dc7dbe9..c6f26ac49 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldModel; import org.opencdmp.commons.enums.FieldValidationType; import org.opencdmp.commons.types.descriptiontemplate.FieldEntity; import org.opencdmp.convention.ConventionService; @@ -61,9 +61,9 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder()); for (FieldValidationType fieldValidationType : d.getValidations()) { switch (fieldValidationType){ - case Url -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.Url); - case None -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.None); - case Required -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.Required); + case Url -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.Url); + case None -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.None); + case Required -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.Required); default -> throw new MyApplicationException("unrecognized type " + fieldValidationType); } diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java index c7493d023..c00a2ac31 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.FieldSetModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.FieldSetModel; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java index bc0e0dd30..502064cbc 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.MultiplicityModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.MultiplicityModel; import org.opencdmp.commons.types.descriptiontemplate.MultiplicityEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java index bfab0020f..3e698c598 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.PageModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.PageModel; import org.opencdmp.commons.types.descriptiontemplate.PageEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java index 104b9bc89..e0e09be77 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.SectionModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.SectionModel; import org.opencdmp.commons.types.descriptiontemplate.SectionEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/BaseFieldDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/BaseFieldDataCommonModelBuilder.java index c1a0111e2..b7bbe1011 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/BaseFieldDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/BaseFieldDataCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.FieldType; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; +import org.opencdmp.commonmodels.enums.FieldType; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelAndMultiplicityDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelAndMultiplicityDataCommonModelBuilder.java index 72d24f952..a3aa01b18 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelAndMultiplicityDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelAndMultiplicityDataCommonModelBuilder.java @@ -1,6 +1,6 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.convention.ConventionService; import gr.cite.tools.logging.LoggerService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelDataCommonModelBuilder.java index 35e072034..d62187535 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelDataCommonModelBuilder.java @@ -1,6 +1,6 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelDataEntity; import org.opencdmp.convention.ConventionService; import gr.cite.tools.logging.LoggerService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/RadioBoxDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/RadioBoxDataCommonModelBuilder.java index 206c51959..320b8322a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/RadioBoxDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/RadioBoxDataCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java index 10a4b2e27..7f91eb49e 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java @@ -1,6 +1,6 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.ReferenceTypeBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/SelectDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/SelectDataCommonModelBuilder.java index c27bca1ae..1fd80da55 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/SelectDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/SelectDataCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/UploadDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/UploadDataCommonModelBuilder.java index 95a93d84d..b21843198 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/UploadDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/UploadDataCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.UploadDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.UploadDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.UploadDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpBlueprintValueCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpBlueprintValueCommonModelBuilder.java index 49571a24f..568e114b8 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpBlueprintValueCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpBlueprintValueCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmp; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmp.DmpBlueprintValueModel; +import org.opencdmp.commonmodels.models.dmp.DmpBlueprintValueModel; import org.opencdmp.commons.types.dmp.DmpBlueprintValueEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java index 11e07f5b3..eb72d23a9 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java @@ -1,16 +1,16 @@ package org.opencdmp.model.builder.commonmodels.dmp; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.DmpAccessType; -import eu.eudat.commonmodels.enums.DmpStatus; -import eu.eudat.commonmodels.models.DmpUserModel; -import eu.eudat.commonmodels.models.EntityDoiModel; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.UserModel; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; -import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; -import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; +import org.opencdmp.commonmodels.enums.DmpAccessType; +import org.opencdmp.commonmodels.enums.DmpStatus; +import org.opencdmp.commonmodels.models.DmpUserModel; +import org.opencdmp.commonmodels.models.EntityDoiModel; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.UserModel; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; +import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel; +import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel; import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.types.dmp.DmpPropertiesEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpContactCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpContactCommonModelBuilder.java index fb262a58e..05b387a2a 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpContactCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpContactCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.dmp; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.UserModel; -import eu.eudat.commonmodels.models.dmp.DmpContactModel; +import org.opencdmp.commonmodels.models.UserModel; +import org.opencdmp.commonmodels.models.dmp.DmpContactModel; import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.types.dmp.DmpContactEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpPropertiesCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpPropertiesCommonModelBuilder.java index 9ec39c6b7..904052850 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpPropertiesCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpPropertiesCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmp; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmp.DmpPropertiesModel; +import org.opencdmp.commonmodels.models.dmp.DmpPropertiesModel; import org.opencdmp.commons.types.dmp.DmpPropertiesEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DefinitionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DefinitionCommonModelBuilder.java index b92588d76..aa501c008 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DefinitionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DefinitionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmpblueprint.DefinitionModel; +import org.opencdmp.commonmodels.models.dmpblueprint.DefinitionModel; import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DmpBlueprintCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DmpBlueprintCommonModelBuilder.java index 6ce222204..dc8abd0c2 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DmpBlueprintCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DmpBlueprintCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.DmpBlueprintStatus; -import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; +import org.opencdmp.commonmodels.enums.DmpBlueprintStatus; +import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel; import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java index 0f655540b..febd7f27b 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; -import eu.eudat.commonmodels.enums.DmpBlueprintExtraFieldDataType; -import eu.eudat.commonmodels.models.dmpblueprint.ExtraFieldModel; +import org.opencdmp.commonmodels.enums.DmpBlueprintExtraFieldDataType; +import org.opencdmp.commonmodels.models.dmpblueprint.ExtraFieldModel; import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.dmpblueprintdefinition.ExtraField; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java index d8e6dab5b..04902ffc6 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.DmpBlueprintFieldCategory; -import eu.eudat.commonmodels.models.dmpblueprint.FieldModel; +import org.opencdmp.commonmodels.enums.DmpBlueprintFieldCategory; +import org.opencdmp.commonmodels.models.dmpblueprint.FieldModel; import org.opencdmp.commons.types.dmpblueprint.FieldEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java index c85820e8a..3f940565e 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java @@ -1,6 +1,6 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; -import eu.eudat.commonmodels.models.dmpblueprint.ReferenceTypeFieldModel; +import org.opencdmp.commonmodels.models.dmpblueprint.ReferenceTypeFieldModel; import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SectionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SectionCommonModelBuilder.java index 52922a726..498774159 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SectionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SectionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmpblueprint.SectionModel; +import org.opencdmp.commonmodels.models.dmpblueprint.SectionModel; import org.opencdmp.commons.enums.DmpBlueprintFieldCategory; import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity; import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SystemFieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SystemFieldCommonModelBuilder.java index 16bc763a1..d68449d28 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SystemFieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SystemFieldCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmpblueprint; -import eu.eudat.commonmodels.enums.DmpBlueprintSystemFieldType; -import eu.eudat.commonmodels.models.dmpblueprint.SystemFieldModel; +import org.opencdmp.commonmodels.enums.DmpBlueprintSystemFieldType; +import org.opencdmp.commonmodels.models.dmpblueprint.SystemFieldModel; import org.opencdmp.commons.types.dmpblueprint.SystemFieldEntity; import org.opencdmp.convention.ConventionService; import gr.cite.tools.exception.MyApplicationException; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceCommonModelBuilder.java index dea5779d3..cc31c57f0 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceCommonModelBuilder.java @@ -1,8 +1,8 @@ package org.opencdmp.model.builder.commonmodels.dmpreference; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; -import eu.eudat.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceDataCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceDataCommonModelBuilder.java index 1a8c52f16..322647251 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceDataCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceDataCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.dmpreference; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.dmpreference.DmpReferenceDataModel; +import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceDataModel; import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceCommonModelBuilder.java index 5882e48ed..09035027b 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceCommonModelBuilder.java @@ -1,9 +1,9 @@ package org.opencdmp.model.builder.commonmodels.reference; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.enums.ReferenceSourceType; -import eu.eudat.commonmodels.models.reference.ReferenceModel; -import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; +import org.opencdmp.commonmodels.enums.ReferenceSourceType; +import org.opencdmp.commonmodels.models.reference.ReferenceModel; +import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel; import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.types.reference.DefinitionEntity; import org.opencdmp.convention.ConventionService; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceDefinitionCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceDefinitionCommonModelBuilder.java index 2784d9e1c..df36ae70b 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceDefinitionCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceDefinitionCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.reference; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.reference.ReferenceDefinitionModel; +import org.opencdmp.commonmodels.models.reference.ReferenceDefinitionModel; import org.opencdmp.commons.types.reference.DefinitionEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceFieldCommonModelBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceFieldCommonModelBuilder.java index 5128de187..22b6698e8 100644 --- a/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceFieldCommonModelBuilder.java +++ b/backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceFieldCommonModelBuilder.java @@ -1,7 +1,7 @@ package org.opencdmp.model.builder.commonmodels.reference; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.reference.ReferenceFieldModel; +import org.opencdmp.commonmodels.models.reference.ReferenceFieldModel; import org.opencdmp.commons.types.reference.FieldEntity; import org.opencdmp.convention.ConventionService; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/model/deposit/DepositConfiguration.java b/backend/core/src/main/java/org/opencdmp/model/deposit/DepositConfiguration.java index bfedb0542..a59260d15 100644 --- a/backend/core/src/main/java/org/opencdmp/model/deposit/DepositConfiguration.java +++ b/backend/core/src/main/java/org/opencdmp/model/deposit/DepositConfiguration.java @@ -1,6 +1,6 @@ package org.opencdmp.model.deposit; -import eu.eudat.depositinterface.enums.DepositType; +import org.opencdmp.depositbase.enums.DepositType; public class DepositConfiguration { diff --git a/backend/core/src/main/java/org/opencdmp/model/file/RepositoryFileFormat.java b/backend/core/src/main/java/org/opencdmp/model/file/RepositoryFileFormat.java index b4b0a120b..dbe01f859 100644 --- a/backend/core/src/main/java/org/opencdmp/model/file/RepositoryFileFormat.java +++ b/backend/core/src/main/java/org/opencdmp/model/file/RepositoryFileFormat.java @@ -1,7 +1,7 @@ package org.opencdmp.model.file; -import eu.eudat.file.transformer.enums.FileTransformerEntityType; -import eu.eudat.file.transformer.models.misc.FileFormat; +import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType; +import org.opencdmp.filetransformerbase.models.misc.FileFormat; import java.util.List; diff --git a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositClientImpl.java b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositClientImpl.java index 9c0970f75..bb982580b 100644 --- a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositClientImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositClientImpl.java @@ -1,8 +1,8 @@ package org.opencdmp.service.deposit; -import eu.eudat.commonmodels.models.dmp.DmpModel; -import eu.eudat.depositinterface.repository.DepositClient; -import eu.eudat.depositinterface.repository.DepositConfiguration; +import org.opencdmp.commonmodels.models.dmp.DmpModel; +import org.opencdmp.depositbase.repository.DepositClient; +import org.opencdmp.depositbase.repository.DepositConfiguration; import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.MapLogEntry; diff --git a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositConfigurationCacheService.java b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositConfigurationCacheService.java index ee1144712..15b1cd800 100644 --- a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositConfigurationCacheService.java +++ b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositConfigurationCacheService.java @@ -1,6 +1,6 @@ package org.opencdmp.service.deposit; -import eu.eudat.depositinterface.repository.DepositConfiguration; +import org.opencdmp.depositbase.repository.DepositConfiguration; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java index db6a155b5..ceae768e9 100644 --- a/backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java @@ -3,8 +3,8 @@ package org.opencdmp.service.deposit; import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.Permission; import org.opencdmp.authorization.authorizationcontentresolver.AuthorizationContentResolver; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.enums.ContactInfoType; import org.opencdmp.commons.enums.IsActive; @@ -21,8 +21,8 @@ import org.opencdmp.data.DmpEntity; import org.opencdmp.data.DmpUserEntity; import org.opencdmp.data.TenantConfigurationEntity; import org.opencdmp.data.UserEntity; -import eu.eudat.depositinterface.repository.DepositClient; -import eu.eudat.depositinterface.repository.DepositConfiguration; +import org.opencdmp.depositbase.repository.DepositClient; +import org.opencdmp.depositbase.repository.DepositConfiguration; import org.opencdmp.event.TenantConfigurationTouchedEvent; import org.opencdmp.event.UserAddedToTenantEvent; import org.opencdmp.integrationevent.outbox.notification.NotifyIntegrationEvent; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/BaseFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/BaseFieldDataHelperService.java index 3b3c566ec..5181883d3 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/BaseFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/BaseFieldDataHelperService.java @@ -1,7 +1,7 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; import org.opencdmp.commons.enums.FieldType; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/FieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/FieldDataHelperService.java index cab6daf0f..da335b332 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/FieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/FieldDataHelperService.java @@ -1,7 +1,7 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; import org.opencdmp.commons.enums.FieldType; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java index ba9f7477e..18cb0ff3a 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java @@ -1,8 +1,8 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.LabelAndMultiplicityDataImportExport; import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.LabelAndMultiplicityDataCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelFieldDataHelperService.java index 42d29e2c0..c85b820ee 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelFieldDataHelperService.java @@ -1,6 +1,6 @@ package org.opencdmp.service.fielddatahelper; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelDataModel; import gr.cite.tools.data.builder.BuilderFactory; import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.validation.Validator; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/RadioBoxFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/RadioBoxFieldDataHelperService.java index 40dfa496a..159e7d78a 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/RadioBoxFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/RadioBoxFieldDataHelperService.java @@ -1,8 +1,8 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxDataImportExport; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/ReferenceTypeFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/ReferenceTypeFieldDataHelperService.java index b8d556410..bda89b8e7 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/ReferenceTypeFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/ReferenceTypeFieldDataHelperService.java @@ -1,7 +1,7 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.ReferenceTypeDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.ReferenceTypeDataImportExport; import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.ReferenceTypeDataCommonModelBuilder; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/SelectFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/SelectFieldDataHelperService.java index c6c899a45..aa72161c6 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/SelectFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/SelectFieldDataHelperService.java @@ -1,8 +1,8 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.SelectDataImportExport; diff --git a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/UploadFieldDataHelperService.java b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/UploadFieldDataHelperService.java index 6dbdba3bc..e25d54d1a 100644 --- a/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/UploadFieldDataHelperService.java +++ b/backend/core/src/main/java/org/opencdmp/service/fielddatahelper/UploadFieldDataHelperService.java @@ -1,8 +1,8 @@ package org.opencdmp.service.fielddatahelper; import org.opencdmp.authorization.AuthorizationFlags; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; -import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; +import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.UploadDataEntity; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.UploadDataImportExport; diff --git a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerConfigurationCacheService.java b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerConfigurationCacheService.java index a43d293b7..0a7238703 100644 --- a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerConfigurationCacheService.java +++ b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerConfigurationCacheService.java @@ -1,6 +1,6 @@ package org.opencdmp.service.filetransformer; -import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration; import gr.cite.tools.cache.CacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerRepository.java b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerRepository.java index 338f119be..21af559a8 100644 --- a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerRepository.java +++ b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerRepository.java @@ -1,10 +1,10 @@ package org.opencdmp.service.filetransformer; -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.core.ParameterizedTypeReference; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; diff --git a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java index 4e3c56b5c..4f3dfad0a 100644 --- a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java @@ -2,9 +2,9 @@ package org.opencdmp.service.filetransformer; import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.Permission; -import eu.eudat.commonmodels.models.FileEnvelopeModel; -import eu.eudat.commonmodels.models.description.DescriptionModel; -import eu.eudat.commonmodels.models.dmp.DmpModel; +import org.opencdmp.commonmodels.models.FileEnvelopeModel; +import org.opencdmp.commonmodels.models.description.DescriptionModel; +import org.opencdmp.commonmodels.models.dmp.DmpModel; import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.StorageType; @@ -15,7 +15,7 @@ import org.opencdmp.commons.types.tenantconfiguration.FileTransformerTenantConfi import org.opencdmp.convention.ConventionService; import org.opencdmp.data.TenantConfigurationEntity; import org.opencdmp.event.TenantConfigurationTouchedEvent; -import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; +import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration; import org.opencdmp.model.Description; import org.opencdmp.model.Dmp; import org.opencdmp.model.builder.commonmodels.description.DescriptionCommonModelBuilder; diff --git a/backend/web/src/main/java/org/opencdmp/OpenCDMPApplication.java b/backend/web/src/main/java/org/opencdmp/OpenCDMPApplication.java index 7d743bb9b..ec1cd3621 100644 --- a/backend/web/src/main/java/org/opencdmp/OpenCDMPApplication.java +++ b/backend/web/src/main/java/org/opencdmp/OpenCDMPApplication.java @@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication(scanBasePackages = { "org.opencdmp", - "org.opencdmp.depositinterface", + "org.opencdmp.depositbase", "gr.cite", "gr.cite.tools", "gr.cite.commons",