MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/core/pom.xml
View File

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

6
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DepositConfigurationBuilder.java
View File

@ -18,7 +18,7 @@ import java.util.*;
@Component @Component
@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) @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); private EnumSet<AuthorizationFlags> authorize = EnumSet.of(AuthorizationFlags.None);
@ -34,14 +34,14 @@ public class DepositConfigurationBuilder extends BaseBuilder<DepositConfiguratio
} }
@Override @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.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)); this.logger.trace(new DataLogEntry("requested fields", fields));
if (fields == null || data == null || fields.isEmpty()) if (fields == null || data == null || fields.isEmpty())
return new ArrayList<>(); return new ArrayList<>();
List<DepositConfiguration> models = 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(); DepositConfiguration m = new DepositConfiguration();
if (fields.hasField(this.asIndexer(DepositConfiguration._depositType))) m.setDepositType(d.getDepositType()); if (fields.hasField(this.asIndexer(DepositConfiguration._depositType))) m.setDepositType(d.getDepositType());
if (fields.hasField(this.asIndexer(DepositConfiguration._redirectUri))) m.setRedirectUri(d.getRedirectUri()); if (fields.hasField(this.asIndexer(DepositConfiguration._redirectUri))) m.setRedirectUri(d.getRedirectUri());

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DescriptionTemplateTypeCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; 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.convention.ConventionService;
import org.opencdmp.data.DescriptionTemplateTypeEntity; import org.opencdmp.data.DescriptionTemplateTypeEntity;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

6
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/DmpUserCommonModelBuilder.java
View File

@ -1,9 +1,9 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.DmpUserRole; import org.opencdmp.commonmodels.enums.DmpUserRole;
import eu.eudat.commonmodels.models.DmpUserModel; import org.opencdmp.commonmodels.models.DmpUserModel;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.data.DmpUserEntity; import org.opencdmp.data.DmpUserEntity;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/EntityDoiCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; 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.convention.ConventionService;
import org.opencdmp.data.EntityDoiEntity; import org.opencdmp.data.EntityDoiEntity;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/ReferenceTypeCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; 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.convention.ConventionService;
import org.opencdmp.data.ReferenceTypeEntity; import org.opencdmp.data.ReferenceTypeEntity;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/TagCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; 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.convention.ConventionService;
import org.opencdmp.data.TagEntity; import org.opencdmp.data.TagEntity;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

6
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserCommonModelBuilder.java
View File

@ -1,9 +1,9 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.DmpUserModel; import org.opencdmp.commonmodels.models.DmpUserModel;
import eu.eudat.commonmodels.models.UserContactInfoModel; import org.opencdmp.commonmodels.models.UserContactInfoModel;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.data.DmpEntity; import org.opencdmp.data.DmpEntity;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/UserContactInfoCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels; package org.opencdmp.model.builder.commonmodels;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.ContactInfoType; import org.opencdmp.commonmodels.enums.ContactInfoType;
import eu.eudat.commonmodels.models.UserContactInfoModel; import org.opencdmp.commonmodels.models.UserContactInfoModel;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.data.UserContactInfoEntity; import org.opencdmp.data.UserContactInfoEntity;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

8
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/DescriptionCommonModelBuilder.java
View File

@ -1,10 +1,10 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.DescriptionStatus; import org.opencdmp.commonmodels.enums.DescriptionStatus;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.JsonHandlingService;
import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.XmlHandlingService;
import org.opencdmp.commons.types.description.PropertyDefinitionEntity; import org.opencdmp.commons.types.description.PropertyDefinitionEntity;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/ExternalIdentifierCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.description.ExternalIdentifierEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

6
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/FieldCommonModelBuilder.java
View File

