rename to OpenCDMP

This commit is contained in:
Efstratios Giannopoulos 2024-04-26 14:33:42 +03:00
parent 3bdace15bb
commit 96f160476a
63 changed files with 119 additions and 119 deletions

View File

@ -49,19 +49,19 @@
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>repositorydepositbase</artifactId>
<version>2.0.7</version>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>common-models</artifactId>
<version>0.0.10</version>
<version>0.0.11</version>
</dependency>
<dependency>
<groupId>gr.cite.opendmp</groupId>
<groupId>org.opencdmp</groupId>
<artifactId>file-transformer-base</artifactId>
<version>0.0.14</version>
<version>0.0.15</version>
</dependency>
<dependency>
<groupId>gr.cite</groupId>

View File

@ -18,7 +18,7 @@ import java.util.*;
@Component
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class DepositConfigurationBuilder extends BaseBuilder<DepositConfiguration, eu.eudat.depositinterface.repository.DepositConfiguration> {
public class DepositConfigurationBuilder extends BaseBuilder<DepositConfiguration, org.opencdmp.depositbase.repository.DepositConfiguration> {
private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
@ -34,14 +34,14 @@ public class DepositConfigurationBuilder extends BaseBuilder<DepositConfiguratio
}
@Override
public List<DepositConfiguration> build(FieldSet fields, List<eu.eudat.depositinterface.repository.DepositConfiguration> data) throws MyApplicationException {
public List<DepositConfiguration> build(FieldSet fields, List<org.opencdmp.depositbase.repository.DepositConfiguration> 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<DepositConfiguration> 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());

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<FieldModel,
m.setValidations(new ArrayList<>());
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);
}

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -1,6 +1,6 @@
package org.opencdmp.model.deposit;
import eu.eudat.depositinterface.enums.DepositType;
import org.opencdmp.depositbase.enums.DepositType;
public class DepositConfiguration {

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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",