From b58dd531ffb5f78e078c1b2fd5182c524f7559db Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 26 Apr 2024 17:12:29 +0300 Subject: [PATCH] rename to OpenCDMP --- dmp-migration-tool/data/pom.xml | 8 ++- .../eu/old/eudat/data/entities/EntityDoi.java | 6 +- .../data/entities/EntityTypeConverter.java | 2 +- dmp-migration-tool/pom.xml | 2 +- dmp-migration-tool/web/pom.xml | 2 +- .../java/eu/old/eudat/EuDatApplication.java | 2 +- .../DevelDatabaseConfiguration.java | 2 +- .../configurations/SecurityConfiguration.java | 4 +- .../DataRepositoryMigrationService.java | 16 ++--- .../migration/DatasetMigrationService.java | 64 +++++++++---------- .../DatasetReferenceMigrationService.java | 4 +- ...eXmlCleanInvalidReferenceTypesService.java | 26 ++++---- ...escriptionTemplateXmlMigrationService.java | 30 ++++----- .../DmpBlueprintXmlMigrationService.java | 34 +++++----- .../DmpDatasetProfileMigrationService.java | 16 ++--- .../eudat/migration/DmpMigrationService.java | 32 +++++----- .../migration/DmpUserMigrationService.java | 6 +- .../ExternalDatasetMigrationService.java | 6 +- .../migration/FunderMigrationService.java | 12 ++-- .../migration/GrantMigrationService.java | 16 ++--- .../old/eudat/migration/MigrationTools.java | 4 +- .../OrganizationMigrationService.java | 16 ++--- .../migration/ProjectMigrationService.java | 16 ++--- .../migration/RegistryMigrationService.java | 16 ++--- .../migration/ResearcherMigrationService.java | 16 ++--- .../migration/ServiceMigrationService.java | 16 ++--- .../StorageFileMigrationService.java | 20 +++--- .../eudat/migration/TagMigrationService.java | 8 +-- .../UserContactInfoMigrationService.java | 4 +- .../eudat/migration/UserMigrationService.java | 18 +++--- 30 files changed, 215 insertions(+), 209 deletions(-) diff --git a/dmp-migration-tool/data/pom.xml b/dmp-migration-tool/data/pom.xml index 59d45c51d..ca6127107 100644 --- a/dmp-migration-tool/data/pom.xml +++ b/dmp-migration-tool/data/pom.xml @@ -17,7 +17,7 @@ - eu.eudat + org.opencdmp core 1.0.0-SNAPSHOT @@ -37,5 +37,11 @@ swagger-annotations 1.5.20 + + org.opencdmp + core + 1.0.0-SNAPSHOT + compile + \ No newline at end of file diff --git a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityDoi.java b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityDoi.java index 833424d89..815713afc 100644 --- a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityDoi.java +++ b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityDoi.java @@ -1,9 +1,9 @@ package eu.old.eudat.data.entities; import com.fasterxml.jackson.annotation.JsonValue; -import eu.eudat.commons.enums.EnumUtils; -import eu.eudat.data.converters.enums.DatabaseEnum; -import eu.eudat.data.converters.enums.DatabaseEnumConverter; +import org.opencdmp.commons.enums.EnumUtils; +import org.opencdmp.data.converters.enums.DatabaseEnum; +import org.opencdmp.data.converters.enums.DatabaseEnumConverter; import eu.old.eudat.data.converters.DateToUTCConverter; import eu.old.eudat.data.entities.helpers.EntityBinder; import eu.old.eudat.queryable.queryableentity.DataEntity; diff --git a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityTypeConverter.java b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityTypeConverter.java index 1ad0549ec..b9669da6d 100644 --- a/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityTypeConverter.java +++ b/dmp-migration-tool/data/src/main/java/eu/old/eudat/data/entities/EntityTypeConverter.java @@ -1,6 +1,6 @@ package eu.old.eudat.data.entities; -import eu.eudat.data.converters.enums.DatabaseEnumConverter; +import org.opencdmp.data.converters.enums.DatabaseEnumConverter; import jakarta.persistence.Converter; @Converter diff --git a/dmp-migration-tool/pom.xml b/dmp-migration-tool/pom.xml index f0c3012ab..52f764bf3 100644 --- a/dmp-migration-tool/pom.xml +++ b/dmp-migration-tool/pom.xml @@ -15,7 +15,7 @@ queryable - ../dmp-backend/core + ../backend/core web data elastic diff --git a/dmp-migration-tool/web/pom.xml b/dmp-migration-tool/web/pom.xml index 15a4a6f96..60bc6302c 100644 --- a/dmp-migration-tool/web/pom.xml +++ b/dmp-migration-tool/web/pom.xml @@ -17,7 +17,7 @@ - eu.eudat + org.opencdmp core 1.0.0-SNAPSHOT diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java index a31b4314e..00ae9d5da 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/EuDatApplication.java @@ -17,7 +17,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import java.util.ArrayList; -@SpringBootApplication(scanBasePackages = {"eu.eudat" ,"eu.old.eudat", "eu.old.eudat.depositinterface", "gr.cite"}) +@SpringBootApplication(scanBasePackages = {"org.opencdmp" ,"eu.old.eudat", "eu.old.eudat.depositinterface", "gr.cite"}) @Configuration @EnableAsync public class EuDatApplication extends SpringBootServletInitializer { diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/DevelDatabaseConfiguration.java index 84dda4905..72a9308ea 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/DevelDatabaseConfiguration.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/DevelDatabaseConfiguration.java @@ -42,7 +42,7 @@ public class DevelDatabaseConfiguration { public LocalContainerEntityManagerFactoryBean entityManagerFactory() { LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); - em.setPackagesToScan("eu.old.eudat.data.entities", "eu.eudat.data"); + em.setPackagesToScan("eu.old.eudat.data.entities", "eu.eudat.data", "org.opencdmp.data"); em.setPersistenceUnitPostProcessors(persistenceUnit -> { List managedClassNames = persistenceUnit.getManagedClassNames(); managedClassNames.removeIf(fullClassName -> fullClassName.startsWith("eu.eudat.data.old")); diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/SecurityConfiguration.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/SecurityConfiguration.java index 98d9718a3..bfc91812a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/SecurityConfiguration.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/configurations/SecurityConfiguration.java @@ -1,7 +1,7 @@ package eu.old.eudat.configurations; -import eu.eudat.authorization.OwnedAuthorizationRequirement; -import eu.eudat.authorization.OwnedResource; +import org.opencdmp.authorization.OwnedAuthorizationRequirement; +import org.opencdmp.authorization.OwnedResource; import gr.cite.commons.web.authz.handler.AuthorizationHandler; import gr.cite.commons.web.authz.handler.PermissionAuthenticatedAuthorizationHandler; import gr.cite.commons.web.authz.handler.PermissionClaimAuthorizationHandler; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DataRepositoryMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DataRepositoryMigrationService.java index c6f787a16..12cc8a250 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DataRepositoryMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DataRepositoryMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.DataRepositoryDao; import eu.old.eudat.data.entities.DataRepository; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java index 38a7e0894..23ff5289d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetMigrationService.java @@ -1,22 +1,22 @@ package eu.old.eudat.migration; -import eu.eudat.commons.JsonHandlingService; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.*; -import eu.eudat.commons.types.description.*; -import eu.eudat.commons.types.descriptionreference.DescriptionReferenceDataEntity; -import eu.eudat.commons.types.descriptiontemplate.FieldSetEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; -import eu.eudat.commons.types.dmpblueprint.DefinitionEntity; -import eu.eudat.commons.types.externalfetcher.ExternalFetcherApiSourceConfigurationEntity; -import eu.eudat.commons.types.referencetype.ReferenceTypeDefinitionEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.*; -import eu.eudat.model.Dmp; -import eu.eudat.model.Reference; -import eu.eudat.model.ReferenceType; -import eu.eudat.model.persist.descriptionreference.DescriptionReferenceDataPersist; -import eu.eudat.query.*; +import org.opencdmp.commons.JsonHandlingService; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.*; +import org.opencdmp.commons.types.description.*; +import org.opencdmp.commons.types.descriptionreference.DescriptionReferenceDataEntity; +import org.opencdmp.commons.types.descriptiontemplate.FieldSetEntity; +import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; +import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity; +import org.opencdmp.commons.types.externalfetcher.ExternalFetcherApiSourceConfigurationEntity; +import org.opencdmp.commons.types.referencetype.ReferenceTypeDefinitionEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.*; +import org.opencdmp.model.Dmp; +import org.opencdmp.model.Reference; +import org.opencdmp.model.ReferenceType; +import org.opencdmp.model.persist.descriptionreference.DescriptionReferenceDataPersist; +import org.opencdmp.query.*; import eu.old.eudat.data.dao.entities.DatasetDao; import eu.old.eudat.data.entities.Dataset; import eu.old.eudat.logic.services.operations.DatabaseRepository; @@ -102,9 +102,9 @@ public class DatasetMigrationService { List descriptionTemplates = this.queryFactory.query(DescriptionTemplateQuery.class).ids(items.stream().map(x-> x.getProfile().getId()).distinct().toList()).collect(); Map creatorsByDmp = this.queryFactory.query(DmpQuery.class).ids(items.stream().map(x-> x.getDmp().getId()).distinct().toList()).collectAs(new BaseFieldSet().ensure(Dmp._id).ensure(Dmp._creator)).stream().collect(Collectors.toMap(DmpEntity::getId, DmpEntity::getCreatorId)); - Map descriptionTemplateDefinitionMap = new HashMap<>(); + Map descriptionTemplateDefinitionMap = new HashMap<>(); for (DescriptionTemplateEntity descriptionTemplateEntity : descriptionTemplates){ - descriptionTemplateDefinitionMap.put(descriptionTemplateEntity.getId(), this.xmlHandlingService.fromXml(eu.eudat.commons.types.descriptiontemplate.DefinitionEntity.class, descriptionTemplateEntity.getDefinition())); + descriptionTemplateDefinitionMap.put(descriptionTemplateEntity.getId(), this.xmlHandlingService.fromXml(org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity.class, descriptionTemplateEntity.getDefinition())); } for (Dataset item : items) { DefinitionEntity definition = dmpBlueprintsMap.getOrDefault(item.getDmp().getProfile().getId(), null); @@ -149,7 +149,7 @@ public class DatasetMigrationService { if (data.getCreatedById() == null){ throw new MyApplicationException("Migration skipped creator not found " + item.getId()); } - eu.eudat.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity = descriptionTemplateDefinitionMap.getOrDefault(item.getProfile().getId(), null); + org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity = descriptionTemplateDefinitionMap.getOrDefault(item.getProfile().getId(), null); this.entityManager.persist(data); this.entityManager.flush(); @@ -186,7 +186,7 @@ public class DatasetMigrationService { return itemDescriptionTemplates; } - private PropertyDefinitionEntity buildPropertyDefinitionEntity(Dataset item, eu.eudat.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity, Map referenceTypeDefinitionEntityMap, Map referenceMap) { + private PropertyDefinitionEntity buildPropertyDefinitionEntity(Dataset item, org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity, Map referenceTypeDefinitionEntityMap, Map referenceMap) { if (this.conventionService.isNullOrEmpty(item.getProperties())) return null; JSONObject jObject = new JSONObject(item.getProperties()); Map properties = jObject.toMap(); @@ -210,9 +210,9 @@ public class DatasetMigrationService { } else { if (!key.toLowerCase(Locale.ROOT).trim().startsWith("multiple_")) { FieldSetEntity currentFieldSet = null; - eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField = null; + org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField = null; for (FieldSetEntity fieldSetEntity : fieldSetEntities) { - List fieldEntities = fieldSetEntity.getFieldById(key.trim()); + List fieldEntities = fieldSetEntity.getFieldById(key.trim()); if (!fieldEntities.isEmpty()) { currentFieldSet = fieldSetEntity; currentField = fieldEntities.getFirst(); @@ -245,7 +245,7 @@ public class DatasetMigrationService { return propertyDefinitionEntity; } - private void addMultipleField(Dataset item, Map properties, eu.eudat.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity, PropertyDefinitionEntity propertyDefinitionEntity, Map referenceTypeDefinitionEntityMap, Map referenceMap){ + private void addMultipleField(Dataset item, Map properties, org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity descriptionTemplateDefinitionEntity, PropertyDefinitionEntity propertyDefinitionEntity, Map referenceTypeDefinitionEntityMap, Map referenceMap){ Map groupOrdinalMapping = new HashMap<>(); for (String key : properties.keySet()) { if (key.trim().toLowerCase(Locale.ROOT).startsWith("multiple_")) { @@ -280,7 +280,7 @@ public class DatasetMigrationService { throw new MyApplicationException("Migrate Dataset " + item.getId() + " " + item.getLabel() + " Field group key has invalid format " + key + " " + properties.get(key).toString()); } - eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField = descriptionTemplateDefinitionEntity.getFieldById(fieldId).stream().findFirst().orElse(null); + org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField = descriptionTemplateDefinitionEntity.getFieldById(fieldId).stream().findFirst().orElse(null); if (currentField == null) { logger.warn("Migrate Dataset " + item.getId() + " " + item.getLabel() + " Field set not found for field " + key + " " + properties.get(key).toString()); continue; @@ -313,7 +313,7 @@ public class DatasetMigrationService { } } - private void addMultipleField(Dataset item, PropertyDefinitionFieldSetEntity propertyDefinitionFieldSetEntity, int ordinal, eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ + private void addMultipleField(Dataset item, PropertyDefinitionFieldSetEntity propertyDefinitionFieldSetEntity, int ordinal, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ PropertyDefinitionFieldSetItemEntity propertyDefinitionFieldSetItemEntity = propertyDefinitionFieldSetEntity.getItems().stream().filter(x-> x.getOrdinal() == ordinal).findFirst().orElse(null); if (propertyDefinitionFieldSetItemEntity == null){ @@ -326,7 +326,7 @@ public class DatasetMigrationService { propertyDefinitionFieldSetItemEntity.getFields().put(currentField.getId(), this.buildField(item, currentField, properties, referenceTypeDefinitionEntityMap, referenceMap)); } - private void addSimpleField(Dataset item, PropertyDefinitionEntity propertyDefinitionEntity, FieldSetEntity currentFieldSet, eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ + private void addSimpleField(Dataset item, PropertyDefinitionEntity propertyDefinitionEntity, FieldSetEntity currentFieldSet, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ PropertyDefinitionFieldSetEntity propertyDefinitionFieldSetEntity = propertyDefinitionEntity.getFieldSets().getOrDefault(currentFieldSet.getId(), null); if (propertyDefinitionFieldSetEntity == null) { propertyDefinitionFieldSetEntity = new PropertyDefinitionFieldSetEntity(); @@ -369,7 +369,7 @@ public class DatasetMigrationService { propertyDefinitionFieldSetItemEntity.setComment(comment); } - private FieldEntity buildField(Dataset item, eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ + private FieldEntity buildField(Dataset item, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField, Map properties, Map referenceTypeDefinitionEntityMap, Map referenceMap){ FieldEntity fieldEntity = new FieldEntity(); String textValue = properties.get(currentField.getId()) != null ? properties.get(currentField.getId()).toString() : null; if (textValue == null || textValue.isEmpty()) return fieldEntity; @@ -723,12 +723,12 @@ public class DatasetMigrationService { data.setSourceType(ReferenceSourceType.External); data.setTypeId(referenceTypeDataEntity.getReferenceTypeId()); data.setIsActive(IsActive.Active); - eu.eudat.commons.types.reference.DefinitionEntity definitionEntity = new eu.eudat.commons.types.reference.DefinitionEntity(); + org.opencdmp.commons.types.reference.DefinitionEntity definitionEntity = new org.opencdmp.commons.types.reference.DefinitionEntity(); definitionEntity.setFields(new ArrayList<>()); for (Map.Entry entries : item.entrySet()){ if (entries.getValue() != null && !entries.getKey().equals("name") && !entries.getKey().equals("label")&& !entries.getKey().equals("abbreviation") && !entries.getKey().equals("id") && !entries.getKey().equals("key") && !entries.getKey().equals("pid")&& !entries.getKey().equals("source")) { - eu.eudat.commons.types.reference.FieldEntity field = new eu.eudat.commons.types.reference.FieldEntity(); + org.opencdmp.commons.types.reference.FieldEntity field = new org.opencdmp.commons.types.reference.FieldEntity(); field.setCode(entries.getKey()); field.setDataType(ReferenceFieldDataType.Text); field.setValue(entries.getValue().toString()); @@ -1003,7 +1003,7 @@ public class DatasetMigrationService { } - private void createDescriptionReferenceEntity(UUID referenceId, UUID descriptionId, eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField ){ + private void createDescriptionReferenceEntity(UUID referenceId, UUID descriptionId, org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField ){ DescriptionReferenceEntity data = new DescriptionReferenceEntity(); data.setId(UUID.randomUUID()); data.setReferenceId(referenceId); @@ -1015,7 +1015,7 @@ public class DatasetMigrationService { this.entityManager.persist(data); } - private @NotNull DescriptionReferenceDataEntity buildDescriptionReferenceDataEntity(eu.eudat.commons.types.descriptiontemplate.FieldEntity currentField){ + private @NotNull DescriptionReferenceDataEntity buildDescriptionReferenceDataEntity(org.opencdmp.commons.types.descriptiontemplate.FieldEntity currentField){ DescriptionReferenceDataEntity data = new DescriptionReferenceDataEntity(); data.setFieldId(currentField.getId()); return data; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetReferenceMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetReferenceMigrationService.java index 292109958..a79208988 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetReferenceMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DatasetReferenceMigrationService.java @@ -1,7 +1,7 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.DescriptionReferenceEntity; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.data.DescriptionReferenceEntity; import eu.old.eudat.data.dao.entities.*; import eu.old.eudat.data.entities.*; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlCleanInvalidReferenceTypesService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlCleanInvalidReferenceTypesService.java index 34c6fe174..b8a9a80a0 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlCleanInvalidReferenceTypesService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlCleanInvalidReferenceTypesService.java @@ -1,18 +1,18 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.FieldType; -import eu.eudat.commons.types.descriptiontemplate.*; -import eu.eudat.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.LabelDataEntity; -import eu.eudat.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.DescriptionTemplateEntity; -import eu.eudat.data.ReferenceTypeEntity; -import eu.eudat.model.DescriptionTemplate; -import eu.eudat.model.ReferenceType; -import eu.eudat.query.DescriptionTemplateQuery; -import eu.eudat.query.ReferenceTypeQuery; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.FieldType; +import org.opencdmp.commons.types.descriptiontemplate.*; +import org.opencdmp.commons.types.descriptiontemplate.fielddata.BaseFieldDataEntity; +import org.opencdmp.commons.types.descriptiontemplate.fielddata.LabelDataEntity; +import org.opencdmp.commons.types.descriptiontemplate.fielddata.ReferenceTypeDataEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.DescriptionTemplateEntity; +import org.opencdmp.data.ReferenceTypeEntity; +import org.opencdmp.model.DescriptionTemplate; +import org.opencdmp.model.ReferenceType; +import org.opencdmp.query.DescriptionTemplateQuery; +import org.opencdmp.query.ReferenceTypeQuery; import gr.cite.tools.data.query.Ordering; import gr.cite.tools.data.query.Paging; import gr.cite.tools.data.query.QueryFactory; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java index 34798f34d..3e9965b5a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DescriptionTemplateXmlMigrationService.java @@ -1,20 +1,20 @@ package eu.old.eudat.migration; import com.fasterxml.jackson.annotation.JsonValue; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.*; -import eu.eudat.commons.types.descriptiontemplate.*; -import eu.eudat.commons.types.descriptiontemplate.fielddata.*; -import eu.eudat.commons.types.externalfetcher.*; -import eu.eudat.commons.types.referencetype.*; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.DescriptionTemplateEntity; -import eu.eudat.data.ReferenceEntity; -import eu.eudat.data.ReferenceTypeEntity; -import eu.eudat.data.converters.enums.DatabaseEnum; -import eu.eudat.model.DescriptionTemplate; -import eu.eudat.query.DescriptionTemplateQuery; -import eu.eudat.query.ReferenceTypeQuery; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.*; +import org.opencdmp.commons.types.descriptiontemplate.*; +import org.opencdmp.commons.types.descriptiontemplate.fielddata.*; +import org.opencdmp.commons.types.externalfetcher.*; +import org.opencdmp.commons.types.referencetype.*; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.DescriptionTemplateEntity; +import org.opencdmp.data.ReferenceEntity; +import org.opencdmp.data.ReferenceTypeEntity; +import org.opencdmp.data.converters.enums.DatabaseEnum; +import org.opencdmp.model.DescriptionTemplate; +import org.opencdmp.query.DescriptionTemplateQuery; +import org.opencdmp.query.ReferenceTypeQuery; import eu.old.eudat.logic.services.helpers.HelpersService; import eu.old.eudat.logic.utilities.builders.XmlBuilder; import eu.old.eudat.models.data.components.commons.Multiplicity; @@ -436,7 +436,7 @@ public class DescriptionTemplateXmlMigrationService { } case DATASET_IDENTIFIER, VALIDATION -> { if(!this.conventionService.isNullOrEmpty(textValue)) { - eu.eudat.commons.types.descriptiontemplate.ExternalIdentifierEntity externalIdentifierEntity = migrationTools.tryParseJsonAsObjectString(eu.eudat.commons.types.descriptiontemplate.ExternalIdentifierEntity.class, textValue); + org.opencdmp.commons.types.descriptiontemplate.ExternalIdentifierEntity externalIdentifierEntity = migrationTools.tryParseJsonAsObjectString(org.opencdmp.commons.types.descriptiontemplate.ExternalIdentifierEntity.class, textValue); if (externalIdentifierEntity == null) throw new MyApplicationException("Could not parse dataset External Identifier : " + textValue); data.setExternalIdentifier(externalIdentifierEntity); } diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpBlueprintXmlMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpBlueprintXmlMigrationService.java index f08394f3e..f26a6738d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpBlueprintXmlMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpBlueprintXmlMigrationService.java @@ -1,16 +1,16 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.DmpBlueprintExtraFieldDataType; -import eu.eudat.commons.enums.DmpBlueprintFieldCategory; -import eu.eudat.commons.enums.DmpBlueprintSystemFieldType; -import eu.eudat.commons.types.dmpblueprint.*; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.DescriptionTemplateEntity; -import eu.eudat.data.DmpBlueprintEntity; -import eu.eudat.model.DmpBlueprint; -import eu.eudat.query.DescriptionTemplateQuery; -import eu.eudat.query.DmpBlueprintQuery; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.DmpBlueprintExtraFieldDataType; +import org.opencdmp.commons.enums.DmpBlueprintFieldCategory; +import org.opencdmp.commons.enums.DmpBlueprintSystemFieldType; +import org.opencdmp.commons.types.dmpblueprint.*; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.DescriptionTemplateEntity; +import org.opencdmp.data.DmpBlueprintEntity; +import org.opencdmp.model.DmpBlueprint; +import org.opencdmp.query.DescriptionTemplateQuery; +import org.opencdmp.query.DmpBlueprintQuery; import eu.old.eudat.logic.utilities.builders.XmlBuilder; import eu.old.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.*; import eu.old.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.types.FieldCategory; @@ -60,7 +60,7 @@ public class DmpBlueprintXmlMigrationService { int page = 0; List items; - List descriptionTemplateEntities = this.queryFactory.query(DescriptionTemplateQuery.class).collectAs(new BaseFieldSet().ensure(eu.eudat.model.DescriptionTemplate._id).ensure(eu.eudat.model.DescriptionTemplate._groupId)); + List descriptionTemplateEntities = this.queryFactory.query(DescriptionTemplateQuery.class).collectAs(new BaseFieldSet().ensure(org.opencdmp.model.DescriptionTemplate._id).ensure(org.opencdmp.model.DescriptionTemplate._groupId)); Map descriptionTemplateGroupMap = new HashMap<>(); for (DescriptionTemplateEntity descriptionTemplateEntity: descriptionTemplateEntities) { descriptionTemplateGroupMap.put(descriptionTemplateEntity.getId(), descriptionTemplateEntity.getGroupId()); @@ -94,8 +94,8 @@ public class DmpBlueprintXmlMigrationService { } while (items != null && !items.isEmpty() && !TestMode); } - private @NotNull eu.eudat.commons.types.dmpblueprint.DefinitionEntity buildDefinitionEntity(DataManagementPlanBlueprint dataManagementPlanBlueprint, Map descriptionTemplateGroupMap ) { - eu.eudat.commons.types.dmpblueprint.DefinitionEntity data = new DefinitionEntity(); + private @NotNull org.opencdmp.commons.types.dmpblueprint.DefinitionEntity buildDefinitionEntity(DataManagementPlanBlueprint dataManagementPlanBlueprint, Map descriptionTemplateGroupMap ) { + org.opencdmp.commons.types.dmpblueprint.DefinitionEntity data = new DefinitionEntity(); if (dataManagementPlanBlueprint == null) return data; if (!this.conventionService.isListNullOrEmpty(dataManagementPlanBlueprint.getSections())) { @@ -135,8 +135,8 @@ public class DmpBlueprintXmlMigrationService { return data; } - private @NotNull eu.eudat.commons.types.dmpblueprint.DescriptionTemplateEntity buildDescriptionTemplateEntity(DescriptionTemplate itm, Map descriptionTemplateGroupMap ) { - eu.eudat.commons.types.dmpblueprint.DescriptionTemplateEntity data = new eu.eudat.commons.types.dmpblueprint.DescriptionTemplateEntity(); + private @NotNull org.opencdmp.commons.types.dmpblueprint.DescriptionTemplateEntity buildDescriptionTemplateEntity(DescriptionTemplate itm, Map descriptionTemplateGroupMap ) { + org.opencdmp.commons.types.dmpblueprint.DescriptionTemplateEntity data = new org.opencdmp.commons.types.dmpblueprint.DescriptionTemplateEntity(); if (itm == null) return data; UUID groupId = descriptionTemplateGroupMap.getOrDefault(itm.getDescriptionTemplateId(), null); @@ -154,7 +154,7 @@ public class DmpBlueprintXmlMigrationService { } - private @NotNull eu.eudat.commons.types.dmpblueprint.FieldEntity buildFieldEntity(FieldModel itm) { + private @NotNull org.opencdmp.commons.types.dmpblueprint.FieldEntity buildFieldEntity(FieldModel itm) { if (itm == null) return new ExtraFieldEntity(); FieldEntity data; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java index 2b07fa7a0..4e0d144c3 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpDatasetProfileMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.commons.JsonHandlingService; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.DmpBlueprintEntity; -import eu.eudat.data.DmpDescriptionTemplateEntity; -import eu.eudat.query.DmpBlueprintQuery; -import eu.eudat.query.DmpDescriptionTemplateQuery; +import org.opencdmp.commons.JsonHandlingService; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.data.DmpBlueprintEntity; +import org.opencdmp.data.DmpDescriptionTemplateEntity; +import org.opencdmp.query.DmpBlueprintQuery; +import org.opencdmp.query.DmpDescriptionTemplateQuery; import eu.old.eudat.data.dao.entities.DmpDatasetProfileDao; import eu.old.eudat.data.entities.DMPDatasetProfile; import eu.old.eudat.logic.services.operations.DatabaseRepository; @@ -24,7 +24,7 @@ import jakarta.xml.bind.JAXBException; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.xml.sax.SAXException; -import eu.eudat.commons.types.dmpblueprint.DefinitionEntity; +import org.opencdmp.commons.types.dmpblueprint.DefinitionEntity; import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java index 0ea6c1b24..2e3f798dd 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java @@ -1,21 +1,21 @@ package eu.old.eudat.migration; import com.fasterxml.jackson.core.JsonProcessingException; -import eu.eudat.commons.JsonHandlingService; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.*; -import eu.eudat.commons.types.dmp.DmpBlueprintValueEntity; -import eu.eudat.commons.types.dmp.DmpContactEntity; -import eu.eudat.commons.types.dmp.DmpPropertiesEntity; -import eu.eudat.commons.types.dmpblueprint.ReferenceTypeFieldEntity; -import eu.eudat.commons.types.dmpblueprint.SectionEntity; -import eu.eudat.commons.types.dmpreference.DmpReferenceDataEntity; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.*; -import eu.eudat.model.DmpBlueprint; -import eu.eudat.query.DmpBlueprintQuery; +import org.opencdmp.commons.JsonHandlingService; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.*; +import org.opencdmp.commons.types.dmp.DmpBlueprintValueEntity; +import org.opencdmp.commons.types.dmp.DmpContactEntity; +import org.opencdmp.commons.types.dmp.DmpPropertiesEntity; +import org.opencdmp.commons.types.dmpblueprint.ReferenceTypeFieldEntity; +import org.opencdmp.commons.types.dmpblueprint.SectionEntity; +import org.opencdmp.commons.types.dmpreference.DmpReferenceDataEntity; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.*; +import org.opencdmp.model.DmpBlueprint; +import org.opencdmp.query.DmpBlueprintQuery; import eu.old.eudat.data.dao.entities.DMPDao; import eu.old.eudat.data.entities.*; import eu.old.eudat.logic.services.operations.DatabaseRepository; @@ -86,7 +86,7 @@ public class DmpMigrationService { List dmpBlueprintEntities = this.queryFactory.query(DmpBlueprintQuery.class).ids(items.stream().filter(x-> x.getProfile() != null).map(x-> x.getProfile().getId()).distinct().collect(Collectors.toList())).collectAs(new BaseFieldSet().ensure(DmpBlueprint._definition).ensure(DmpBlueprint._id)); Map> referenceTypeFieldsByDmpBlueprintId = new HashMap<>(); for (DmpBlueprintEntity dmpBlueprintEntity : dmpBlueprintEntities) { - eu.eudat.commons.types.dmpblueprint.DefinitionEntity definition = this.xmlHandlingService.fromXml(eu.eudat.commons.types.dmpblueprint.DefinitionEntity.class, dmpBlueprintEntity.getDefinition()); + org.opencdmp.commons.types.dmpblueprint.DefinitionEntity definition = this.xmlHandlingService.fromXml(org.opencdmp.commons.types.dmpblueprint.DefinitionEntity.class, dmpBlueprintEntity.getDefinition()); List referenceTypeFieldEntities = definition.getSections().stream().filter(x-> x.getFields() != null).map(SectionEntity::getFields).flatMap(List::stream).filter(x-> x.getCategory().equals(DmpBlueprintFieldCategory.ReferenceType)).map(x-> (ReferenceTypeFieldEntity)x) .filter(x-> x.getReferenceTypeId().equals(ReferenceTypeIds.License) || x.getReferenceTypeId().equals(ReferenceTypeIds.Project) || x.getReferenceTypeId().equals(ReferenceTypeIds.Researcher) || x.getReferenceTypeId().equals(ReferenceTypeIds.Grants) || x.getReferenceTypeId().equals(ReferenceTypeIds.Organizations) || x.getReferenceTypeId().equals(ReferenceTypeIds.Funder)) diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpUserMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpUserMigrationService.java index bd64d37a5..bdd808786 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpUserMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpUserMigrationService.java @@ -1,8 +1,8 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.DmpUserRole; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.DmpUserEntity; +import org.opencdmp.commons.enums.DmpUserRole; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.data.DmpUserEntity; import eu.old.eudat.data.dao.entities.UserDmpDao; import eu.old.eudat.data.entities.UserDMP; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ExternalDatasetMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ExternalDatasetMigrationService.java index c2ee98c9f..82f496e36 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ExternalDatasetMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ExternalDatasetMigrationService.java @@ -1,8 +1,8 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.ExternalDatasetDao; import eu.old.eudat.data.entities.ExternalDataset; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/FunderMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/FunderMigrationService.java index be7373323..cace49916 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/FunderMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/FunderMigrationService.java @@ -1,11 +1,11 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.FunderDao; import eu.old.eudat.data.entities.Funder; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java index 5025b6667..4bbbafa00 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.GrantDao; import eu.old.eudat.data.entities.Grant; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/MigrationTools.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/MigrationTools.java index 0aaa78428..ca2dd55ec 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/MigrationTools.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/MigrationTools.java @@ -1,7 +1,7 @@ package eu.old.eudat.migration; -import eu.eudat.commons.JsonHandlingService; -import eu.eudat.convention.ConventionService; +import org.opencdmp.commons.JsonHandlingService; +import org.opencdmp.convention.ConventionService; import org.apache.commons.lang3.StringEscapeUtils; import org.springframework.stereotype.Service; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/OrganizationMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/OrganizationMigrationService.java index f7da6ad71..ecbf2aad2 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/OrganizationMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/OrganizationMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.OrganisationDao; import eu.old.eudat.data.entities.Organisation; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ProjectMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ProjectMigrationService.java index 0ac989cf9..50eeabb4d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ProjectMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ProjectMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.ProjectDao; import eu.old.eudat.data.entities.Project; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/RegistryMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/RegistryMigrationService.java index 90367c08e..a45935d0d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/RegistryMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/RegistryMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.RegistryDao; import eu.old.eudat.data.entities.Registry; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ResearcherMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ResearcherMigrationService.java index 497aef351..9cc6e77c8 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ResearcherMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ResearcherMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.ResearcherDao; import eu.old.eudat.data.entities.Researcher; import eu.old.eudat.logic.services.operations.DatabaseRepository; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ServiceMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ServiceMigrationService.java index 28e686ecd..f61cf1f7a 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ServiceMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/ServiceMigrationService.java @@ -1,13 +1,13 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; import eu.old.eudat.data.dao.entities.ServiceDao; import eu.old.eudat.logic.services.operations.DatabaseRepository; import gr.cite.tools.logging.LoggerService; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/StorageFileMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/StorageFileMigrationService.java index e1aa920f1..c301362ce 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/StorageFileMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/StorageFileMigrationService.java @@ -1,15 +1,15 @@ package eu.old.eudat.migration; -import eu.eudat.commons.XmlHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceFieldDataType; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.enums.StorageType; -import eu.eudat.commons.types.reference.DefinitionEntity; -import eu.eudat.commons.types.reference.FieldEntity; -import eu.eudat.convention.ConventionService; -import eu.eudat.data.ReferenceEntity; -import eu.eudat.data.StorageFileEntity; +import org.opencdmp.commons.XmlHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceFieldDataType; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.enums.StorageType; +import org.opencdmp.commons.types.reference.DefinitionEntity; +import org.opencdmp.commons.types.reference.FieldEntity; +import org.opencdmp.convention.ConventionService; +import org.opencdmp.data.ReferenceEntity; +import org.opencdmp.data.StorageFileEntity; import eu.old.eudat.data.dao.entities.FileUploadDao; import eu.old.eudat.data.dao.entities.ProjectDao; import eu.old.eudat.data.entities.FileUpload; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/TagMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/TagMigrationService.java index a94cef23c..3005c4290 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/TagMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/TagMigrationService.java @@ -1,9 +1,9 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.data.DescriptionTagEntity; -import eu.eudat.data.ReferenceEntity; -import eu.eudat.data.TagEntity; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.data.DescriptionTagEntity; +import org.opencdmp.data.ReferenceEntity; +import org.opencdmp.data.TagEntity; import eu.old.eudat.data.dao.entities.DatasetDao; import eu.old.eudat.data.entities.Dataset; import eu.old.eudat.elastic.entities.Tag; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserContactInfoMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserContactInfoMigrationService.java index fb0d3c431..717ba8687 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserContactInfoMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserContactInfoMigrationService.java @@ -1,7 +1,7 @@ package eu.old.eudat.migration; -import eu.eudat.commons.enums.ContactInfoType; -import eu.eudat.data.UserContactInfoEntity; +import org.opencdmp.commons.enums.ContactInfoType; +import org.opencdmp.data.UserContactInfoEntity; import eu.old.eudat.data.dao.entities.UserInfoDao; import eu.old.eudat.data.entities.Credential; import eu.old.eudat.data.entities.UserInfo; diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserMigrationService.java index f5b1cace6..aa7aca09b 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/UserMigrationService.java @@ -2,15 +2,15 @@ package eu.old.eudat.migration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.commons.JsonHandlingService; -import eu.eudat.commons.enums.IsActive; -import eu.eudat.commons.enums.ReferenceSourceType; -import eu.eudat.commons.types.user.AdditionalInfoEntity; -import eu.eudat.data.ReferenceEntity; -import eu.eudat.data.UserEntity; -import eu.eudat.model.User; -import eu.eudat.query.ReferenceQuery; -import eu.eudat.query.UserQuery; +import org.opencdmp.commons.JsonHandlingService; +import org.opencdmp.commons.enums.IsActive; +import org.opencdmp.commons.enums.ReferenceSourceType; +import org.opencdmp.commons.types.user.AdditionalInfoEntity; +import org.opencdmp.data.ReferenceEntity; +import org.opencdmp.data.UserEntity; +import org.opencdmp.model.User; +import org.opencdmp.query.ReferenceQuery; +import org.opencdmp.query.UserQuery; import eu.old.eudat.data.dao.entities.UserInfoDao; import eu.old.eudat.data.entities.UserInfo; import eu.old.eudat.logic.services.operations.DatabaseRepository;