@ -1,9 +1,9 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.FieldModel; import org.opencdmp.commonmodels.models.description.FieldModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import org.opencdmp.commons.enums.FieldType; import org.opencdmp.commons.enums.FieldType;
import org.opencdmp.commons.enums.StorageType; import org.opencdmp.commons.enums.StorageType;
import org.opencdmp.commons.scope.user.UserScope; import org.opencdmp.commons.scope.user.UserScope;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; 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.description.PropertyDefinitionEntity;
import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity; import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; 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.description.PropertyDefinitionFieldSetEntity;
import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/PropertyDefinitionFieldSetItemModelCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; 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.description.PropertyDefinitionFieldSetItemEntity;
import org.opencdmp.commons.types.descriptiontemplate.FieldEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldEntity;
import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/description/VisibilityStateModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.description; package org.opencdmp.model.builder.commonmodels.description;
import org.opencdmp.authorization.AuthorizationFlags; 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.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;
import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse; import org.opencdmp.model.builder.commonmodels.CommonModelBuilderItemResponse;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DefinitionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/DescriptionTemplateCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.DescriptionTemplateTypeModel; import org.opencdmp.commonmodels.models.DescriptionTemplateTypeModel;
import eu.eudat.commonmodels.models.descriptiotemplate.DescriptionTemplateModel; import org.opencdmp.commonmodels.models.descriptiotemplate.DescriptionTemplateModel;
import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.XmlHandlingService;
import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity; import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

8
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.enums.FieldValidationType;
import org.opencdmp.commons.types.descriptiontemplate.FieldEntity; import org.opencdmp.commons.types.descriptiontemplate.FieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
@ -61,9 +61,9 @@ public class FieldCommonModelBuilder extends BaseCommonModelBuilder<FieldModel,
m.setValidations(new ArrayList<>()); m.setValidations(new ArrayList<>());
for (FieldValidationType fieldValidationType : d.getValidations()) { for (FieldValidationType fieldValidationType : d.getValidations()) {
switch (fieldValidationType){ switch (fieldValidationType){
case Url -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.Url); case Url -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.Url);
case None -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.None); case None -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.None);
case Required -> m.getValidations().add(eu.eudat.commonmodels.enums.FieldValidationType.Required); case Required -> m.getValidations().add(org.opencdmp.commonmodels.enums.FieldValidationType.Required);
default -> throw new MyApplicationException("unrecognized type " + fieldValidationType); default -> throw new MyApplicationException("unrecognized type " + fieldValidationType);
} }

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/FieldSetCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.FieldSetEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/MultiplicityCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.MultiplicityEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/PageCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.PageEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate; package org.opencdmp.model.builder.commonmodels.descriptiontemplate;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.SectionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/BaseFieldDataCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.FieldType; import org.opencdmp.commonmodels.enums.FieldType;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelAndMultiplicityDataCommonModelBuilder.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; 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.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.LoggerService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/LabelDataCommonModelBuilder.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; 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.commons.types.descriptiontemplate.fielddata.LabelDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.LoggerService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/RadioBoxDataCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/ReferenceTypeDataCommonModelBuilder.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; 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.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.ReferenceTypeBuilder; import org.opencdmp.model.builder.ReferenceTypeBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/SelectDataCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.fielddata.SelectDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/descriptiontemplate/fielddata/UploadDataCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata; package org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpBlueprintValueCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmp; package org.opencdmp.model.builder.commonmodels.dmp;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.dmp.DmpBlueprintValueEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

20
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpCommonModelBuilder.java
View File

@ -1,16 +1,16 @@
package org.opencdmp.model.builder.commonmodels.dmp; package org.opencdmp.model.builder.commonmodels.dmp;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.DmpAccessType; import org.opencdmp.commonmodels.enums.DmpAccessType;
import eu.eudat.commonmodels.enums.DmpStatus; import org.opencdmp.commonmodels.enums.DmpStatus;
import eu.eudat.commonmodels.models.DmpUserModel; import org.opencdmp.commonmodels.models.DmpUserModel;
import eu.eudat.commonmodels.models.EntityDoiModel; import org.opencdmp.commonmodels.models.EntityDoiModel;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.JsonHandlingService;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.commons.types.dmp.DmpPropertiesEntity; import org.opencdmp.commons.types.dmp.DmpPropertiesEntity;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpContactCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.dmp; package org.opencdmp.model.builder.commonmodels.dmp;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.UserModel; import org.opencdmp.commonmodels.models.UserModel;
import eu.eudat.commonmodels.models.dmp.DmpContactModel; import org.opencdmp.commonmodels.models.dmp.DmpContactModel;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.commons.types.dmp.DmpContactEntity; import org.opencdmp.commons.types.dmp.DmpContactEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmp/DmpPropertiesCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmp; package org.opencdmp.model.builder.commonmodels.dmp;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.dmp.DmpPropertiesEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DefinitionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.dmpblueprint.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/DmpBlueprintCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.DmpBlueprintStatus; import org.opencdmp.commonmodels.enums.DmpBlueprintStatus;
import eu.eudat.commonmodels.models.dmpblueprint.DmpBlueprintModel; import org.opencdmp.commonmodels.models.dmpblueprint.DmpBlueprintModel;
import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.XmlHandlingService;
import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity; import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ExtraFieldCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import eu.eudat.commonmodels.enums.DmpBlueprintExtraFieldDataType; import org.opencdmp.commonmodels.enums.DmpBlueprintExtraFieldDataType;
import eu.eudat.commonmodels.models.dmpblueprint.ExtraFieldModel; import org.opencdmp.commonmodels.models.dmpblueprint.ExtraFieldModel;
import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity; import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.dmpblueprintdefinition.ExtraField; import org.opencdmp.model.dmpblueprintdefinition.ExtraField;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/FieldCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.DmpBlueprintFieldCategory; import org.opencdmp.commonmodels.enums.DmpBlueprintFieldCategory;
import eu.eudat.commonmodels.models.dmpblueprint.FieldModel; import org.opencdmp.commonmodels.models.dmpblueprint.FieldModel;
import org.opencdmp.commons.types.dmpblueprint.FieldEntity; import org.opencdmp.commons.types.dmpblueprint.FieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/ReferenceTypeFieldCommonModelBuilder.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; 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.commons.types.dmpblueprint.ReferenceTypeFieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.ReferenceTypeCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SectionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import org.opencdmp.authorization.AuthorizationFlags; 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.enums.DmpBlueprintFieldCategory;
import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity; import org.opencdmp.commons.types.dmpblueprint.ExtraFieldEntity;
import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity; import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpblueprint/SystemFieldCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmpblueprint; package org.opencdmp.model.builder.commonmodels.dmpblueprint;
import eu.eudat.commonmodels.enums.DmpBlueprintSystemFieldType; import org.opencdmp.commonmodels.enums.DmpBlueprintSystemFieldType;
import eu.eudat.commonmodels.models.dmpblueprint.SystemFieldModel; import org.opencdmp.commonmodels.models.dmpblueprint.SystemFieldModel;
import org.opencdmp.commons.types.dmpblueprint.SystemFieldEntity; import org.opencdmp.commons.types.dmpblueprint.SystemFieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;

4
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceCommonModelBuilder.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.model.builder.commonmodels.dmpreference; package org.opencdmp.model.builder.commonmodels.dmpreference;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.dmpreference.DmpReferenceModel; import org.opencdmp.commonmodels.models.dmpreference.DmpReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.JsonHandlingService;
import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity; import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/dmpreference/DmpReferenceDataCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.dmpreference; package org.opencdmp.model.builder.commonmodels.dmpreference;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.dmpreference.DmpReferenceDataEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

6
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceCommonModelBuilder.java
View File

@ -1,9 +1,9 @@
package org.opencdmp.model.builder.commonmodels.reference; package org.opencdmp.model.builder.commonmodels.reference;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.enums.ReferenceSourceType; import org.opencdmp.commonmodels.enums.ReferenceSourceType;
import eu.eudat.commonmodels.models.reference.ReferenceModel; import org.opencdmp.commonmodels.models.reference.ReferenceModel;
import eu.eudat.commonmodels.models.reference.ReferenceTypeModel; import org.opencdmp.commonmodels.models.reference.ReferenceTypeModel;
import org.opencdmp.commons.XmlHandlingService; import org.opencdmp.commons.XmlHandlingService;
import org.opencdmp.commons.types.reference.DefinitionEntity; import org.opencdmp.commons.types.reference.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceDefinitionCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.reference; package org.opencdmp.model.builder.commonmodels.reference;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.reference.DefinitionEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/builder/commonmodels/reference/ReferenceFieldCommonModelBuilder.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.builder.commonmodels.reference; package org.opencdmp.model.builder.commonmodels.reference;
import org.opencdmp.authorization.AuthorizationFlags; 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.commons.types.reference.FieldEntity;
import org.opencdmp.convention.ConventionService; import org.opencdmp.convention.ConventionService;
import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.BaseCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/model/deposit/DepositConfiguration.java
View File

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

4
backend/core/src/main/java/org/opencdmp/model/file/RepositoryFileFormat.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.model.file; package org.opencdmp.model.file;
import eu.eudat.file.transformer.enums.FileTransformerEntityType; import org.opencdmp.filetransformerbase.enums.FileTransformerEntityType;
import eu.eudat.file.transformer.models.misc.FileFormat; import org.opencdmp.filetransformerbase.models.misc.FileFormat;
import java.util.List; import java.util.List;

6
backend/core/src/main/java/org/opencdmp/service/deposit/DepositClientImpl.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.service.deposit; package org.opencdmp.service.deposit;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.depositinterface.repository.DepositClient; import org.opencdmp.depositbase.repository.DepositClient;
import eu.eudat.depositinterface.repository.DepositConfiguration; import org.opencdmp.depositbase.repository.DepositConfiguration;
import gr.cite.tools.exception.MyApplicationException; import gr.cite.tools.exception.MyApplicationException;
import gr.cite.tools.logging.LoggerService; import gr.cite.tools.logging.LoggerService;
import gr.cite.tools.logging.MapLogEntry; import gr.cite.tools.logging.MapLogEntry;

2
backend/core/src/main/java/org/opencdmp/service/deposit/DepositConfigurationCacheService.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.service.deposit; package org.opencdmp.service.deposit;
import eu.eudat.depositinterface.repository.DepositConfiguration; import org.opencdmp.depositbase.repository.DepositConfiguration;
import gr.cite.tools.cache.CacheService; import gr.cite.tools.cache.CacheService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

8
backend/core/src/main/java/org/opencdmp/service/deposit/DepositServiceImpl.java
View File

@ -3,8 +3,8 @@ package org.opencdmp.service.deposit;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import org.opencdmp.authorization.Permission; import org.opencdmp.authorization.Permission;
import org.opencdmp.authorization.authorizationcontentresolver.AuthorizationContentResolver; import org.opencdmp.authorization.authorizationcontentresolver.AuthorizationContentResolver;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.JsonHandlingService;
import org.opencdmp.commons.enums.ContactInfoType; import org.opencdmp.commons.enums.ContactInfoType;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
@ -21,8 +21,8 @@ import org.opencdmp.data.DmpEntity;
import org.opencdmp.data.DmpUserEntity; import org.opencdmp.data.DmpUserEntity;
import org.opencdmp.data.TenantConfigurationEntity; import org.opencdmp.data.TenantConfigurationEntity;
import org.opencdmp.data.UserEntity; import org.opencdmp.data.UserEntity;
import eu.eudat.depositinterface.repository.DepositClient; import org.opencdmp.depositbase.repository.DepositClient;
import eu.eudat.depositinterface.repository.DepositConfiguration; import org.opencdmp.depositbase.repository.DepositConfiguration;
import org.opencdmp.event.TenantConfigurationTouchedEvent; import org.opencdmp.event.TenantConfigurationTouchedEvent;
import org.opencdmp.event.UserAddedToTenantEvent; import org.opencdmp.event.UserAddedToTenantEvent;
import org.opencdmp.integrationevent.outbox.notification.NotifyIntegrationEvent; import org.opencdmp.integrationevent.outbox.notification.NotifyIntegrationEvent;

2
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/BaseFieldDataHelperService.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; 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.enums.FieldType;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport;

2
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/FieldDataHelperService.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; 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.enums.FieldType;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.BaseFieldDataImportExport;

4
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelAndMultiplicityFieldDataHelperService.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.BaseFieldDataModel;
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.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.LabelAndMultiplicityDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.LabelAndMultiplicityDataImportExport;
import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.LabelAndMultiplicityDataCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.LabelAndMultiplicityDataCommonModelBuilder;

2
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/LabelFieldDataHelperService.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.service.fielddatahelper; 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.data.builder.BuilderFactory;
import gr.cite.tools.fieldset.FieldSet; import gr.cite.tools.fieldset.FieldSet;
import gr.cite.tools.validation.Validator; import gr.cite.tools.validation.Validator;

4
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/RadioBoxFieldDataHelperService.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.RadioBoxDataModel;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.RadioBoxDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.RadioBoxDataImportExport;

2
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/ReferenceTypeFieldDataHelperService.java
View File

@ -1,7 +1,7 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; 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.fielddata.ReferenceTypeDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.ReferenceTypeDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.ReferenceTypeDataImportExport;
import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.ReferenceTypeDataCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.descriptiontemplate.fielddata.ReferenceTypeDataCommonModelBuilder;

4
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/SelectFieldDataHelperService.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.SelectDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.SelectDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.SelectDataImportExport;

4
backend/core/src/main/java/org/opencdmp/service/fielddatahelper/UploadFieldDataHelperService.java
View File

@ -1,8 +1,8 @@
package org.opencdmp.service.fielddatahelper; package org.opencdmp.service.fielddatahelper;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.LabelAndMultiplicityDataModel;
import eu.eudat.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel; import org.opencdmp.commonmodels.models.descriptiotemplate.fielddata.SelectDataModel;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelAndMultiplicityDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.fielddata.UploadDataEntity; import org.opencdmp.commons.types.descriptiontemplate.fielddata.UploadDataEntity;
import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.UploadDataImportExport; import org.opencdmp.commons.types.descriptiontemplate.importexport.fielddata.UploadDataImportExport;

2
backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerConfigurationCacheService.java
View File

@ -1,6 +1,6 @@
package org.opencdmp.service.filetransformer; 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 gr.cite.tools.cache.CacheService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

10
backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerRepository.java
View File

@ -1,10 +1,10 @@
package org.opencdmp.service.filetransformer; package org.opencdmp.service.filetransformer;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import eu.eudat.file.transformer.interfaces.FileTransformerClient; import org.opencdmp.filetransformerbase.interfaces.FileTransformerClient;
import eu.eudat.file.transformer.interfaces.FileTransformerConfiguration; import org.opencdmp.filetransformerbase.interfaces.FileTransformerConfiguration;
import org.springframework.core.ParameterizedTypeReference; import org.springframework.core.ParameterizedTypeReference;
import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;

8
backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java
View File

@ -2,9 +2,9 @@ package org.opencdmp.service.filetransformer;
import org.opencdmp.authorization.AuthorizationFlags; import org.opencdmp.authorization.AuthorizationFlags;
import org.opencdmp.authorization.Permission; import org.opencdmp.authorization.Permission;
import eu.eudat.commonmodels.models.FileEnvelopeModel; import org.opencdmp.commonmodels.models.FileEnvelopeModel;
import eu.eudat.commonmodels.models.description.DescriptionModel; import org.opencdmp.commonmodels.models.description.DescriptionModel;
import eu.eudat.commonmodels.models.dmp.DmpModel; import org.opencdmp.commonmodels.models.dmp.DmpModel;
import org.opencdmp.commons.JsonHandlingService; import org.opencdmp.commons.JsonHandlingService;
import org.opencdmp.commons.enums.IsActive; import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.commons.enums.StorageType; 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.convention.ConventionService;
import org.opencdmp.data.TenantConfigurationEntity; import org.opencdmp.data.TenantConfigurationEntity;
import org.opencdmp.event.TenantConfigurationTouchedEvent; 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.Description;
import org.opencdmp.model.Dmp; import org.opencdmp.model.Dmp;
import org.opencdmp.model.builder.commonmodels.description.DescriptionCommonModelBuilder; import org.opencdmp.model.builder.commonmodels.description.DescriptionCommonModelBuilder;

2
backend/web/src/main/java/org/opencdmp/OpenCDMPApplication.java
View File

@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication(scanBasePackages = { @SpringBootApplication(scanBasePackages = {
"org.opencdmp", "org.opencdmp",
"org.opencdmp.depositinterface", "org.opencdmp.depositbase",
"gr.cite", "gr.cite",
"gr.cite.tools", "gr.cite.tools",
"gr.cite.commons", "gr.cite.commons",