From b8affa3033447ac7053eb6e79767fa8f6312327d Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 09:58:05 +0300 Subject: [PATCH 1/8] change pom --- dmp-backend/core/pom.xml | 13 +++++++++++++ dmp-backend/pom.xml | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index 6b4369902..45553cd7c 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -9,6 +9,19 @@ 1.0.0-SNAPSHOT + + + eu.eudat + data + 1.0-SNAPSHOT + + + dmp-backend + web + 1.0-SNAPSHOT + + + core diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index 719322697..da398da62 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -328,6 +328,11 @@ validation 2.1.0 + + gr.cite + cache + 2.1.0 + From f67ada842ec88698899c3355bd366f734de50620 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 10:31:57 +0300 Subject: [PATCH 2/8] commit --- .../commons/enums/ExternalReferencesType.java | 11 + .../enums/SupportiveMaterialFieldType.java | 10 + .../eu/eudat/model/ExternalReference.java | 124 ++++++++++ .../eu/eudat/model/ExternalReference2.java | 178 +++++++++++++++ .../eudat/model/persist/UserGuidePersist.java | 30 +++ .../eu/eudat/service/ValidationService.java | 30 +++ .../ExternalReferencesCacheOptions.java | 10 + .../ExternalReferencesCacheService.java | 67 ++++++ .../ExternalReferencesService.java | 22 ++ .../ExternalReferencesServiceImpl.java | 97 ++++++++ .../externalreferences/FunderService.java | 64 ++++++ .../externalreferences/ProjectService.java | 60 +++++ .../SupportiveMaterialCacheOptions.java | 11 + .../SupportiveMaterialCacheService.java | 67 ++++++ .../SupportiveMaterialService.java | 71 ++++++ .../eu/eudat/controllers/AboutController.java | 39 ---- .../eu/eudat/controllers/FaqController.java | 38 ---- .../eudat/controllers/GlossaryController.java | 38 ---- .../controllers/TermsOfServiceController.java | 38 ---- .../controllers/UserGuideController.java | 60 ----- .../v2/ExternalReferencesController.java | 66 ++++++ .../v2/ExternalValidationController.java | 37 +++ .../v2/SupportiveMaterialController.java | 71 ++++++ .../config/entitiesV2/DataRepositoryUrls.java | 41 ++++ .../config/entitiesV2/ExternalUrlsBase.java | 67 ++++++ .../proxy/config/entitiesV2/JournalUrls.java | 41 ++++ .../proxy/config/entitiesV2/LicenseUrls.java | 41 ++++ .../config/entitiesV2/PubRepositoryUrls.java | 41 ++++ .../config/entitiesV2/PublicationUrls.java | 41 ++++ .../proxy/config/entitiesV2/TaxonomyUrls.java | 41 ++++ .../logic/proxy/fetching/RemoteFetcher.java | 50 ++++ .../configurations/SwaggerConfiguration.java | 60 ++--- .../web/src/main/resources/config/cache.yml | 13 +- .../main/resources/externalUrls/funders.xml | 215 ++++++++++++++++++ .../main/resources/externalUrls/journals.xml | 27 +++ .../main/resources/externalUrls/licenses.xml | 25 ++ .../main/resources/externalUrls/projects.xml | 80 +++++++ .../externalUrls/pub-repositories.xml | 67 ++++++ .../resources/externalUrls/publications.xml | 44 ++++ .../resources/externalUrls/repositories.xml | 124 ++++++++++ .../resources/externalUrls/taxonomies.xml | 25 ++ .../resources/externalUrls/validators.xml | 26 +++ .../enum/supportive-material-field-type.ts | 7 + .../src/app/core/core-service.module.ts | 4 +- .../src/app/core/services/faq/faq.service.ts | 6 +- .../supportive-material.service.ts | 27 +++ .../services/user-guide/user-guide.service.ts | 2 +- .../src/app/ui/about/about.component.ts | 7 +- .../field-data/auto-complete-single-data.ts | 8 +- ...le-editor-auto-complete-field.component.ts | 8 +- .../faq/faq-content/faq-content.component.ts | 7 +- .../glossary-content.component.ts | 7 +- .../sidebar-footer/terms/terms.component.ts | 7 +- .../user-guide-editor.component.ts | 9 +- .../user-guide-content.component.ts | 7 +- dmp-frontend/src/assets/config/config.json | 48 +++- 56 files changed, 2178 insertions(+), 284 deletions(-) create mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/persist/UserGuidePersist.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheOptions.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheService.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialService.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/AboutController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/FaqController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/GlossaryController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/TermsOfServiceController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java create mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java create mode 100644 dmp-backend/web/src/main/resources/externalUrls/funders.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/journals.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/licenses.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/projects.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/pub-repositories.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/publications.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/repositories.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/taxonomies.xml create mode 100644 dmp-backend/web/src/main/resources/externalUrls/validators.xml create mode 100644 dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts create mode 100644 dmp-frontend/src/app/core/services/supportive-material/supportive-material.service.ts diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java new file mode 100644 index 000000000..c3dccae5d --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java @@ -0,0 +1,11 @@ +package eu.eudat.commons.enums; + +public enum ExternalReferencesType { + + taxonomies, + licenses, + publications, + journals, + pubRepositories, + dataRepositories +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java new file mode 100644 index 000000000..ce3854316 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java @@ -0,0 +1,10 @@ +package eu.eudat.commons.enums; + +public enum SupportiveMaterialFieldType { + + faq, + about, + glossary, + termsofservice, + userguide +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java new file mode 100644 index 000000000..3361db6a5 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java @@ -0,0 +1,124 @@ +package eu.eudat.model; + +import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.entities.UserInfo; + +import java.util.Date; +import java.util.UUID; + +public class ExternalReference { + private UUID id; + private String name; + private String pid; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String tag; // Api fetching the data + private String source; // Actual harvested source + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + + public String getAbbreviation() { + return abbreviation; + } + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getUri() { + return uri; + } + public void setUri(String uri) { + this.uri = uri; + } + + public Date getCreated() { + return created; + } + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + public void setModified(Date modified) { + this.modified = modified; + } + + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + + + public ExternalReference fromDataModel(DataRepository entity) { + this.setAbbreviation(entity.getAbbreviation()); + this.setName(entity.getLabel()); + this.setUri(entity.getUri()); + this.setId(entity.getId()); + this.setPid(entity.getReference()); + String source1 = entity.getReference().substring(0, entity.getReference().indexOf(":")); + if (source1.equals("dmp")) { + this.source = "Internal"; + } else { + this.source = source1; + } + return this; + } + + public DataRepository toDataModel() throws Exception { + DataRepository dataRepository = new DataRepository(); + dataRepository.setId(this.id != null ? this.id : UUID.randomUUID()); + dataRepository.setAbbreviation(this.abbreviation); + dataRepository.setCreated(this.created != null ? this.created : new Date()); + dataRepository.setModified(new Date()); + dataRepository.setLabel(this.name); + if (this.source != null) { + if (this.source.equals("Internal") || this.source.equals(this.id.toString().substring(0, this.source.length()))) { + dataRepository.setReference(this.id.toString()); + } else { + dataRepository.setReference(this.source + ":" + dataRepository.getId()); + } + } else { + dataRepository.setReference("dmp:" + dataRepository.getId()); + } + dataRepository.setUri(this.uri); + dataRepository.setStatus((short) 0); + dataRepository.setCreationUser(new UserInfo()); + return dataRepository; + } + + public String getHint() { + return null; + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java new file mode 100644 index 000000000..60b7a66f5 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java @@ -0,0 +1,178 @@ +package eu.eudat.model; + +import eu.eudat.data.entities.Registry; +import eu.eudat.data.entities.Service; +import eu.eudat.data.entities.UserInfo; + +import java.util.Date; +import java.util.UUID; + +public class ExternalReference2 { + private UUID id; + private String label; + private String name; + private String pid; + private String abbreviation; + private String uri; + private Date created; + private Date modified; + private String reference; + private String tag; + private String source; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + + public String getAbbreviation() { + return abbreviation; + } + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getUri() { + return uri; + } + public void setUri(String uri) { + this.uri = uri; + } + + public Date getCreated() { + return created; + } + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + public void setModified(Date modified) { + this.modified = modified; + } + + public String getReference() { + return reference; + } + public void setReference(String reference) { + this.reference = reference; + } + + public String getTag() { + return tag; + } + public void setTag(String tag) { + this.tag = tag; + } + + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + + public ExternalReference2 fromDataModel(Service entity) { + this.abbreviation = entity.getAbbreviation(); + this.created = entity.getCreated(); + this.id = entity.getId(); + this.label = entity.getLabel(); + this.name = entity.getLabel(); + this.modified = entity.getModified(); + this.uri = entity.getUri(); + String source = entity.getReference().substring(0, entity.getReference().indexOf(":")); + if (source.equals("dmp")) { + this.source = "Internal"; + } else { + this.source = source; + } + return this; + } + + public ExternalReference2 fromDataModel(Registry entity) { + this.id = entity.getId(); + this.abbreviation = entity.getAbbreviation(); + this.created = entity.getCreated(); + this.label = entity.getLabel(); + this.name = entity.getLabel(); + this.modified = entity.getModified(); + this.uri = entity.getUri(); + String source1 = entity.getReference().substring(0, entity.getReference().indexOf(":")); + if (source1.equals("dmp")) { + this.source = "Internal"; + } else { + this.source = source1; + } + this.reference = entity.getReference(); + return this; + } + + public Service toDataModelService() throws Exception { + Service service = new Service(); + service.setId(this.id != null ? this.id : UUID.randomUUID()); + service.setAbbreviation(this.abbreviation); + service.setCreated(this.created != null ? this.created : new Date()); + service.setLabel(this.label != null ? this.label : this.name); + service.setModified(new Date()); + service.setUri(this.uri); + if (this.source == null) this.source = "dmp"; + if (this.reference == null) this.reference = service.getId().toString(); + if (this.source.equals(this.reference.substring(0, this.source.length()))) { + service.setReference(this.reference); + } else { + service.setReference(this.source + ":" + this.reference); + } + service.setModified(new Date()); + service.setStatus((short) 0); + service.setCreationUser(new UserInfo()); + return service; + } + + public Registry toDataModelRegistry() throws Exception { + Registry registry = new Registry(); + registry.setAbbreviation(this.abbreviation); + registry.setCreated(this.created != null ? this.created : new Date()); + registry.setId(this.id != null ? this.id : UUID.randomUUID()); + registry.setLabel(this.label != null ? this.label : this.name); + registry.setUri(this.uri); + registry.setModified(new Date()); + if (this.source == null) this.source = "dmp"; + if (this.source.equals(registry.getId().toString().substring(0, this.source.length()))) { + registry.setReference(registry.getId().toString()); + } else { + registry.setReference(this.source + ":" + registry.getId()); + } + registry.setStatus((short)0); + registry.setCreationUser(new UserInfo()); + return registry; + } + + public String getHint() { + return null; + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserGuidePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserGuidePersist.java new file mode 100644 index 000000000..6707ba919 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/UserGuidePersist.java @@ -0,0 +1,30 @@ +package eu.eudat.model.persist; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; + +public class UserGuidePersist { + + @NotNull(message = "{validation.empty}") + @NotEmpty(message = "{validation.empty}") + private String name; + @NotNull(message = "{validation.empty}") + @NotEmpty(message = "{validation.empty}") + private String html; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getHtml() { + return html; + } + + public void setHtml(String html) { + this.html = html; + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java b/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java new file mode 100644 index 000000000..b736a2018 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java @@ -0,0 +1,30 @@ +package eu.eudat.service; + +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; +import eu.eudat.logic.proxy.fetching.RemoteFetcher; +import eu.eudat.models.data.security.Principal; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class ValidationService { + + private RemoteFetcher remoteFetcher; + + @Autowired + public ValidationService(RemoteFetcher remoteFetcher) { + super(); + this.remoteFetcher = remoteFetcher; + } + + public Boolean validateIdentifier(String identifier, String type, Principal principal) throws NoURLFound, HugeResultSet { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(identifier); + Integer count = this.remoteFetcher.findEntries(externalUrlCriteria, type); + return principal != null && count > 0; + } + + + +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java new file mode 100644 index 000000000..d224ee815 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java @@ -0,0 +1,10 @@ +package eu.eudat.service.externalreferences; + +import gr.cite.tools.cache.CacheOptions; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConfigurationProperties(prefix = "cache.external-reference") +public class ExternalReferencesCacheOptions extends CacheOptions { +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java new file mode 100644 index 000000000..18d82d1b5 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java @@ -0,0 +1,67 @@ +package eu.eudat.service.externalreferences; + +import eu.eudat.proxy.config.ExternalUrlCriteria; +import gr.cite.tools.cache.CacheService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.Locale; + +@Service +public class ExternalReferencesCacheService extends CacheService { + + public static class ExternalReferencesCacheValue { + + public ExternalReferencesCacheValue() {} + + public ExternalReferencesCacheValue(String externalType, ExternalUrlCriteria externalUrlCriteria) { + this.externalType = externalType; + this.externalUrlCriteria = externalUrlCriteria; + } + + private String externalType; + + private ExternalUrlCriteria externalUrlCriteria; + + public String getExternalType() { + return externalType; + } + + public void setExternalType(String externalType) { + this.externalType = externalType; + } + + public ExternalUrlCriteria getExternalUrlCriteria() { + return externalUrlCriteria; + } + + public void setExternalUrlCriteria(ExternalUrlCriteria externalUrlCriteria) { + this.externalUrlCriteria = externalUrlCriteria; + } + } + + @Autowired + public ExternalReferencesCacheService(ExternalReferencesCacheOptions options) { + super(options); + } + + @Override + protected Class valueClass() {return ExternalReferencesCacheService.ExternalReferencesCacheValue.class;} + + public String keyOf(ExternalReferencesCacheService.ExternalReferencesCacheValue value) { + return this.buildKey(value.getExternalType(), value.getExternalUrlCriteria()); + } + + public String buildKey(String externalType, ExternalUrlCriteria externalUrlCriteria) { + HashMap keyParts = new HashMap<>(); + + keyParts.put("$type$", externalType.toLowerCase(Locale.ROOT)); + + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(externalUrlCriteria); + keyParts.put("$criteria$", stringBuffer.toString().toLowerCase(Locale.ROOT)); + + return this.generateKey(keyParts); + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java new file mode 100644 index 000000000..ff50260d1 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java @@ -0,0 +1,22 @@ +package eu.eudat.service.externalreferences; + +import eu.eudat.data.entities.DataRepository; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; +import eu.eudat.model.ExternalReference2; + +import eu.eudat.model.ExternalReference; +import eu.eudat.models.data.security.Principal; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface ExternalReferencesService { + + DataRepository create(ExternalReference externalReference, Principal principal) throws Exception; + + List getExternal(String externalType, String query, String type, Principal principal) throws HugeResultSet, NoURLFound; + + List getExternal2(String externalType, String query, String type, Principal principal) throws HugeResultSet,NoURLFound; +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java new file mode 100644 index 000000000..41f2c0331 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java @@ -0,0 +1,97 @@ +package eu.eudat.service.externalreferences; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.dao.criteria.DataRepositoryCriteria; +import eu.eudat.data.dao.criteria.RegistryCriteria; +import eu.eudat.data.dao.criteria.ServiceCriteria; +import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.entities.Registry; +import eu.eudat.data.entities.Service; +import eu.eudat.logic.proxy.config.ExternalUrlCriteria; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; +import eu.eudat.logic.services.ApiContext; +import eu.eudat.model.ExternalReference2; +import eu.eudat.model.ExternalReference; +import eu.eudat.models.data.security.Principal; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class ExternalReferencesServiceImpl implements ExternalReferencesService{ + + private final ApiContext apiContext; + + public ExternalReferencesServiceImpl(ApiContext apiContext) { + this.apiContext = apiContext; + } + + @Override + public DataRepository create(ExternalReference externalReference, Principal principal) throws Exception { + // only dataRepositories, pubRepositories, journals + DataRepository dataRepository = externalReference.toDataModel(); + dataRepository.getCreationUser().setId(principal.getId()); + return apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().createOrUpdate(dataRepository); + } + + @Override + public List getExternal(String externalType, String query, String type, Principal principal) throws HugeResultSet, NoURLFound { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().get(externalType, externalUrlCriteria, type); + + DataRepositoryCriteria criteria = new DataRepositoryCriteria(); + if (!query.isEmpty()) criteria.setLike(query); + + List list = new LinkedList<>(); + if((externalType.equals("dataRepositories") || externalType.equals("pubRepositories") || externalType.equals("journals"))){ + criteria.setCreationUserId(principal.getId()); + if (type.equals("")) { + List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); + list = dataRepositoryList.stream().map(item -> new ExternalReference().fromDataModel(item)).collect(Collectors.toList()); + } + } + + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + list.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ExternalReference.class)).collect(Collectors.toList())); + list = list.stream().filter(licenseModel -> licenseModel.getName().toLowerCase().contains(query.toLowerCase())).collect(Collectors.toList()); + return list; + } + + public List getExternal2(String externalType, String query, String type, Principal principal) throws HugeResultSet,NoURLFound { + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().get(externalType,externalUrlCriteria, type); + + List list = new LinkedList<>(); + + if (externalType.equals("registries")){ + RegistryCriteria criteria = new RegistryCriteria(); + + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + + if (type.equals("")) { + List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); + list = registryList.stream().map(item -> new ExternalReference2().fromDataModel(item)).collect(Collectors.toList()); + } + } else if (externalType.equals("services")) { + ServiceCriteria criteria = new ServiceCriteria(); + + if (!query.isEmpty()) criteria.setLike(query); + criteria.setCreationUserId(principal.getId()); + + if (type.equals("")) { + List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); + list = serviceList.stream().map(item -> new ExternalReference2().fromDataModel(item)).collect(Collectors.toList()); + } + } + + ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + list.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ExternalReference2.class)).collect(Collectors.toList())); + + return list; + } + +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java new file mode 100644 index 000000000..6596e0d53 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java @@ -0,0 +1,64 @@ +package eu.eudat.service.externalreferences; + +import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; +import eu.eudat.logic.builders.model.models.FunderBuilder; +import eu.eudat.proxy.config.ExternalUrlCriteria; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; +import eu.eudat.logic.utilities.helpers.ListHelper; +import eu.eudat.models.data.external.ExternalSourcesItemModel; +import eu.eudat.models.data.external.FundersExternalSourcesModel; +import eu.eudat.models.data.funder.Funder; +import eu.eudat.models.data.security.Principal; +import eu.eudat.queryable.QueryableList; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class FunderService { + + private ApiContext apiContext; + private RemoteFetcher remoteFetcher; + private ListHelper listHelper; + + public FunderService(ApiContext apiContext, RemoteFetcher remoteFetcher, ListHelper listHelper) { + this.apiContext = apiContext; + this.remoteFetcher = remoteFetcher; + this.listHelper = listHelper; + } + + public List getCriteriaWithExternal(FunderCriteriaRequest funderCriteria, Principal principal) throws HugeResultSet, NoURLFound { + eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + userInfo.setId(principal.getId()); + funderCriteria.getCriteria().setReference("dmp:"); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); + List funders = authItems.select(item -> new Funder().fromDataModel(item)); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(funderCriteria.getCriteria().getLike()); + List> remoteRepos = remoteFetcher.getFunders(externalUrlCriteria); + FundersExternalSourcesModel fundersExternalSourcesModel = new FundersExternalSourcesModel().fromExternalItem(remoteRepos); + for (ExternalSourcesItemModel externalListingItem : fundersExternalSourcesModel) { + Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) + .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) + .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) + .key(externalListingItem.getKey()) + .source(externalListingItem.getTag()) + .build(); + if (externalListingItem.getSource() != null) { + funder.setSource(externalListingItem.getSource()); + } else { + funder.setSource(externalListingItem.getTag()); + } + + funders.add(funder); + } + funders.sort(Comparator.comparing(Funder::getLabel)); + funders = funders.stream().filter(listHelper.distinctByKey(Funder::getLabel)).collect(Collectors.toList()); + return funders; + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java new file mode 100644 index 000000000..48f7bd910 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java @@ -0,0 +1,60 @@ +package eu.eudat.service.externalreferences; + +import eu.eudat.data.query.items.item.project.ProjectCriteriaRequest; +import eu.eudat.logic.builders.model.models.ProjectBuilder; +import eu.eudat.proxy.config.ExternalUrlCriteria; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; +import eu.eudat.logic.utilities.helpers.ListHelper; +import eu.eudat.models.data.external.ExternalSourcesItemModel; +import eu.eudat.models.data.external.ProjectsExternalSourcesModel; +import eu.eudat.models.data.project.Project; +import eu.eudat.models.data.security.Principal; +import eu.eudat.queryable.QueryableList; +import org.springframework.stereotype.Service; + +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class ProjectService { + + private ApiContext apiContext; + private RemoteFetcher remoteFetcher; + private ListHelper listHelper; + + public ProjectService(ApiContext apiContext, ListHelper listHelper) { + this.apiContext = apiContext; + this.remoteFetcher = apiContext.getOperationsContext().getRemoteFetcher(); + this.listHelper = listHelper; + } + + public List getCriteriaWithExternal(ProjectCriteriaRequest projectCriteria, Principal principal) throws HugeResultSet, NoURLFound { + eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + userInfo.setId(principal.getId()); + projectCriteria.getCriteria().setReference("dmp:"); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo); + List projects = authItems.select(item -> new Project().fromDataModel(item)); + ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(projectCriteria.getCriteria().getLike()); + List> remoteRepos = remoteFetcher.getProjects(externalUrlCriteria); + ProjectsExternalSourcesModel projectsExternalSourcesModel = new ProjectsExternalSourcesModel().fromExternalItem(remoteRepos); + for (ExternalSourcesItemModel externalListingItem : projectsExternalSourcesModel) { + Project project = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ProjectBuilder.class) + .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) + .description(externalListingItem.getDescription()).uri(externalListingItem.getUri()) + .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.entities.Project.Status.fromInteger(0)) + .key(externalListingItem.getKey()) + .source(externalListingItem.getTag()) + .build(); + + projects.add(project); + } + projects.sort(Comparator.comparing(Project::getLabel)); + projects = projects.stream().filter(listHelper.distinctByKey(Project::getLabel)).collect(Collectors.toList()); + return projects; + } +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheOptions.java b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheOptions.java new file mode 100644 index 000000000..f415c524b --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheOptions.java @@ -0,0 +1,11 @@ +package eu.eudat.service.supportivematerial; + + +import gr.cite.tools.cache.CacheOptions; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConfigurationProperties(prefix = "cache.supportive-material") +public class SupportiveMaterialCacheOptions extends CacheOptions { +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheService.java b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheService.java new file mode 100644 index 000000000..c12c5d99a --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheService.java @@ -0,0 +1,67 @@ +package eu.eudat.service.supportivematerial; + + +import gr.cite.tools.cache.CacheService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Locale; + +@Service +public class SupportiveMaterialCacheService extends CacheService { + + public static class SupportiveMaterialCacheValue { + + public SupportiveMaterialCacheValue() {} + + public SupportiveMaterialCacheValue(String name, byte[] content) { + this.name = name; + this.content = content; + } + + private String name; + + private byte[] content; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public byte[] getContent() { + return content; + } + + public void setContent(byte[] content) { + this.content = content; + } + } + + @Autowired + public SupportiveMaterialCacheService(SupportiveMaterialCacheOptions options) { + super(options); + } + + @Override + protected Class valueClass() {return SupportiveMaterialCacheValue.class;} + + + public String keyOf(SupportiveMaterialCacheValue value) { + return this.buildKey(value.getName()); + } + + public String buildKey(String name) { + HashMap keyParts = new HashMap<>(); + + keyParts.put("$material$", name.toLowerCase(Locale.ROOT)); + //keyParts.put("$material_content$", new String(content, StandardCharsets.UTF_8).toLowerCase(Locale.ROOT)); + + return this.generateKey(keyParts); + } + +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialService.java b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialService.java new file mode 100644 index 000000000..b5cf20223 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialService.java @@ -0,0 +1,71 @@ +package eu.eudat.service.supportivematerial; + +import eu.eudat.model.persist.UserGuidePersist; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +@Service +public class SupportiveMaterialService { + + private final SupportiveMaterialCacheService supportiveMaterialCacheService; + + public SupportiveMaterialService( + SupportiveMaterialCacheService supportiveMaterialCacheService + ) { + this.supportiveMaterialCacheService = supportiveMaterialCacheService; + } + + public ResponseEntity getResponseEntity(String lang, Stream paths) throws IOException { + List result = paths.filter(Files::isRegularFile) + .map(Path::toString).collect(Collectors.toList()); + + String fileName = result.stream().filter(about -> about.contains("_" + lang)).findFirst().orElse(null); + + if (fileName == null) { + fileName = result.stream().filter(about -> about.contains("_en")).findFirst().get(); + } + + SupportiveMaterialCacheService.SupportiveMaterialCacheValue supportiveMaterialCacheItem = this.supportiveMaterialCacheService.lookup(this.supportiveMaterialCacheService.buildKey(fileName)); + + if(supportiveMaterialCacheItem == null){ + InputStream is = new FileInputStream(fileName); + + // Path path = Paths.get(fileName); + + byte[] content = new byte[is.available()]; + is.read(content); + is.close(); + + supportiveMaterialCacheItem = new SupportiveMaterialCacheService.SupportiveMaterialCacheValue(fileName, content); + this.supportiveMaterialCacheService.put(supportiveMaterialCacheItem); + } + + HttpHeaders responseHeaders = new HttpHeaders(); + responseHeaders.setContentLength(supportiveMaterialCacheItem.getContent().length); + responseHeaders.setContentType(MediaType.TEXT_HTML); + responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName); + responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition"); + responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type"); + + return new ResponseEntity<>(supportiveMaterialCacheItem.getContent(), responseHeaders, HttpStatus.OK); + } + + public void persist(UserGuidePersist userGuidePersist, String fileName) throws IOException { + this.supportiveMaterialCacheService.evict(fileName); + OutputStream os = new FileOutputStream(fileName); + os.write(userGuidePersist.getHtml().getBytes()); + os.close(); + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/AboutController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/AboutController.java deleted file mode 100644 index 729c8cd05..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/AboutController.java +++ /dev/null @@ -1,39 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.logic.managers.MaterialManager; -import eu.eudat.logic.managers.MetricsManager; -import eu.eudat.types.MetricNames; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Objects; -import java.util.stream.Stream; - -@RestController -@CrossOrigin -@RequestMapping(value = {"/api/material/about/"}) -public class AboutController { - - private Environment environment; - private MaterialManager materialManager; - - @Autowired - public AboutController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) { - this.environment = environment; - this.materialManager = materialManager; - } - - @RequestMapping(path = "{lang}", method = RequestMethod.GET ) - public ResponseEntity getAbout(@PathVariable(name = "lang") String lang) throws IOException { - try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("about.path"))))) { - return this.materialManager.getResponseEntity(lang, paths); - } - } - -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/FaqController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/FaqController.java deleted file mode 100644 index 5badd7959..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/FaqController.java +++ /dev/null @@ -1,38 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.logic.managers.MaterialManager; -import eu.eudat.logic.managers.MetricsManager; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Objects; -import java.util.stream.Stream; - -@RestController -@CrossOrigin -@RequestMapping(value = {"/api/material/faq/"}) -public class FaqController { - - private Environment environment; - private MaterialManager materialManager; - - @Autowired - public FaqController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) { - this.environment = environment; - this.materialManager = materialManager; - } - - @RequestMapping(path = "{lang}", method = RequestMethod.GET ) - public ResponseEntity getFaq(@PathVariable(name = "lang") String lang) throws IOException { - try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("faq.path"))))) { - return this.materialManager.getResponseEntity(lang, paths); - } - } - -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/GlossaryController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/GlossaryController.java deleted file mode 100644 index 5e6a783bd..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/GlossaryController.java +++ /dev/null @@ -1,38 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.logic.managers.MaterialManager; -import eu.eudat.logic.managers.MetricsManager; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Objects; -import java.util.stream.Stream; - -@RestController -@CrossOrigin -@RequestMapping(value = {"/api/material/glossary/"}) -public class GlossaryController { - - private Environment environment; - private MaterialManager materialManager; - - @Autowired - public GlossaryController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) { - this.environment = environment; - this.materialManager = materialManager; - } - - @RequestMapping(path = "{lang}", method = RequestMethod.GET ) - public ResponseEntity getGlossary(@PathVariable(name = "lang") String lang) throws IOException { - try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("glossary.path"))))) { - return this.materialManager.getResponseEntity(lang, paths); - } - } - -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/TermsOfServiceController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/TermsOfServiceController.java deleted file mode 100644 index 2875f6c07..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/TermsOfServiceController.java +++ /dev/null @@ -1,38 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.logic.managers.MaterialManager; -import eu.eudat.logic.managers.MetricsManager; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Objects; -import java.util.stream.Stream; - -@RestController -@CrossOrigin -@RequestMapping(value = {"/api/material/termsofservice/"}) -public class TermsOfServiceController { - - private Environment environment; - private MaterialManager materialManager; - - @Autowired - public TermsOfServiceController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) { - this.environment = environment; - this.materialManager = materialManager; - } - - @RequestMapping(path = "{lang}", method = RequestMethod.GET ) - public ResponseEntity getTermsOfService(@PathVariable(name = "lang") String lang) throws IOException { - try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("termsofservice.path"))))) { - return this.materialManager.getResponseEntity(lang, paths); - } - } - -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java deleted file mode 100644 index cd7cb9dae..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java +++ /dev/null @@ -1,60 +0,0 @@ -package eu.eudat.controllers; - -import eu.eudat.logic.managers.MaterialManager; -import eu.eudat.logic.managers.MetricsManager; -import eu.eudat.logic.security.claims.ClaimedAuthorities; -import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.security.Principal; -import eu.eudat.models.data.userguide.UserGuide; -import eu.eudat.types.ApiMessageCode; -import eu.eudat.types.MetricNames; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static eu.eudat.types.Authorities.ADMIN; - -@RestController -@CrossOrigin -@RequestMapping(value = {"/api/userguide/"}) -public class UserGuideController { - - private Environment environment; - private MaterialManager materialManager; - - @Autowired - public UserGuideController(Environment environment, MaterialManager materialManager, MetricsManager metricsManager) { - this.environment = environment; - this.materialManager = materialManager; - } - - @RequestMapping(path = "{lang}", method = RequestMethod.GET ) - public ResponseEntity getUserGuide(@PathVariable(name = "lang") String lang) throws IOException { - try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty("userguide.path"))))) { - return this.materialManager.getResponseEntity(lang, paths); - } - } - - @RequestMapping(value = "current", method = RequestMethod.POST) - public @ResponseBody - ResponseEntity> updateGuide(@RequestBody UserGuide guide, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws Exception { - String fileName = this.environment.getProperty("userguide.path") + guide.getName(); - OutputStream os = new FileOutputStream(fileName); - os.write(guide.getHtml().getBytes()); - os.close(); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Updated").payload("Updated")); - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java new file mode 100644 index 000000000..4c3b6ae37 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java @@ -0,0 +1,66 @@ +package eu.eudat.controllers.v2; + +import eu.eudat.controllers.BaseController; +import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; +import eu.eudat.data.query.items.item.project.ProjectCriteriaRequest; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; +import eu.eudat.logic.services.ApiContext; +import eu.eudat.model.ExternalReference; +import eu.eudat.models.data.funder.Funder; +import eu.eudat.models.data.helpers.responses.ResponseItem; +import eu.eudat.models.data.project.Project; +import eu.eudat.models.data.security.Principal; +import eu.eudat.service.externalreferences.*; +import eu.eudat.types.ApiMessageCode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@CrossOrigin +@RequestMapping(path = {"/api/external-references"}) +public class ExternalReferencesController extends BaseController { + + private final FunderService funderService; + private final ExternalReferencesService externalReferencesService; + private final ProjectService projectService; + + @Autowired + public ExternalReferencesController( + ApiContext apiContext, + FunderService funderService, + ExternalReferencesService externalReferencesService, + ProjectService projectService + ) { + super(apiContext); + this.funderService = funderService; + this.externalReferencesService = externalReferencesService; + this.projectService = projectService; + } + + @PostMapping(path = {"funders"}, consumes = "application/json", produces = "application/json") + public @ResponseBody ResponseEntity>> getWithExternal(@RequestBody FunderCriteriaRequest funderCriteria, Principal principal) throws NoURLFound, InstantiationException, HugeResultSet, IllegalAccessException { + List dataTable = this.funderService.getCriteriaWithExternal(funderCriteria, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); + } + + @PostMapping(path = {"projects"}, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity>> getWithExternal(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) throws NoURLFound, InstantiationException, HugeResultSet, IllegalAccessException { + List dataTable = this.projectService.getCriteriaWithExternal(projectCriteria, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); + } + + @GetMapping(path = {"{externalType"}, produces = "application/json") + public @ResponseBody ResponseEntity>> listExternalReferecnes(@RequestParam(value = "externalType") String externalType, @RequestParam(value = "query", required = false) String query, + @RequestParam(value = "type", required = false) String type, Principal principal + ) throws HugeResultSet, NoURLFound { + List externalReferences = this.externalReferencesService.getExternal(externalType, query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(externalReferences)); + } + +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java new file mode 100644 index 000000000..6f5a288e3 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java @@ -0,0 +1,37 @@ +package eu.eudat.controllers.v2; + +import eu.eudat.controllers.BaseController; +import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; +import eu.eudat.logic.proxy.config.exceptions.NoURLFound; +import eu.eudat.logic.services.ApiContext; +import eu.eudat.models.data.helpers.responses.ResponseItem; +import eu.eudat.models.data.security.Principal; +import eu.eudat.service.ValidationService; +import eu.eudat.types.ApiMessageCode; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@CrossOrigin +@RequestMapping(path = {"api/validation"}) +public class ExternalValidationController extends BaseController { + + private ValidationService validationService; + + @Autowired + public ExternalValidationController(ApiContext apiContext, ValidationService validationService) { + super(apiContext); + this.validationService = validationService; + } + + @GetMapping(path = {""}, produces = "application/json") + public @ResponseBody + ResponseEntity> validate( + @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal + ) throws HugeResultSet, NoURLFound { + Boolean isValid = this.validationService.validateIdentifier(query, type, principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(isValid).status(ApiMessageCode.NO_MESSAGE)); + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java new file mode 100644 index 000000000..0e060b594 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java @@ -0,0 +1,71 @@ +package eu.eudat.controllers.v2; + +import eu.eudat.commons.enums.SupportiveMaterialFieldType; +import eu.eudat.logic.managers.MetricsManager; +import eu.eudat.logic.security.claims.ClaimedAuthorities; +import eu.eudat.model.persist.UserGuidePersist; +import eu.eudat.models.data.helpers.responses.ResponseItem; +import eu.eudat.models.data.security.Principal; +import eu.eudat.service.supportivematerial.SupportiveMaterialService; +import eu.eudat.types.ApiMessageCode; +import org.apache.commons.lang3.EnumUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Objects; +import java.util.stream.Stream; + +import static eu.eudat.types.Authorities.ADMIN; + +@RestController +@CrossOrigin +@RequestMapping(path = {"/api/material"}) +public class SupportiveMaterialController { + + private Environment environment; + private SupportiveMaterialService supportiveMaterialService; + + @Autowired + public SupportiveMaterialController(Environment environment, SupportiveMaterialService supportiveMaterialService, MetricsManager metricsManager) { + this.environment = environment; + this.supportiveMaterialService = supportiveMaterialService; + } + + @GetMapping("{lang}") + public ResponseEntity getMaterial(@PathVariable(name = "lang") String lang, String field) throws IOException { + if( !EnumUtils.isValidEnum(SupportiveMaterialFieldType.class, field)){ + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + try (Stream paths = Files.walk(Paths.get(Objects.requireNonNull(this.environment.getProperty(field +".path"))))) { + return this.supportiveMaterialService.getResponseEntity(lang, paths); + } + } + +// @PostMapping("userguide/current") +// public @ResponseBody +// ResponseEntity> updateGuide(@RequestBody UserGuidePersist guide, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IOException { +// String fileName = this.environment.getProperty("userguide.path") + guide.getName(); +// this.supportiveMaterialService.persist(guide, fileName); +// return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Updated").payload("Updated")); +// } + + @PostMapping("current") + public @ResponseBody + ResponseEntity> persist(@RequestBody UserGuidePersist guide, String field, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IOException { + if( !EnumUtils.isValidEnum(SupportiveMaterialFieldType.class, field)){ + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + String fileName = this.environment.getProperty(field+ ".path") + guide.getName(); + this.supportiveMaterialService.persist(guide, fileName); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Updated").payload("Updated")); + } + + +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java new file mode 100644 index 000000000..1ede1feaf --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "repositories") +public class DataRepositoryUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java new file mode 100644 index 000000000..589efd336 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java @@ -0,0 +1,67 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + + +public class ExternalUrlsBase { + + TaxonomyUrls taxonomyUrls; + + DataRepositoryUrls dataRepositoryUrls; + + JournalUrls journalUrls; + + LicenseUrls licenseUrls; + + PublicationUrls publicationUrls; + + PubRepositoryUrls pubRepositoryUrls; + + public TaxonomyUrls getTaxonomyUrls() { + return taxonomyUrls; + } + + public void setTaxonomyUrls(TaxonomyUrls taxonomyUrls) { + this.taxonomyUrls = taxonomyUrls; + } + + public DataRepositoryUrls getDataRepositoryUrls() { + return dataRepositoryUrls; + } + + public void setDataRepositoryUrls(DataRepositoryUrls dataRepositoryUrls) { + this.dataRepositoryUrls = dataRepositoryUrls; + } + + public JournalUrls getJournalUrls() { + return journalUrls; + } + + public void setJournalUrls(JournalUrls journalUrls) { + this.journalUrls = journalUrls; + } + + public LicenseUrls getLicenseUrls() { + return licenseUrls; + } + + public void setLicenseUrls(LicenseUrls licenseUrls) { + this.licenseUrls = licenseUrls; + } + + public PublicationUrls getPublicationUrls() { + return publicationUrls; + } + + public void setPublicationUrls(PublicationUrls publicationUrls) { + this.publicationUrls = publicationUrls; + } + + public PubRepositoryUrls getPubRepositoryUrls() { + return pubRepositoryUrls; + } + + public void setPubRepositoryUrls(PubRepositoryUrls pubRepositoryUrls) { + this.pubRepositoryUrls = pubRepositoryUrls; + } +} + + diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java new file mode 100644 index 000000000..bfc3ac854 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "journal") +public class JournalUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java new file mode 100644 index 000000000..32f7b1ec6 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "licenses") +public class LicenseUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java new file mode 100644 index 000000000..a0506d208 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "pubRepositories") +public class PubRepositoryUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java new file mode 100644 index 000000000..c9209af9d --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "publications") +public class PublicationUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java new file mode 100644 index 000000000..d0e2cf03d --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java @@ -0,0 +1,41 @@ +package eu.eudat.logic.proxy.config.entitiesV2; + +import eu.eudat.proxy.config.FetchStrategy; +import eu.eudat.proxy.config.UrlConfiguration; +import eu.eudat.proxy.config.entities.GenericUrls; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; + +import java.io.Serializable; +import java.util.List; + +@XmlRootElement(name = "taxonomies") +public class TaxonomyUrls extends GenericUrls implements Serializable { + + private static final long serialVersionUID = -5076364662014107275L; + + List urls; + FetchStrategy fetchMode; + + @Override + public List getUrls() { + return urls; + } + + @XmlElementWrapper + @XmlElement(name = "urlConfig") + public void setUrls(List urls) { + this.urls = urls; + } + + @Override + public FetchStrategy getFetchMode() { + return fetchMode; + } + + @XmlElement(name = "fetchMode") + public void setFetchMode(FetchStrategy fetchMode) { + this.fetchMode = fetchMode; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index 86a9742f9..212d8f4ad 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -50,6 +50,56 @@ public class RemoteFetcher { ).clientConnector(new ReactorClientHttpConnector(HttpClient.create().followRedirect(true))).build(); } + //@Cacheable(value = "tempexternalType", keyGenerator = "externalUrlsKeyGenerator") + public List> get(String externalType, ExternalUrlCriteria externalUrlCriteria, String key) throws eu.eudat.proxy.config.exceptions.NoURLFound, eu.eudat.proxy.config.exceptions.HugeResultSet { + List urlConfigs = null; + FetchStrategy fetchStrategy = null; + switch (externalType){ + case "taxonomies": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getTaxonomies().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getTaxonomies().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getTaxonomies().getFetchMode(); + break; + case "licenses": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getLicenses().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getLicenses().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getLicenses().getFetchMode(); + break; + case "publications": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPublications().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getPublications().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getPublications().getFetchMode(); + break; + case "journals": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getJournals().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getJournals().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getJournals().getFetchMode(); + break; + case "pubRepositories": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPubRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getPubRepositories().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getPubRepositories().getFetchMode(); + break; + case "dataRepositories": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getRepositories().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getRepositories().getFetchMode(); + break; + case "registries": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRegistries().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getRegistries().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getRegistries().getFetchMode(); + break; + case "services": + urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getServices().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) + : configLoader.getExternalUrls().getServices().getUrls(); + fetchStrategy = configLoader.getExternalUrls().getServices().getFetchMode(); + break; + } + + return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); + } + @Cacheable(value = "repositories", keyGenerator = "externalUrlsKeyGenerator") public List> getRepositories(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs = diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/configurations/SwaggerConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/configurations/SwaggerConfiguration.java index f3284dfb4..232794013 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/configurations/SwaggerConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/configurations/SwaggerConfiguration.java @@ -1,32 +1,32 @@ package eu.eudat.publicapi.configurations; -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Contact; -import io.swagger.v3.oas.models.info.Info; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; - -@Configuration -public class SwaggerConfiguration { - - // private static final TypeResolver resolver = new TypeResolver(); - - @Autowired - private Environment environment; - - @Bean - public OpenAPI ArgosOpenApi() { - return new OpenAPI().info(apiInfo()); - } - - private Info apiInfo() { - return new Info() - .title("OpenDMP public API") - .description("Argos public API.") - .version("1.0") - .termsOfService("https://argos.openaire.eu/terms-and-conditions") - .contact(new Contact().name("Argos").url("https://argos.openaire.eu/").email("argos@openaire.eu ")); - } -} +//import io.swagger.v3.oas.models.OpenAPI; +//import io.swagger.v3.oas.models.info.Contact; +//import io.swagger.v3.oas.models.info.Info; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.core.env.Environment; +// +//@Configuration +//public class SwaggerConfiguration { +// +// // private static final TypeResolver resolver = new TypeResolver(); +// +// @Autowired +// private Environment environment; +// +// @Bean +// public OpenAPI ArgosOpenApi() { +// return new OpenAPI().info(apiInfo()); +// } +// +// private Info apiInfo() { +// return new Info() +// .title("OpenDMP public API") +// .description("Argos public API.") +// .version("1.0") +// .termsOfService("https://argos.openaire.eu/terms-and-conditions") +// .contact(new Contact().name("Argos").url("https://argos.openaire.eu/").email("argos@openaire.eu ")); +// } +//} diff --git a/dmp-backend/web/src/main/resources/config/cache.yml b/dmp-backend/web/src/main/resources/config/cache.yml index 25a8f2c1f..0d331706c 100644 --- a/dmp-backend/web/src/main/resources/config/cache.yml +++ b/dmp-backend/web/src/main/resources/config/cache.yml @@ -26,6 +26,14 @@ cache: expireAfterWriteMinutes: 10 expireAfterAccessMinutes: 10 refreshAfterWriteMinutes: 10 + - names: [ "externalReference" ] + allowNullValues: true + initialCapacity: 100 + maximumSize: 500 + enableRecordStats: false + expireAfterWriteMinutes: 10 + expireAfterAccessMinutes: 10 + refreshAfterWriteMinutes: 10 mapCaches: apiKey: name: apikey @@ -35,4 +43,7 @@ cache: keyPattern: user_by_subject_$subject$:v0 supportiveMaterial: name: supportiveMaterial - keyPattern: supportive_material_$material$:v0 \ No newline at end of file + keyPattern: supportive_material_$material$:v0 + externalReference: + name: externalReference + keyPattern: external_reference_$type$_$criteria$:v0 \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/funders.xml b/dmp-backend/web/src/main/resources/externalUrls/funders.xml new file mode 100644 index 000000000..f7b1873c7 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/funders.xml @@ -0,0 +1,215 @@ + + + + + + openaire + + 1 + External + https://services.openaire.eu/search/v2/api/publications?&refine=true&fields=relfunder&page={page}&size=0&format=json + 0 + application/json; charset=utf-8 + + $['refineResults']['relfunder'][*] + + 'name' + 'id' + 'count' + + + local + + + + + cristin + + 1 + External + https://eestore.paas2.uninett.no/api/projectrepo/?search={like}&page={page}&size={pageSize} + 1 + application/vnd.api+json; charset=utf-8 + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'uri' + 'description' + + + $['meta']['pagination']['page','pages','count'] + + + crossref + + 1 + External + https://api.crossref.org/funders?query={like}&rows={pageSize} + application/json; charset=utf-8 + + $['message']['items'][*] + + 'name' + 'id' + 'count' + + + + + + + FIRST + diff --git a/dmp-backend/web/src/main/resources/externalUrls/journals.xml b/dmp-backend/web/src/main/resources/externalUrls/journals.xml new file mode 100644 index 000000000..7bf785abd --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/journals.xml @@ -0,0 +1,27 @@ + + + + + + openaire + + 1 + External + POST + https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING + 0 + application/json + {"officialname": "{like}", "typology":"journal"} + + $['datasourceInfo'][*] + + 'id' + 'officialname' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/licenses.xml b/dmp-backend/web/src/main/resources/externalUrls/licenses.xml new file mode 100644 index 000000000..3af20a4d4 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/licenses.xml @@ -0,0 +1,25 @@ + + + + + + opendefinition + + 1 + External + https://licenses.opendefinition.org/licenses/groups/all.json + 1 + application/vnd.api+json; charset=utf-8 + + $[*] + + 'id' + 'title' + 'url' + 'maintainer' + + + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/projects.xml b/dmp-backend/web/src/main/resources/externalUrls/projects.xml new file mode 100644 index 000000000..d5bf6d090 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/projects.xml @@ -0,0 +1,80 @@ + + + + + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/pub-repositories.xml b/dmp-backend/web/src/main/resources/externalUrls/pub-repositories.xml new file mode 100644 index 000000000..64caea2df --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/pub-repositories.xml @@ -0,0 +1,67 @@ + + + + + + openaire + + 1 + External + POST + https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING + 0 + application/json + {"officialname": "{like}", "typology":"pubsrepository::institutional"} + + $['datasourceInfo'][*] + + 'id' + 'officialname' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + openaire + + 1 + External + POST + https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING + 0 + application/json + {"officialname": "{like}", "typology":"pubsrepository::thematic"} + + $['datasourceInfo'][*] + + 'id' + 'officialname' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + openaire + + 1 + External + POST + https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING + 0 + application/json + {"officialname": "{like}", "typology":"pubsrepository::unknown"} + + $['datasourceInfo'][*] + + 'id' + 'officialname' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/publications.xml b/dmp-backend/web/src/main/resources/externalUrls/publications.xml new file mode 100644 index 000000000..b4c679490 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/publications.xml @@ -0,0 +1,44 @@ + + + + + + openaire + + 1 + External + https://services.openaire.eu/search/v2/api/resources?query=oaftype exact result and {query}&page={page}&size={pageSize}&format=json + 0 + application/json;charset=UTF-8 + + + 0 + (10[.][0-9]{4,}(?:[.][0-9]+)*\/(?:(?!["&\'<>])[[:graph:]])+) + (pidclassid exact "doi" and pid="{like}") + + + 1 + (10[.][0-9]{4,}(?:[.][0-9]+)*\/(?:(?!["&\'<>])\S)+) + (pidclassid exact "doi" and pid="{like}") + + + 2 + .+ + {like} + + + + $['results'][*]['result']['metadata']['oaf:entity']['oaf:result'] + + 'originalId' + pid.content + pid.classid + 'title' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/repositories.xml b/dmp-backend/web/src/main/resources/externalUrls/repositories.xml new file mode 100644 index 000000000..10ac938d9 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/repositories.xml @@ -0,0 +1,124 @@ + + + + + + + openairealt2 + + 1 + External + POST + https://services.openaire.eu/openaire/ds/searchdetails/{page}/{pageSize}?requestSortBy=id&order=ASCENDING + + 0 + application/json + {"officialname": "{like}", "typology":"data"} + + $['datasourceInfo'][*] + + 'id' + 'officialname' + 'count' + + + $['meta']['pagination']['page','pages','count'] + + + + + + FIRST + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/taxonomies.xml b/dmp-backend/web/src/main/resources/externalUrls/taxonomies.xml new file mode 100644 index 000000000..735c9f661 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/taxonomies.xml @@ -0,0 +1,25 @@ + + + + + + taxonomy + + 1 + External + https://eestore.paas2.uninett.no/api/taxonomy/ + 0 + application/vnd.api+json + + $['data'][*]['attributes'] + + 'pid' + 'name' + 'count' + + + + + + ALL + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/externalUrls/validators.xml b/dmp-backend/web/src/main/resources/externalUrls/validators.xml new file mode 100644 index 000000000..6e52a39b6 --- /dev/null +++ b/dmp-backend/web/src/main/resources/externalUrls/validators.xml @@ -0,0 +1,26 @@ + + + + + + zenodo + + 1 + External + https://sandbox.zenodo.org/api/records/?page={page}&size={pageSize}&q="{like}" + 1 + application/json + + $[*] + + 'conceptrecid' + 'conceptdoi' + 'doi' + 'created' + + + $['hits']['total'] + + + FIRST + \ No newline at end of file diff --git a/dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts b/dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts new file mode 100644 index 000000000..8385c9380 --- /dev/null +++ b/dmp-frontend/src/app/core/common/enum/supportive-material-field-type.ts @@ -0,0 +1,7 @@ +export enum SupportiveMaterialFieldType { + faq = 'faq', + about = 'about', + glossary = 'glossary', + termsofservice = 'termsofservice', + userguide = 'userguide' +} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/core-service.module.ts b/dmp-frontend/src/app/core/core-service.module.ts index 727b40702..59beab191 100644 --- a/dmp-frontend/src/app/core/core-service.module.ts +++ b/dmp-frontend/src/app/core/core-service.module.ts @@ -54,11 +54,12 @@ import { TermsOfServiceService } from './services/terms-of-service/terms-of-serv import { UnlinkAccountEmailConfirmationService } from './services/unlink-account-email-confirmation/unlink-account-email-confirmation.service'; import { DescriptionTemplateTypeService } from './services/description-template-type/description-template-type.service'; import { BaseHttpV2Service } from './services/http/base-http-v2.service'; -import { KeycloakService } from 'keycloak-angular'; +//import { KeycloakService } from 'keycloak-angular'; import { PrincipalService } from './services/http/principal.service'; import { InterceptorType } from '@common/http/interceptors/interceptor-type'; import { BaseHttpParams } from '@common/http/base-http-params'; import { from } from 'rxjs'; +import { SupportiveMaterialService } from './services/supportive-material/supportive-material.service'; // // // This is shared module that provides all the services. Its imported only once on the AppModule. @@ -126,6 +127,7 @@ export class CoreServiceModule { FaqService, GlossaryService, TermsOfServiceService, + SupportiveMaterialService, CurrencyService, MergeEmailConfirmationService, UnlinkAccountEmailConfirmationService, diff --git a/dmp-frontend/src/app/core/services/faq/faq.service.ts b/dmp-frontend/src/app/core/services/faq/faq.service.ts index c59cfe9cd..f5408871c 100644 --- a/dmp-frontend/src/app/core/services/faq/faq.service.ts +++ b/dmp-frontend/src/app/core/services/faq/faq.service.ts @@ -11,11 +11,11 @@ export class FaqService { private http: HttpClient, private configurationService: ConfigurationService ) { - this.faqUrl = `${configurationService.server}material/faq`; + this.faqUrl = `${configurationService.server}material`; } - public getFaq(lang: string): Observable> { - return this.http.get(`${this.faqUrl}/${lang}`, { responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', + public getFaq(lang: string, field: string): Observable> { + return this.http.get(`${this.faqUrl}/${lang}`, {params: {field}, responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', 'Accept': 'text/html', 'Access-Control-Allow-Origin': this.configurationService.app, 'Access-Control-Allow-Credentials': 'true'} }); diff --git a/dmp-frontend/src/app/core/services/supportive-material/supportive-material.service.ts b/dmp-frontend/src/app/core/services/supportive-material/supportive-material.service.ts new file mode 100644 index 000000000..803e0e1a9 --- /dev/null +++ b/dmp-frontend/src/app/core/services/supportive-material/supportive-material.service.ts @@ -0,0 +1,27 @@ +import { Injectable } from "@angular/core"; +import { ConfigurationService } from "../configuration/configuration.service"; +import { HttpClient, HttpResponse } from "@angular/common/http"; +import { Observable } from "rxjs"; + +@Injectable() +export class SupportiveMaterialService{ + private baseUrl : string; + + constructor( + private http: HttpClient, + private configurationService: ConfigurationService + ) { + this.baseUrl = `${configurationService.server}material`; + } + + public getMaterial(lang: string, field: string): Observable> { + return this.http.get(`${this.baseUrl}/${lang}`, {params: {field}, responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', + 'Accept': 'text/html', + 'Access-Control-Allow-Origin': this.configurationService.app, + 'Access-Control-Allow-Credentials': 'true'} }); + } + + public persist(data: any, field: string): Observable { + return this.http.post(`${this.baseUrl}/current`, data, {params: {field}}); + } +} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts b/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts index 206e2a70d..4ad254f71 100644 --- a/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts +++ b/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts @@ -16,7 +16,7 @@ export class UserGuideService { private baseHttp: BaseHttpService, private configurationService: ConfigurationService ) { - this.userGuideUrl = `${configurationService.server}userguide`; + this.userGuideUrl = `${configurationService.server}material/userguide`; } public getUserGuide(lang: string): Observable> { diff --git a/dmp-frontend/src/app/ui/about/about.component.ts b/dmp-frontend/src/app/ui/about/about.component.ts index ff9740a7b..b89c0ae40 100644 --- a/dmp-frontend/src/app/ui/about/about.component.ts +++ b/dmp-frontend/src/app/ui/about/about.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { Router } from '@angular/router'; -import { AboutService } from '@app/core/services/about/about.service'; +import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service'; import { BaseComponent } from '@common/base/base.component'; import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @@ -19,7 +20,7 @@ export class AboutComponent extends BaseComponent implements OnInit { sanitizedGuideUrl: any; constructor( - private aboutService: AboutService, + private supportiveMaterialService: SupportiveMaterialService, private sanitizer: DomSanitizer, private languageService: LanguageService, private matomoService: MatomoService, @@ -32,7 +33,7 @@ export class AboutComponent extends BaseComponent implements OnInit { this.translate.onLangChange.subscribe((event: LangChangeEvent) => { this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/about'])); }); - this.aboutService.getAbout(this.languageService.getCurrentLanguage()) + this.supportiveMaterialService.getMaterial(this.languageService.getCurrentLanguage(), SupportiveMaterialFieldType.about) .pipe(takeUntil(this._destroyed)) .subscribe(response => { const blob = new Blob([response.body], { type: 'text/html' }); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts index 4923a0752..e84fd4e1d 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts @@ -3,7 +3,7 @@ import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profil import { FieldDataOptionEditorModel } from './field-data-option-editor-model'; import { UntypedFormGroup, Validators } from '@angular/forms'; import { AutoCompleteFieldData, AutoCompleteSingleData } from '@app/core/model/dataset-profile-definition/field-data/field-data'; -import { AuthFieldEditorModel } from './auto-complete-auth-field-data.model'; +//import { AuthFieldEditorModel } from './auto-complete-auth-field-data.model'; export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel { @@ -14,7 +14,7 @@ export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel = []): UntypedFormGroup { @@ -27,7 +27,7 @@ export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel { const blob = new Blob([response.body], { type: 'text/html' }); diff --git a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts index e4deba043..ba753ecb7 100644 --- a/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts +++ b/dmp-frontend/src/app/ui/glossary/glossary-content/glossary-content.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit, Input } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { Router } from '@angular/router'; -import { GlossaryService } from '@app/core/services/glossary/glossary.service'; +import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; +import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service'; import { BaseComponent } from '@common/base/base.component'; import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @@ -21,7 +22,7 @@ export class GlossaryContentComponent extends BaseComponent implements OnInit { sanitizedGuideUrl: any; constructor( - private glossaryService: GlossaryService, + private supportiveMaterialService: SupportiveMaterialService, private sanitizer: DomSanitizer, private languageService: LanguageService, private matomoService: MatomoService, @@ -35,7 +36,7 @@ export class GlossaryContentComponent extends BaseComponent implements OnInit { this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/glossary'])); }); - this.glossaryService.getGlossary(this.languageService.getCurrentLanguage()) + this.supportiveMaterialService.getMaterial(this.languageService.getCurrentLanguage(), SupportiveMaterialFieldType.glossary) .pipe(takeUntil(this._destroyed)) .subscribe(response => { const blob = new Blob([response.body], { type: 'text/html' }); diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts index ee83c5e10..b022de297 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/terms/terms.component.ts @@ -1,9 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { TermsOfServiceService } from '@app/core/services/terms-of-service/terms-of-service.service'; +import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service'; import { BaseComponent } from '@common/base/base.component'; import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; import { takeUntil } from 'rxjs/operators'; @@ -19,7 +20,7 @@ export class TermsComponent extends BaseComponent implements OnInit { sanitizedGuideUrl: any; constructor( - private termsService: TermsOfServiceService, + private supportiveMaterialService: SupportiveMaterialService, private sanitizer: DomSanitizer, private languageService: LanguageService, private matomoService: MatomoService, @@ -32,7 +33,7 @@ export class TermsComponent extends BaseComponent implements OnInit { this.translate.onLangChange.subscribe((event: LangChangeEvent) => { this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/terms-and-conditions'])); }); - this.termsService.getTermsOfService(this.languageService.getCurrentLanguage()) + this.supportiveMaterialService.getMaterial(this.languageService.getCurrentLanguage(), SupportiveMaterialFieldType.termsofservice) .pipe(takeUntil(this._destroyed)) .subscribe(response => { const blob = new Blob([response.body], { type: 'text/html' }); diff --git a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts index 88ac72ce1..3d50a7caf 100644 --- a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts +++ b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { UntypedFormGroup, UntypedFormBuilder } from '@angular/forms'; import { BaseComponent } from '@common/base/base.component'; -import { UserGuideService } from '@app/core/services/user-guide/user-guide.service'; import { takeUntil } from 'rxjs/operators'; import { UiNotificationService, SnackBarNotificationLevel } from '@app/core/services/notification/ui-notification-service'; import { TranslateService } from '@ngx-translate/core'; @@ -13,6 +12,8 @@ import { AuthService } from '@app/core/services/auth/auth.service'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; import { HttpClient } from '@angular/common/http'; +import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service'; +import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type'; @Component({ selector: 'app-user-guide-editor', @@ -23,7 +24,7 @@ export class UserGuideEditorComponent extends BaseComponent implements OnInit { public formGroup: UntypedFormGroup; private formBuilder: UntypedFormBuilder; - constructor(private userGuideService: UserGuideService, + constructor(private supportiveMaterialService: SupportiveMaterialService, private uiNotificationService: UiNotificationService, private translate: TranslateService, private router: Router, @@ -40,7 +41,7 @@ export class UserGuideEditorComponent extends BaseComponent implements OnInit { name: [''], html: [''] }); - this.userGuideService.getUserGuide(this.languageService.getCurrentLanguage()).pipe(takeUntil(this._destroyed)).subscribe(data => { + this.supportiveMaterialService.getMaterial(this.languageService.getCurrentLanguage(), SupportiveMaterialFieldType.userguide).pipe(takeUntil(this._destroyed)).subscribe(data => { const contentDispositionHeader = data.headers.get('Content-Disposition'); const filename = contentDispositionHeader.split(';')[1].trim().split('=')[1].replace(/"/g, ''); @@ -76,7 +77,7 @@ export class UserGuideEditorComponent extends BaseComponent implements OnInit { let result = this.parseText(this.formGroup.get('html').value); //result = result.replace(/href="#/g, 'class="href" path="'); this.formGroup.get('html').patchValue(result); - this.userGuideService.updateUserGuide(this.formGroup.value).pipe(takeUntil(this._destroyed)) + this.supportiveMaterialService.persist(this.formGroup.value, "userguide").pipe(takeUntil(this._destroyed)) .subscribe( complete => { this.onCallbackSuccess(complete); diff --git a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts index 5555a9f42..1b21b1092 100644 --- a/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts +++ b/dmp-frontend/src/app/ui/user-guide/user-guide-content/user-guide-content.component.ts @@ -2,10 +2,11 @@ import { HttpClient } from '@angular/common/http'; import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; import { Router } from '@angular/router'; +import { SupportiveMaterialFieldType } from '@app/core/common/enum/supportive-material-field-type'; import { ConfigurationService } from '@app/core/services/configuration/configuration.service'; import { LanguageService } from '@app/core/services/language/language.service'; import { MatomoService } from '@app/core/services/matomo/matomo-service'; -import { UserGuideService } from '@app/core/services/user-guide/user-guide.service'; +import { SupportiveMaterialService } from '@app/core/services/supportive-material/supportive-material.service'; import { BaseComponent } from '@common/base/base.component'; import { LangChangeEvent, TranslateService } from '@ngx-translate/core'; import { interval, Subject } from 'rxjs'; @@ -30,7 +31,7 @@ export class UserGuideContentComponent extends BaseComponent implements OnInit { @ViewChild('guide') guide: ElementRef; constructor( - private userGuideService: UserGuideService, + private supportiveMaterialService: SupportiveMaterialService, private sanitizer: DomSanitizer, private languageService: LanguageService, private httpClient: HttpClient, @@ -50,7 +51,7 @@ export class UserGuideContentComponent extends BaseComponent implements OnInit { this.translate.onLangChange.subscribe((event: LangChangeEvent) => { this.router.navigate(['/reload'], { skipLocationChange: true }).then(() => this.router.navigate(['/user-guide'])); }); - this.userGuideService.getUserGuide(this.languageService.getCurrentLanguage()) + this.supportiveMaterialService.getMaterial(this.languageService.getCurrentLanguage(), SupportiveMaterialFieldType.userguide) .pipe(takeUntil(this._destroyed)) .subscribe(response => { const blob = new Blob([response.body], { type: 'text/html' }); diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json index aa1530c15..1f88e12a3 100644 --- a/dmp-frontend/src/assets/config/config.json +++ b/dmp-frontend/src/assets/config/config.json @@ -52,19 +52,51 @@ ], "keycloak": { "enabled": true, - "address": null, - "realm": null, + "address": "http://dev03.local.cite.gr:60201/auth", + "realm": "dmp-development", "flow": "standard", - "clientId": null, + "clientId": "dmp_webapp", "silentCheckSsoRedirectUri": "http://localhost:4200/assets/silent-check-sso.html", - "scope": "openid profile email address phone", + "scope": "openid profile email address phone dmp_web", "clientSecret": null, "grantType": "code" }, - "zenodoConfiguration": { - "clientId": "", - "oauthUrl": "https://sandbox.zenodo.org/oauth/authorize", - "redirectUri": "http://localhost:4200/login/external/zenodo" + "loginProviders": { + "enabled": [1, 2, 3, 4, 5, 6, 7, 8], + "facebookConfiguration": { "clientId": "" }, + "googleConfiguration": { "clientId": "524432312250-sc9qsmtmbvlv05r44onl6l93ia3k9deo.apps.googleusercontent.com" }, + "linkedInConfiguration": { + "clientId": "", + "oauthUrl": "https://www.linkedin.com/oauth/v2/authorization", + "redirectUri": "http://localhost:4200/login/linkedin", + "state": "987654321" + }, + "twitterConfiguration": { + "clientId": "", + "oauthUrl": "https://api.twitter.com/oauth/authenticate" + }, + "b2accessConfiguration": { + "clientId": "", + "oauthUrl": "https://b2access-integration.fz-juelich.de:443/oauth2-as/oauth2-authz", + "redirectUri": "http://localhost:4200/api/oauth/authorized/b2access", + "state": "" + }, + "orcidConfiguration": { + "clientId": "", + "oauthUrl": "https://orcid.org/oauth/authorize", + "redirectUri": "http://localhost:4200/login/external/orcid" + }, + "openAireConfiguration": { + "clientId": "", + "oauthUrl": "", + "redirectUri": "", + "state": "987654321" + }, + "zenodoConfiguration": { + "clientId": "", + "oauthUrl": "https://sandbox.zenodo.org/oauth/authorize", + "redirectUri": "http://localhost:4200/login/external/zenodo" + } }, "logging": { "enabled": true, From 17bb6bd4b0772e72af963bffd6adba1bdea3b4a3 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 12:26:57 +0300 Subject: [PATCH 3/8] add Supportive Material --- dmp-backend/core/pom.xml | 13 -------- .../ExternalReferencesService.java | 22 ------------- .../v2/SupportiveMaterialController.java | 8 ----- .../web/src/main/resources/config/cache.yml | 14 ++++---- .../src/app/core/core-service.module.ts | 10 ------ .../app/core/services/about/about.service.ts | 23 ------------- .../src/app/core/services/faq/faq.service.ts | 23 ------------- .../services/glossary/glossary.service.ts | 23 ------------- .../terms-of-service.service.ts | 23 ------------- .../services/user-guide/user-guide.service.ts | 33 ------------------- .../user-guide-editor.component.ts | 2 +- 11 files changed, 8 insertions(+), 186 deletions(-) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java delete mode 100644 dmp-frontend/src/app/core/services/about/about.service.ts delete mode 100644 dmp-frontend/src/app/core/services/faq/faq.service.ts delete mode 100644 dmp-frontend/src/app/core/services/glossary/glossary.service.ts delete mode 100644 dmp-frontend/src/app/core/services/terms-of-service/terms-of-service.service.ts delete mode 100644 dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml index 8f1812961..09e82047c 100644 --- a/dmp-backend/core/pom.xml +++ b/dmp-backend/core/pom.xml @@ -9,19 +9,6 @@ 1.0.0-SNAPSHOT - - - eu.eudat - data - 1.0-SNAPSHOT - - - dmp-backend - web - 1.0-SNAPSHOT - - - core diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java deleted file mode 100644 index ff50260d1..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesService.java +++ /dev/null @@ -1,22 +0,0 @@ -package eu.eudat.service.externalreferences; - -import eu.eudat.data.entities.DataRepository; -import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; -import eu.eudat.logic.proxy.config.exceptions.NoURLFound; -import eu.eudat.model.ExternalReference2; - -import eu.eudat.model.ExternalReference; -import eu.eudat.models.data.security.Principal; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public interface ExternalReferencesService { - - DataRepository create(ExternalReference externalReference, Principal principal) throws Exception; - - List getExternal(String externalType, String query, String type, Principal principal) throws HugeResultSet, NoURLFound; - - List getExternal2(String externalType, String query, String type, Principal principal) throws HugeResultSet,NoURLFound; -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java index 0e060b594..54ba60cd0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/SupportiveMaterialController.java @@ -48,14 +48,6 @@ public class SupportiveMaterialController { } } -// @PostMapping("userguide/current") -// public @ResponseBody -// ResponseEntity> updateGuide(@RequestBody UserGuidePersist guide, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IOException { -// String fileName = this.environment.getProperty("userguide.path") + guide.getName(); -// this.supportiveMaterialService.persist(guide, fileName); -// return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Updated").payload("Updated")); -// } - @PostMapping("current") public @ResponseBody ResponseEntity> persist(@RequestBody UserGuidePersist guide, String field, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) throws IOException { diff --git a/dmp-backend/web/src/main/resources/config/cache.yml b/dmp-backend/web/src/main/resources/config/cache.yml index 0d331706c..d5b1ed0aa 100644 --- a/dmp-backend/web/src/main/resources/config/cache.yml +++ b/dmp-backend/web/src/main/resources/config/cache.yml @@ -27,13 +27,13 @@ cache: expireAfterAccessMinutes: 10 refreshAfterWriteMinutes: 10 - names: [ "externalReference" ] - allowNullValues: true - initialCapacity: 100 - maximumSize: 500 - enableRecordStats: false - expireAfterWriteMinutes: 10 - expireAfterAccessMinutes: 10 - refreshAfterWriteMinutes: 10 + allowNullValues: true + initialCapacity: 100 + maximumSize: 500 + enableRecordStats: false + expireAfterWriteMinutes: 10 + expireAfterAccessMinutes: 10 + refreshAfterWriteMinutes: 10 mapCaches: apiKey: name: apikey diff --git a/dmp-frontend/src/app/core/core-service.module.ts b/dmp-frontend/src/app/core/core-service.module.ts index 59beab191..c485bc969 100644 --- a/dmp-frontend/src/app/core/core-service.module.ts +++ b/dmp-frontend/src/app/core/core-service.module.ts @@ -40,17 +40,12 @@ import { ProjectService } from './services/project/project.service'; import { QuickWizardService } from './services/quick-wizard/quick-wizard.service'; import { SearchBarService } from './services/search-bar/search-bar.service'; import { TimezoneService } from './services/timezone/timezone-service'; -import { UserGuideService } from './services/user-guide/user-guide.service'; import { UserService } from './services/user/user.service'; import { CollectionUtils } from './services/utilities/collection-utils.service'; import { TypeUtils } from './services/utilities/type-utils.service'; import { SpecialAuthGuard } from './special-auth-guard.service'; import {PrefillingService} from "@app/core/services/prefilling.service"; import { DepositRepositoriesService } from './services/deposit-repositories/deposit-repositories.service'; -import { AboutService } from './services/about/about.service'; -import { FaqService } from './services/faq/faq.service'; -import { GlossaryService } from './services/glossary/glossary.service'; -import { TermsOfServiceService } from './services/terms-of-service/terms-of-service.service'; import { UnlinkAccountEmailConfirmationService } from './services/unlink-account-email-confirmation/unlink-account-email-confirmation.service'; import { DescriptionTemplateTypeService } from './services/description-template-type/description-template-type.service'; import { BaseHttpV2Service } from './services/http/base-http-v2.service'; @@ -121,12 +116,7 @@ export class CoreServiceModule { ContactSupportService, LanguageService, LockService, - UserGuideService, - AboutService, PrincipalService, - FaqService, - GlossaryService, - TermsOfServiceService, SupportiveMaterialService, CurrencyService, MergeEmailConfirmationService, diff --git a/dmp-frontend/src/app/core/services/about/about.service.ts b/dmp-frontend/src/app/core/services/about/about.service.ts deleted file mode 100644 index 404563c3e..000000000 --- a/dmp-frontend/src/app/core/services/about/about.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Injectable } from "@angular/core"; -import { ConfigurationService } from "../configuration/configuration.service"; -import { HttpClient, HttpResponse } from "@angular/common/http"; -import { Observable } from "rxjs"; - -@Injectable() -export class AboutService { - private aboutUrl : string; - - constructor( - private http: HttpClient, - private configurationService: ConfigurationService - ) { - this.aboutUrl = `${configurationService.server}material/about`; - } - - public getAbout(lang: string): Observable> { - return this.http.get(`${this.aboutUrl}/${lang}`, { responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', - 'Accept': 'text/html', - 'Access-Control-Allow-Origin': this.configurationService.app, - 'Access-Control-Allow-Credentials': 'true'} }); - } -} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/services/faq/faq.service.ts b/dmp-frontend/src/app/core/services/faq/faq.service.ts deleted file mode 100644 index f5408871c..000000000 --- a/dmp-frontend/src/app/core/services/faq/faq.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Injectable } from "@angular/core"; -import { ConfigurationService } from "../configuration/configuration.service"; -import { HttpClient, HttpResponse } from "@angular/common/http"; -import { Observable } from "rxjs"; - -@Injectable() -export class FaqService { - private faqUrl : string; - - constructor( - private http: HttpClient, - private configurationService: ConfigurationService - ) { - this.faqUrl = `${configurationService.server}material`; - } - - public getFaq(lang: string, field: string): Observable> { - return this.http.get(`${this.faqUrl}/${lang}`, {params: {field}, responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', - 'Accept': 'text/html', - 'Access-Control-Allow-Origin': this.configurationService.app, - 'Access-Control-Allow-Credentials': 'true'} }); - } -} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/services/glossary/glossary.service.ts b/dmp-frontend/src/app/core/services/glossary/glossary.service.ts deleted file mode 100644 index c346074bd..000000000 --- a/dmp-frontend/src/app/core/services/glossary/glossary.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Injectable } from "@angular/core"; -import { ConfigurationService } from "../configuration/configuration.service"; -import { HttpClient, HttpResponse } from "@angular/common/http"; -import { Observable } from "rxjs"; - -@Injectable() -export class GlossaryService { - private glossaryUrl : string; - - constructor( - private http: HttpClient, - private configurationService: ConfigurationService - ) { - this.glossaryUrl = `${configurationService.server}material/glossary`; - } - - public getGlossary(lang: string): Observable> { - return this.http.get(`${this.glossaryUrl}/${lang}`, { responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', - 'Accept': 'text/html', - 'Access-Control-Allow-Origin': this.configurationService.app, - 'Access-Control-Allow-Credentials': 'true'} }); - } -} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/services/terms-of-service/terms-of-service.service.ts b/dmp-frontend/src/app/core/services/terms-of-service/terms-of-service.service.ts deleted file mode 100644 index 5ebe6a573..000000000 --- a/dmp-frontend/src/app/core/services/terms-of-service/terms-of-service.service.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Injectable } from "@angular/core"; -import { ConfigurationService } from "../configuration/configuration.service"; -import { HttpClient, HttpResponse } from "@angular/common/http"; -import { Observable } from "rxjs"; - -@Injectable() -export class TermsOfServiceService { - private termsOfServiceUrl : string; - - constructor( - private http: HttpClient, - private configurationService: ConfigurationService - ) { - this.termsOfServiceUrl = `${configurationService.server}material/termsofservice`; - } - - public getTermsOfService(lang: string): Observable> { - return this.http.get(`${this.termsOfServiceUrl}/${lang}`, { responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', - 'Accept': 'text/html', - 'Access-Control-Allow-Origin': this.configurationService.app, - 'Access-Control-Allow-Credentials': 'true'} }); - } -} \ No newline at end of file diff --git a/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts b/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts deleted file mode 100644 index 4ad254f71..000000000 --- a/dmp-frontend/src/app/core/services/user-guide/user-guide.service.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { Injectable } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; -import { environment } from 'environments/environment'; -import { Observable } from 'rxjs'; -import { HttpResponse, HttpClient } from '@angular/common/http'; -import { BaseHttpService } from '../http/base-http.service'; -import { ConfigurationService } from '../configuration/configuration.service'; - -@Injectable() -export class UserGuideService { - private userGuideUrl : string; - - constructor( - private translate: TranslateService, - private http: HttpClient, - private baseHttp: BaseHttpService, - private configurationService: ConfigurationService - ) { - this.userGuideUrl = `${configurationService.server}material/userguide`; - } - - public getUserGuide(lang: string): Observable> { - return this.http.get(`${this.userGuideUrl}/${lang}`, { responseType: 'blob', observe: 'response', headers: {'Content-type': 'text/html', - 'Accept': 'text/html', - 'Access-Control-Allow-Origin': this.configurationService.app, - 'Access-Control-Allow-Credentials': 'true'} }); - } - - public updateUserGuide(data: any): Observable { - return this.http.post(`${this.userGuideUrl}/current`, data); - } - -} diff --git a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts index 3d50a7caf..6a70bdd8e 100644 --- a/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts +++ b/dmp-frontend/src/app/ui/user-guide-editor/user-guide-editor.component.ts @@ -77,7 +77,7 @@ export class UserGuideEditorComponent extends BaseComponent implements OnInit { let result = this.parseText(this.formGroup.get('html').value); //result = result.replace(/href="#/g, 'class="href" path="'); this.formGroup.get('html').patchValue(result); - this.supportiveMaterialService.persist(this.formGroup.value, "userguide").pipe(takeUntil(this._destroyed)) + this.supportiveMaterialService.persist(this.formGroup.value, SupportiveMaterialFieldType.userguide).pipe(takeUntil(this._destroyed)) .subscribe( complete => { this.onCallbackSuccess(complete); From e97479aa03fdba40b412d3d455ff3c1ec91591ed Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Wed, 18 Oct 2023 12:51:15 +0300 Subject: [PATCH 4/8] conf.json cleanup --- dmp-frontend/src/assets/config/config.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dmp-frontend/src/assets/config/config.json b/dmp-frontend/src/assets/config/config.json index 3424746da..95f451e8d 100644 --- a/dmp-frontend/src/assets/config/config.json +++ b/dmp-frontend/src/assets/config/config.json @@ -51,16 +51,16 @@ } ], "keycloak": { - "enabled": true, - "address": "http://dev03.local.cite.gr:60201/auth", - "realm": "dmp-development", - "flow": "standard", - "clientId": "dmp_webapp", - "silentCheckSsoRedirectUri": "http://localhost:4200/assets/silent-check-sso.html", - "scope": "openid profile email address phone", - "clientSecret": null, - "grantType": "code" - }, + "enabled": true, + "address": null, + "realm": null, + "flow": "standard", + "clientId": null, + "silentCheckSsoRedirectUri": "http://localhost:4200/assets/silent-check-sso.html", + "scope": "openid profile email address phone dmp_web", + "clientSecret": null, + "grantType": "code" + }, "zenodoConfiguration": { "clientId": "", "oauthUrl": "https://sandbox.zenodo.org/oauth/authorize", From 1cda821d9c21b6aec6c859ac1fcaacf41765f4dc Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 13:00:17 +0300 Subject: [PATCH 5/8] fix issue --- .../commons/enums/ExternalReferencesType.java | 11 --- .../v2/ExternalReferencesController.java | 66 ------------------ .../v2/ExternalValidationController.java | 37 ---------- .../config/entitiesV2/DataRepositoryUrls.java | 41 ------------ .../config/entitiesV2/ExternalUrlsBase.java | 67 ------------------- .../proxy/config/entitiesV2/JournalUrls.java | 41 ------------ .../proxy/config/entitiesV2/LicenseUrls.java | 41 ------------ .../config/entitiesV2/PubRepositoryUrls.java | 41 ------------ .../config/entitiesV2/PublicationUrls.java | 41 ------------ .../proxy/config/entitiesV2/TaxonomyUrls.java | 41 ------------ 10 files changed, 427 deletions(-) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java delete mode 100644 dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java deleted file mode 100644 index c3dccae5d..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/ExternalReferencesType.java +++ /dev/null @@ -1,11 +0,0 @@ -package eu.eudat.commons.enums; - -public enum ExternalReferencesType { - - taxonomies, - licenses, - publications, - journals, - pubRepositories, - dataRepositories -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java deleted file mode 100644 index 4c3b6ae37..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalReferencesController.java +++ /dev/null @@ -1,66 +0,0 @@ -package eu.eudat.controllers.v2; - -import eu.eudat.controllers.BaseController; -import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; -import eu.eudat.data.query.items.item.project.ProjectCriteriaRequest; -import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; -import eu.eudat.logic.proxy.config.exceptions.NoURLFound; -import eu.eudat.logic.services.ApiContext; -import eu.eudat.model.ExternalReference; -import eu.eudat.models.data.funder.Funder; -import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.project.Project; -import eu.eudat.models.data.security.Principal; -import eu.eudat.service.externalreferences.*; -import eu.eudat.types.ApiMessageCode; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@CrossOrigin -@RequestMapping(path = {"/api/external-references"}) -public class ExternalReferencesController extends BaseController { - - private final FunderService funderService; - private final ExternalReferencesService externalReferencesService; - private final ProjectService projectService; - - @Autowired - public ExternalReferencesController( - ApiContext apiContext, - FunderService funderService, - ExternalReferencesService externalReferencesService, - ProjectService projectService - ) { - super(apiContext); - this.funderService = funderService; - this.externalReferencesService = externalReferencesService; - this.projectService = projectService; - } - - @PostMapping(path = {"funders"}, consumes = "application/json", produces = "application/json") - public @ResponseBody ResponseEntity>> getWithExternal(@RequestBody FunderCriteriaRequest funderCriteria, Principal principal) throws NoURLFound, InstantiationException, HugeResultSet, IllegalAccessException { - List dataTable = this.funderService.getCriteriaWithExternal(funderCriteria, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); - } - - @PostMapping(path = {"projects"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseEntity>> getWithExternal(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) throws NoURLFound, InstantiationException, HugeResultSet, IllegalAccessException { - List dataTable = this.projectService.getCriteriaWithExternal(projectCriteria, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); - } - - @GetMapping(path = {"{externalType"}, produces = "application/json") - public @ResponseBody ResponseEntity>> listExternalReferecnes(@RequestParam(value = "externalType") String externalType, @RequestParam(value = "query", required = false) String query, - @RequestParam(value = "type", required = false) String type, Principal principal - ) throws HugeResultSet, NoURLFound { - List externalReferences = this.externalReferencesService.getExternal(externalType, query, type, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(externalReferences)); - } - -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java deleted file mode 100644 index 6f5a288e3..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/v2/ExternalValidationController.java +++ /dev/null @@ -1,37 +0,0 @@ -package eu.eudat.controllers.v2; - -import eu.eudat.controllers.BaseController; -import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; -import eu.eudat.logic.proxy.config.exceptions.NoURLFound; -import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.security.Principal; -import eu.eudat.service.ValidationService; -import eu.eudat.types.ApiMessageCode; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RestController -@CrossOrigin -@RequestMapping(path = {"api/validation"}) -public class ExternalValidationController extends BaseController { - - private ValidationService validationService; - - @Autowired - public ExternalValidationController(ApiContext apiContext, ValidationService validationService) { - super(apiContext); - this.validationService = validationService; - } - - @GetMapping(path = {""}, produces = "application/json") - public @ResponseBody - ResponseEntity> validate( - @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type, Principal principal - ) throws HugeResultSet, NoURLFound { - Boolean isValid = this.validationService.validateIdentifier(query, type, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(isValid).status(ApiMessageCode.NO_MESSAGE)); - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java deleted file mode 100644 index 1ede1feaf..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/DataRepositoryUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "repositories") -public class DataRepositoryUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java deleted file mode 100644 index 589efd336..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/ExternalUrlsBase.java +++ /dev/null @@ -1,67 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - - -public class ExternalUrlsBase { - - TaxonomyUrls taxonomyUrls; - - DataRepositoryUrls dataRepositoryUrls; - - JournalUrls journalUrls; - - LicenseUrls licenseUrls; - - PublicationUrls publicationUrls; - - PubRepositoryUrls pubRepositoryUrls; - - public TaxonomyUrls getTaxonomyUrls() { - return taxonomyUrls; - } - - public void setTaxonomyUrls(TaxonomyUrls taxonomyUrls) { - this.taxonomyUrls = taxonomyUrls; - } - - public DataRepositoryUrls getDataRepositoryUrls() { - return dataRepositoryUrls; - } - - public void setDataRepositoryUrls(DataRepositoryUrls dataRepositoryUrls) { - this.dataRepositoryUrls = dataRepositoryUrls; - } - - public JournalUrls getJournalUrls() { - return journalUrls; - } - - public void setJournalUrls(JournalUrls journalUrls) { - this.journalUrls = journalUrls; - } - - public LicenseUrls getLicenseUrls() { - return licenseUrls; - } - - public void setLicenseUrls(LicenseUrls licenseUrls) { - this.licenseUrls = licenseUrls; - } - - public PublicationUrls getPublicationUrls() { - return publicationUrls; - } - - public void setPublicationUrls(PublicationUrls publicationUrls) { - this.publicationUrls = publicationUrls; - } - - public PubRepositoryUrls getPubRepositoryUrls() { - return pubRepositoryUrls; - } - - public void setPubRepositoryUrls(PubRepositoryUrls pubRepositoryUrls) { - this.pubRepositoryUrls = pubRepositoryUrls; - } -} - - diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java deleted file mode 100644 index bfc3ac854..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/JournalUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "journal") -public class JournalUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java deleted file mode 100644 index 32f7b1ec6..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/LicenseUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "licenses") -public class LicenseUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java deleted file mode 100644 index a0506d208..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PubRepositoryUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "pubRepositories") -public class PubRepositoryUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java deleted file mode 100644 index c9209af9d..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/PublicationUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "publications") -public class PublicationUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java deleted file mode 100644 index d0e2cf03d..000000000 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/entitiesV2/TaxonomyUrls.java +++ /dev/null @@ -1,41 +0,0 @@ -package eu.eudat.logic.proxy.config.entitiesV2; - -import eu.eudat.proxy.config.FetchStrategy; -import eu.eudat.proxy.config.UrlConfiguration; -import eu.eudat.proxy.config.entities.GenericUrls; -import jakarta.xml.bind.annotation.XmlElement; -import jakarta.xml.bind.annotation.XmlElementWrapper; -import jakarta.xml.bind.annotation.XmlRootElement; - -import java.io.Serializable; -import java.util.List; - -@XmlRootElement(name = "taxonomies") -public class TaxonomyUrls extends GenericUrls implements Serializable { - - private static final long serialVersionUID = -5076364662014107275L; - - List urls; - FetchStrategy fetchMode; - - @Override - public List getUrls() { - return urls; - } - - @XmlElementWrapper - @XmlElement(name = "urlConfig") - public void setUrls(List urls) { - this.urls = urls; - } - - @Override - public FetchStrategy getFetchMode() { - return fetchMode; - } - - @XmlElement(name = "fetchMode") - public void setFetchMode(FetchStrategy fetchMode) { - this.fetchMode = fetchMode; - } -} From b7d22b5b07e3b4301fb57a0a09b7518511df2999 Mon Sep 17 00:00:00 2001 From: Thomas Georgios Giannos Date: Wed, 18 Oct 2023 13:04:53 +0300 Subject: [PATCH 6/8] Moving existing entities from Data module to Core module --- .../eu/eudat/commons/enums/EntityType.java | 4 ++ .../java/eu/eudat/commons/enums/IsActive.java | 6 +- .../enums/old/notification/ActiveStatus.java | 27 +++++++ .../enums/old}/notification/ContactType.java | 2 +- .../old}/notification/NotificationType.java | 2 +- .../enums/old}/notification/NotifyState.java | 2 +- .../main/java/eu/eudat/data/old}/Content.java | 4 +- .../src/main/java/eu/eudat/data/old}/DMP.java | 2 +- .../eu/eudat/data/old}/DMPDatasetProfile.java | 2 +- .../eu/eudat/data/old}/DMPOrganisation.java | 2 +- .../java/eu/eudat/data/old}/DMPProfile.java | 4 +- .../eu/eudat/data/old}/DMPResearcher.java | 2 +- .../eu/eudat/data/old}/DataRepository.java | 4 +- .../main/java/eu/eudat/data/old}/Dataset.java | 4 +- .../data/old}/DatasetDataRepository.java | 4 +- .../data/old}/DatasetExternalDataset.java | 4 +- .../data/old}/DatasetProfileRuleset.java | 2 +- .../data/old}/DatasetProfileViewstyle.java | 2 +- .../eu/eudat/data/old}/DatasetRegistry.java | 2 +- .../eu/eudat/data/old}/DatasetService.java | 2 +- .../eudat/data/old}/DescriptionTemplate.java | 2 +- .../eu/eudat/data/old}/EmailConfirmation.java | 2 +- .../java/eu/eudat/data/old}/EntityDoi.java | 5 +- .../eu/eudat/data/old}/ExternalDataset.java | 5 +- .../java/eu/eudat/data/old}/FileUpload.java | 5 +- .../main/java/eu/eudat/data/old}/Funder.java | 3 +- .../main/java/eu/eudat/data/old}/Grant.java | 5 +- .../java/eu/eudat/data/old}/Invitation.java | 4 +- .../main/java/eu/eudat/data/old}/Lock.java | 4 +- .../java/eu/eudat/data/old}/Notification.java | 10 +-- .../java/eu/eudat/data/old}/Organisation.java | 4 +- .../main/java/eu/eudat/data/old}/Project.java | 5 +- .../java/eu/eudat/data/old}/Registry.java | 4 +- .../java/eu/eudat/data/old}/Researcher.java | 5 +- .../main/java/eu/eudat/data/old}/Service.java | 2 +- .../main/java/eu/eudat/data/old}/UserDMP.java | 4 +- .../eudat/data/old}/UserDatasetProfile.java | 4 +- .../java/eu/eudat/data/old}/UserInfo.java | 4 +- .../java/eu/eudat/data/old}/UserRole.java | 4 +- .../eudat/data/old}/helpers/EntityBinder.java | 2 +- .../data/converters/DateToUTCConverter.java | 49 ------------- .../DataManagementPlanBlueprintCriteria.java | 2 +- .../criteria/DataManagementPlanCriteria.java | 8 +-- .../DataManagementPlanProfileCriteria.java | 2 +- .../DataManagementPlanPublicCriteria.java | 2 +- .../dao/criteria/DataRepositoryCriteria.java | 2 +- .../data/dao/criteria/DatasetCriteria.java | 3 +- .../dao/criteria/DatasetProfileCriteria.java | 2 +- .../DatasetProfileWizardCriteria.java | 2 +- .../dao/criteria/DatasetPublicCriteria.java | 2 +- .../DatasetWizardUserDmpCriteria.java | 4 +- .../criteria/EmailConfirmationCriteria.java | 2 +- .../dao/criteria/ExternalDatasetCriteria.java | 2 +- .../data/dao/criteria/FunderCriteria.java | 2 +- .../data/dao/criteria/GrantCriteria.java | 3 +- .../data/dao/criteria/InvitationCriteria.java | 2 +- .../eudat/data/dao/criteria/LockCriteria.java | 4 +- .../dao/criteria/NotificationCriteria.java | 4 +- .../dao/criteria/OrganisationCriteria.java | 2 +- .../data/dao/criteria/ProjectCriteria.java | 2 +- .../data/dao/criteria/RegistryCriteria.java | 2 +- .../data/dao/criteria/ResearcherCriteria.java | 2 +- .../data/dao/criteria/ServiceCriteria.java | 2 +- .../data/dao/criteria/UserInfoCriteria.java | 2 +- .../data/dao/criteria/UserRoleCriteria.java | 2 +- .../eudat/data/dao/entities/ContentDao.java | 2 +- .../data/dao/entities/ContentDaoImpl.java | 2 +- .../eu/eudat/data/dao/entities/DMPDao.java | 5 +- .../eudat/data/dao/entities/DMPDaoImpl.java | 4 +- .../data/dao/entities/DMPProfileDao.java | 3 +- .../data/dao/entities/DMPProfileDaoImpl.java | 2 +- .../data/dao/entities/DataRepositoryDao.java | 2 +- .../dao/entities/DataRepositoryDaoImpl.java | 2 +- .../eudat/data/dao/entities/DatasetDao.java | 4 +- .../data/dao/entities/DatasetDaoImpl.java | 7 +- .../entities/DatasetExternalDatasetDao.java | 2 +- .../DatasetExternalDatasetDaoImpl.java | 2 +- .../data/dao/entities/DatasetProfileDao.java | 2 +- .../dao/entities/DatasetProfileDaoImpl.java | 2 +- .../data/dao/entities/DatasetServiceDao.java | 2 +- .../dao/entities/DatasetServiceDaoImpl.java | 2 +- .../dao/entities/DmpDatasetProfileDao.java | 2 +- .../entities/DmpDatasetProfileDaoImpl.java | 3 +- .../dao/entities/EmailConfirmationDao.java | 2 +- .../entities/EmailConfirmationDaoImpl.java | 2 +- .../eudat/data/dao/entities/EntityDoiDao.java | 2 +- .../data/dao/entities/EntityDoiDaoImpl.java | 2 +- .../data/dao/entities/ExternalDatasetDao.java | 2 +- .../dao/entities/ExternalDatasetDaoImpl.java | 2 +- .../data/dao/entities/FileUploadDao.java | 2 +- .../data/dao/entities/FileUploadDaoImpl.java | 2 +- .../eu/eudat/data/dao/entities/FunderDao.java | 4 +- .../data/dao/entities/FunderDaoImpl.java | 4 +- .../eu/eudat/data/dao/entities/GrantDao.java | 4 +- .../eudat/data/dao/entities/GrantDaoImpl.java | 7 +- .../data/dao/entities/InvitationDao.java | 2 +- .../data/dao/entities/InvitationDaoImpl.java | 2 +- .../eu/eudat/data/dao/entities/LockDao.java | 2 +- .../eudat/data/dao/entities/LockDaoImpl.java | 2 +- .../data/dao/entities/NotificationDao.java | 2 +- .../dao/entities/NotificationDaoImpl.java | 3 +- .../data/dao/entities/OrganisationDao.java | 4 +- .../dao/entities/OrganisationDaoImpl.java | 6 +- .../eudat/data/dao/entities/ProjectDao.java | 4 +- .../data/dao/entities/ProjectDaoImpl.java | 4 +- .../eudat/data/dao/entities/RegistryDao.java | 2 +- .../data/dao/entities/RegistryDaoImpl.java | 2 +- .../data/dao/entities/ResearcherDao.java | 2 +- .../data/dao/entities/ResearcherDaoImpl.java | 2 +- .../eudat/data/dao/entities/ServiceDao.java | 2 +- .../data/dao/entities/ServiceDaoImpl.java | 2 +- .../dao/entities/UserDatasetProfileDao.java | 3 +- .../entities/UserDatasetProfileDaoImpl.java | 3 +- .../eudat/data/dao/entities/UserDmpDao.java | 2 +- .../data/dao/entities/UserDmpDaoImpl.java | 2 +- .../eudat/data/dao/entities/UserInfoDao.java | 2 +- .../data/dao/entities/UserInfoDaoImpl.java | 2 +- .../eudat/data/dao/entities/UserRoleDao.java | 4 +- .../data/dao/entities/UserRoleDaoImpl.java | 4 +- .../notification/ActiveStatus.java | 27 ------- ...taManagementPlanBlueprintTableRequest.java | 2 +- .../DatasetWizardAutocompleteRequest.java | 5 +- .../DatasetProfileAutocompleteRequest.java | 2 +- ...tasetProfileWizardAutocompleteRequest.java | 2 +- .../DataManagementPlanCriteriaRequest.java | 4 +- ...aManagementPlanProfileCriteriaRequest.java | 2 +- .../item/funder/FunderCriteriaRequest.java | 2 +- .../item/grant/GrantCriteriaRequest.java | 2 +- .../items/item/lock/LockCriteriaRequest.java | 2 +- .../item/project/ProjectCriteriaRequest.java | 2 +- .../researcher/ResearcherCriteriaRequest.java | 4 +- .../item/userinfo/UserInfoRequestItem.java | 2 +- .../dataset/DatasetPublicTableRequest.java | 2 +- .../table/dataset/DatasetTableRequest.java | 4 +- .../DatasetProfileTableRequestItem.java | 2 +- .../dmp/DataManagementPlanTableRequest.java | 2 +- .../DataManagmentPlanPublicTableRequest.java | 2 +- ...DataManagementPlanProfileTableRequest.java | 2 +- .../ExternalDatasetTableRequest.java | 3 +- .../items/table/grant/GrantTableRequest.java | 2 +- .../items/table/lock/LockTableRequest.java | 3 +- .../OrganisationsTableRequest.java | 2 +- .../userinfo/UserInfoTableRequestItem.java | 2 +- .../main/java/eu/eudat/query/DMPQuery.java | 8 +-- .../java/eu/eudat/query/DatasetQuery.java | 4 +- .../main/java/eu/eudat/query/GrantQuery.java | 4 +- .../main/java/eu/eudat/query/LockQuery.java | 4 +- .../main/java/eu/eudat/query/UserQuery.java | 2 +- .../main/java/eu/eudat/controllers/Admin.java | 6 +- .../controllers/DMPProfileController.java | 5 +- .../main/java/eu/eudat/controllers/DMPs.java | 8 +-- .../eudat/controllers/DataRepositories.java | 2 +- .../controllers/DatasetProfileController.java | 8 +-- .../java/eu/eudat/controllers/Datasets.java | 8 +-- .../eudat/controllers/ExternalDatasets.java | 4 +- .../eu/eudat/controllers/FileController.java | 6 +- .../java/eu/eudat/controllers/Grants.java | 9 +-- .../eudat/controllers/JournalsController.java | 2 - .../eu/eudat/controllers/LockController.java | 2 +- .../controllers/QuickWizardController.java | 12 ++-- .../java/eu/eudat/controllers/Registries.java | 2 +- .../java/eu/eudat/controllers/Services.java | 2 +- .../java/eu/eudat/controllers/Validation.java | 7 -- .../eudat/interceptors/UserInterceptor.java | 4 +- .../logic/builders/entity/ContentBuilder.java | 2 +- .../builders/entity/CredentialBuilder.java | 2 +- .../entity/DatasetProfileBuilder.java | 4 +- .../builders/entity/UserInfoBuilder.java | 6 +- .../builders/entity/UserRoleBuilder.java | 4 +- .../builders/model/models/FunderBuilder.java | 4 +- .../builders/model/models/GrantBuilder.java | 6 +- .../builders/model/models/ProjectBuilder.java | 6 +- .../eu/eudat/logic/managers/AdminManager.java | 2 +- .../logic/managers/ContactEmailManager.java | 2 +- .../logic/managers/DashBoardManager.java | 8 +-- .../managers/DataManagementPlanManager.java | 38 +++++----- .../DataManagementProfileManager.java | 6 +- .../logic/managers/DataRepositoryManager.java | 2 +- .../eudat/logic/managers/DatasetManager.java | 71 +++++++++---------- .../logic/managers/DatasetProfileManager.java | 12 +--- .../logic/managers/DatasetWizardManager.java | 8 +-- .../managers/EmailConfirmationManager.java | 5 +- .../managers/ExternalDatasetManager.java | 7 +- .../eu/eudat/logic/managers/FileManager.java | 5 +- .../eudat/logic/managers/FunderManager.java | 10 +-- .../eu/eudat/logic/managers/GrantManager.java | 39 +++++----- .../logic/managers/InvitationsManager.java | 8 +-- .../eudat/logic/managers/LicenseManager.java | 3 - .../eu/eudat/logic/managers/LockManager.java | 24 +++---- .../MergeEmailConfirmationManager.java | 6 +- .../eudat/logic/managers/MetricsManager.java | 2 +- .../logic/managers/NotificationManager.java | 8 +-- .../logic/managers/OrganisationsManager.java | 21 +++--- .../logic/managers/PrefillingManager.java | 2 +- .../eudat/logic/managers/ProjectManager.java | 9 +-- .../logic/managers/QuickWizardManager.java | 12 ++-- .../eu/eudat/logic/managers/RDAManager.java | 2 +- .../eudat/logic/managers/RegistryManager.java | 2 +- .../logic/managers/ResearcherManager.java | 5 +- .../eudat/logic/managers/ServiceManager.java | 2 +- .../UnlinkEmailConfirmationManager.java | 4 +- .../eu/eudat/logic/managers/UserManager.java | 20 +++--- .../mapper/elastic/CollaboratorMapper.java | 2 +- .../logic/mapper/elastic/DatasetMapper.java | 4 +- .../mapper/elastic/DatasetTemplateMapper.java | 3 +- .../eudat/logic/mapper/elastic/DmpMapper.java | 2 +- .../mapper/elastic/OrganizationMapper.java | 2 +- .../elastic/criteria/DmpCriteriaMapper.java | 2 +- .../mapper/prefilling/PrefillingMapper.java | 4 +- .../mapper/DMPToDepositMapper.java | 3 +- .../AbstractAuthenticationService.java | 2 +- ...erifiedUserEmailAuthenticationService.java | 5 +- .../VerifiedUserAuthenticationService.java | 4 +- .../utilities/ConfirmationEmailService.java | 2 +- .../ConfirmationEmailServiceImpl.java | 2 +- .../services/utilities/InvitationService.java | 12 ++-- .../utilities/InvitationServiceImpl.java | 17 ++--- .../utilities/documents/word/WordBuilder.java | 9 ++- .../datasetProfileModel/DatasetProfile.java | 2 +- .../dmpBlueprintModel/DmpBlueprint.java | 2 +- .../notification/NotificationScheduleJob.java | 6 +- .../recent/model/RecentDatasetModel.java | 2 +- .../recent/model/RecentDmpModel.java | 2 +- .../datarepository/DataRepositoryModel.java | 4 +- .../models/data/dataset/DataRepository.java | 8 +-- .../eu/eudat/models/data/dataset/Dataset.java | 18 ++--- .../data/dataset/DatasetOverviewModel.java | 2 +- .../eudat/models/data/dataset/Registry.java | 8 +-- .../eu/eudat/models/data/dataset/Service.java | 8 +-- .../DatasetProfileAutocompleteItem.java | 2 +- .../DatasetProfileListingModel.java | 2 +- .../DatasetProfileOverviewModel.java | 2 +- .../DataManagentPlanListingModel.java | 2 +- .../datasetwizard/DatasetWizardModel.java | 8 +-- .../models/data/dmp/AssociatedProfile.java | 2 +- .../models/data/dmp/DataManagementPlan.java | 4 +- .../dmp/DataManagementPlanEditorModel.java | 4 +- .../DataManagementPlanNewVersionModel.java | 10 +-- .../eudat/models/data/dmp/Organisation.java | 8 +-- .../eu/eudat/models/data/dmp/Researcher.java | 8 +-- .../java/eu/eudat/models/data/doi/Doi.java | 2 +- .../ExternalDatasetListingModel.java | 2 +- .../externaldataset/ExternalDatasetModel.java | 4 +- .../eu/eudat/models/data/funder/Funder.java | 11 +-- .../data/funder/FunderOverviewModel.java | 2 +- .../eu/eudat/models/data/grant/Grant.java | 18 ++--- .../models/data/grant/GrantCriteriaModel.java | 4 +- .../models/data/grant/GrantListingModel.java | 14 ++-- .../models/data/grant/GrantOverviewModel.java | 2 +- .../models/data/license/LicenseModel.java | 4 +- ...taManagementPlanBlueprintListingModel.java | 2 +- .../DataManagementPlanListingModel.java | 4 +- .../DataManagementPlanOverviewModel.java | 7 +- ...DataManagementPlanProfileListingModel.java | 2 +- .../listingmodels/DatasetListingModel.java | 6 +- .../listingmodels/UserInfoListingModel.java | 4 +- .../listingmodels/VersionListingModel.java | 2 +- .../java/eu/eudat/models/data/lock/Lock.java | 8 +-- .../models/data/notiication/Notification.java | 16 ++--- .../eu/eudat/models/data/project/Project.java | 13 ++-- .../data/publication/PublicationModel.java | 4 +- .../quickwizard/DatasetCreateWizardModel.java | 2 - .../DatasetDescriptionQuickWizardModel.java | 2 +- .../quickwizard/DmpCreateWizardModel.java | 1 - .../data/quickwizard/DmpQuickWizardModel.java | 6 +- .../quickwizard/FunderQuickWizardModel.java | 2 +- .../data/rda/ContactRDAExportModel.java | 2 +- .../data/rda/DatasetRDAExportModel.java | 2 +- .../rda/DmpContributorRDAExportModel.java | 2 +- .../models/data/rda/DmpRDAExportModel.java | 6 +- .../data/rda/FundingRDAExportModel.java | 4 +- .../data/rda/ProjectRDAExportModel.java | 2 +- .../eudat/models/data/rda/RDAExportModel.java | 6 +- .../models/data/registries/RegistryModel.java | 6 +- .../models/data/researcher/Researcher.java | 8 +-- .../models/data/services/ServiceModel.java | 4 +- .../models/data/taxonomy/TaxonomyModel.java | 4 +- .../urls/DataManagementPlanUrlListing.java | 2 +- .../models/data/urls/DatasetUrlListing.java | 2 +- .../eudat/models/data/userinfo/UserInfo.java | 8 +-- .../userinfo/UserInfoInvitationModel.java | 10 +-- .../data/userinfo/UserListingModel.java | 4 +- .../models/data/userinfo/UserProfile.java | 8 +-- .../models/rda/mapper/ContactRDAMapper.java | 3 +- .../rda/mapper/ContributorRDAMapper.java | 4 +- .../models/rda/mapper/DatasetRDAMapper.java | 8 +-- .../eudat/models/rda/mapper/DmpRDAMapper.java | 2 +- .../models/rda/mapper/FundingRDAMapper.java | 4 +- .../models/rda/mapper/ProjectRDAMapper.java | 27 ++++--- .../eu/eudat/models/v2/AccountBuilder.java | 4 +- .../validators/GrantModelValidator.java | 2 +- .../dataset/DatasetPublicCriteria.java | 2 +- .../dmp/DataManagementPlanPublicCriteria.java | 2 +- .../DataManagementPlanPublicManager.java | 2 +- .../managers/DatasetPublicManager.java | 4 +- .../AssociatedProfilePublicModel.java | 2 +- .../DatasetProfilePublicModel.java | 2 +- .../DataRepositoryPublicModel.java | 2 +- .../ExternalDatasetPublicListingModel.java | 2 +- .../datasetwizard/RegistryPublicModel.java | 2 +- .../datasetwizard/ServicePublicModel.java | 2 +- .../publicapi/models/doi/DoiPublicModel.java | 2 +- .../funder/FunderPublicOverviewModel.java | 2 +- .../grant/GrantPublicOverviewModel.java | 2 +- .../DataManagementPlanPublicListingModel.java | 4 +- .../DatasetPublicListingModel.java | 6 +- .../organisation/OrganizationPublicModel.java | 2 +- .../DataManagementPlanPublicModel.java | 9 ++- .../overviewmodels/DatasetPublicModel.java | 2 +- .../researcher/ResearcherPublicModel.java | 2 +- .../models/user/UserInfoPublicModel.java | 4 +- .../dataset/DatasetPublicTableRequest.java | 2 +- .../DataManagmentPlanPublicTableRequest.java | 3 +- 313 files changed, 700 insertions(+), 828 deletions(-) create mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java create mode 100644 dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ActiveStatus.java rename dmp-backend/{data/src/main/java/eu/eudat/data/enumeration => core/src/main/java/eu/eudat/commons/enums/old}/notification/ContactType.java (86%) rename dmp-backend/{data/src/main/java/eu/eudat/data/enumeration => core/src/main/java/eu/eudat/commons/enums/old}/notification/NotificationType.java (93%) rename dmp-backend/{data/src/main/java/eu/eudat/data/enumeration => core/src/main/java/eu/eudat/commons/enums/old}/notification/NotifyState.java (91%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Content.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DMP.java (99%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DMPDatasetProfile.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DMPOrganisation.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DMPProfile.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DMPResearcher.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DataRepository.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Dataset.java (99%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetDataRepository.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetExternalDataset.java (95%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetProfileRuleset.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetProfileViewstyle.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetRegistry.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DatasetService.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/DescriptionTemplate.java (99%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/EmailConfirmation.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/EntityDoi.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/ExternalDataset.java (95%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/FileUpload.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Funder.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Grant.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Invitation.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Lock.java (95%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Notification.java (92%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Organisation.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Project.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Registry.java (97%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Researcher.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/Service.java (99%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/UserDMP.java (96%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/UserDatasetProfile.java (95%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/UserInfo.java (98%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/UserRole.java (94%) rename dmp-backend/{data/src/main/java/eu/eudat/data/entities => core/src/main/java/eu/eudat/data/old}/helpers/EntityBinder.java (87%) delete mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java delete mode 100644 dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ActiveStatus.java diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java new file mode 100644 index 000000000..c5c56dbbd --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java @@ -0,0 +1,4 @@ +package eu.eudat.commons.enums; + +public enum EntityType { +} diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java index 4c94619c5..4bb2737af 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java @@ -6,8 +6,8 @@ import java.util.Map; public enum IsActive implements DatabaseEnum { - Inactive((short)0), - Active( (short)1); + Inactive((short) 0), + Active((short) 1); private final Short value; @@ -20,7 +20,7 @@ public enum IsActive implements DatabaseEnum { } private static final Map map = EnumUtils.getEnumValueMap(IsActive.class); - + public static IsActive of(Short i) { return map.get(i); } diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ActiveStatus.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ActiveStatus.java new file mode 100644 index 000000000..918b7b193 --- /dev/null +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ActiveStatus.java @@ -0,0 +1,27 @@ +package eu.eudat.commons.enums.old.notification; + +public enum ActiveStatus { + ACTIVE(0), + INACTIVE(1); + + private int status; + + ActiveStatus(int status) { + this.status = status; + } + + public int getStatus() { + return status; + } + + public ActiveStatus fromInteger(int status) { + switch (status) { + case 0: + return ACTIVE; + case 1: + return INACTIVE; + default: + throw new RuntimeException("Unsupported Active Status"); + } + } +} diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ContactType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ContactType.java similarity index 86% rename from dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ContactType.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ContactType.java index 3bbbceec9..fc1db82b3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ContactType.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ContactType.java @@ -1,4 +1,4 @@ -package eu.eudat.data.enumeration.notification; +package eu.eudat.commons.enums.old.notification; public enum ContactType { EMAIL(0); diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotificationType.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotificationType.java similarity index 93% rename from dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotificationType.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotificationType.java index 5f5ece40d..a87cd100c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotificationType.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotificationType.java @@ -1,4 +1,4 @@ -package eu.eudat.data.enumeration.notification; +package eu.eudat.commons.enums.old.notification; public enum NotificationType { DMP_MODIFIED(0), diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotifyState.java b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotifyState.java similarity index 91% rename from dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotifyState.java rename to dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotifyState.java index b7e75317f..c9f320e66 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/NotifyState.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotifyState.java @@ -1,4 +1,4 @@ -package eu.eudat.data.enumeration.notification; +package eu.eudat.commons.enums.old.notification; public enum NotifyState { PENDING(0), diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java index 973ccbc80..8e31ae9b7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java similarity index 99% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java index e982d74ec..1fb54000a 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPDatasetProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPDatasetProfile.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java index 358a886f4..85a799c56 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPDatasetProfile.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPOrganisation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPOrganisation.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPOrganisation.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DMPOrganisation.java index 6cbd8d1a1..e3b9b40c7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPOrganisation.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPOrganisation.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPProfile.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPProfile.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DMPProfile.java index 85261b21a..78c30cc04 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPProfile.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPProfile.java @@ -1,8 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPResearcher.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPResearcher.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPResearcher.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DMPResearcher.java index eb1f08108..9f419d6c7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPResearcher.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPResearcher.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java index 7f13aa58a..cede009d5 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java @@ -1,7 +1,7 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java similarity index 99% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java index 2291f5934..64f2db9df 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Dataset.java @@ -1,8 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetDataRepository.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetDataRepository.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetDataRepository.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetDataRepository.java index 4142e4c02..f74f462dc 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetDataRepository.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetDataRepository.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetExternalDataset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetExternalDataset.java similarity index 95% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetExternalDataset.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetExternalDataset.java index dbabee5ec..c27a23091 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetExternalDataset.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetExternalDataset.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileRuleset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileRuleset.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileRuleset.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileRuleset.java index a97ba3a34..e8ca1303d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileRuleset.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileRuleset.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileViewstyle.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileViewstyle.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileViewstyle.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileViewstyle.java index 1ffcfd7f2..09df97405 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileViewstyle.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetProfileViewstyle.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetRegistry.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetRegistry.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetRegistry.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetRegistry.java index 1523db218..14c87e58c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetRegistry.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetRegistry.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetService.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetService.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetService.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetService.java index c9c52999d..8b452e707 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetService.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetService.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.queryable.queryableentity.DataEntity; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DescriptionTemplate.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java similarity index 99% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/DescriptionTemplate.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java index d08729b6c..275f9b827 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/DescriptionTemplate.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.DescriptionTemplateTypeEntity; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/EmailConfirmation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/EmailConfirmation.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java index 2f891c627..c1560c307 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/EmailConfirmation.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; import eu.eudat.queryable.queryableentity.DataEntity; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/EntityDoi.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/EntityDoi.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/EntityDoi.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/EntityDoi.java index c153a7502..f0df55771 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/EntityDoi.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/EntityDoi.java @@ -1,9 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.Type; import jakarta.persistence.*; import java.util.Arrays; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java similarity index 95% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java index 42a322fa2..e7b276bfe 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java @@ -1,9 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import jakarta.persistence.*; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/FileUpload.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/FileUpload.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java index 81204dfe4..275421361 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/FileUpload.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java @@ -1,9 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.Type; import jakarta.persistence.*; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java index 8ccfa3b9a..4e4e0810e 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Funder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java @@ -1,7 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import jakarta.persistence.*; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java index 705748a21..e8996e02b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Grant.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java @@ -1,10 +1,9 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import jakarta.persistence.*; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Invitation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Invitation.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java index 015b50f62..b8da71354 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Invitation.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Lock.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java similarity index 95% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Lock.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java index de4232f76..4f50dd645 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Lock.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java @@ -1,7 +1,7 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Notification.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java similarity index 92% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Notification.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java index 65647f617..143237d15 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Notification.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java @@ -1,9 +1,9 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.ContactType; -import eu.eudat.data.enumeration.notification.NotificationType; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.ContactType; +import eu.eudat.commons.enums.old.notification.NotificationType; +import eu.eudat.commons.enums.old.notification.NotifyState; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Organisation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Organisation.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java index 0fa52bbac..6cfded45d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Organisation.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java @@ -1,7 +1,7 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java index 6a815172f..bccc1ef58 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java @@ -1,9 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import jakarta.persistence.*; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java similarity index 97% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java index b61201bc8..e70916dd1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java @@ -1,8 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java index f28f26394..a11bb1520 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java @@ -1,10 +1,9 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; -import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import jakarta.persistence.*; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java similarity index 99% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java index 9f7b87144..324b0829a 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.converters.DateToUTCConverter; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java similarity index 96% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java index 060c83ad1..a42e2e862 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDatasetProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java similarity index 95% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDatasetProfile.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java index 9369f0569..1ca55a3a4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDatasetProfile.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserInfo.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java similarity index 98% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/UserInfo.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java index 96b52887a..cb2e04992 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserInfo.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java @@ -1,8 +1,8 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; import eu.eudat.data.CredentialEntity; import eu.eudat.data.converters.DateToUTCConverter; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java similarity index 94% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java index 1d00d08c4..0c3c8c385 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java @@ -1,6 +1,6 @@ -package eu.eudat.data.entities; +package eu.eudat.data.old; -import eu.eudat.data.entities.helpers.EntityBinder; +import eu.eudat.data.old.helpers.EntityBinder; import eu.eudat.queryable.queryableentity.DataEntity; import org.hibernate.annotations.GenericGenerator; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/entities/helpers/EntityBinder.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/helpers/EntityBinder.java similarity index 87% rename from dmp-backend/data/src/main/java/eu/eudat/data/entities/helpers/EntityBinder.java rename to dmp-backend/core/src/main/java/eu/eudat/data/old/helpers/EntityBinder.java index c640e6d42..6a8148380 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/entities/helpers/EntityBinder.java +++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/helpers/EntityBinder.java @@ -1,4 +1,4 @@ -package eu.eudat.data.entities.helpers; +package eu.eudat.data.old.helpers; import jakarta.persistence.Tuple; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java b/dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java deleted file mode 100644 index 3a9207eb2..000000000 --- a/dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java +++ /dev/null @@ -1,49 +0,0 @@ -package eu.eudat.data.converters; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.format.datetime.DateFormatter; - -import jakarta.persistence.AttributeConverter; -import jakarta.persistence.Converter; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - -/** - * Created by ikalyvas on 9/25/2018. - */ -@Converter -public class DateToUTCConverter implements AttributeConverter { - private static final Logger logger = LoggerFactory.getLogger(DateToUTCConverter.class); - - @Override - public Date convertToDatabaseColumn(Date attribute) { - if(attribute == null) return null; - DateFormat formatterIST = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - formatterIST.setTimeZone(TimeZone.getTimeZone("UTC")); - try { - String date = formatterIST.format(attribute); - return formatterIST.parse(date); - } catch (ParseException e) { - logger.error(e.getMessage(), e); - } - return null; - } - - @Override - public Date convertToEntityAttribute(Date dbData) { - if(dbData == null) return null; - DateFormat formatterIST = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - formatterIST.setTimeZone(TimeZone.getTimeZone("UTC")); - try { - String date = formatterIST.format(dbData); - return formatterIST.parse(date); - } catch (ParseException e) { - logger.error(e.getMessage(), e); - } - return null; - } -} diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java index f2348d016..8af3c8281 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanBlueprintCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; public class DataManagementPlanBlueprintCriteria extends Criteria { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java index 4dab4e2f0..97cba9e23 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java @@ -1,8 +1,8 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.DMPProfile; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.DMPProfile; +import eu.eudat.data.old.Grant; import java.util.Date; import java.util.List; @@ -12,7 +12,7 @@ public class DataManagementPlanCriteria extends Criteria { private Date periodStart; private Date periodEnd; private DMPProfile profile; - private List grants; + private List grants; private boolean allVersions; private List groupIds; private Integer status; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanProfileCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanProfileCriteria.java index a601fcd6b..0e47f401b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanProfileCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanProfileCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; /** * Created by ikalyvas on 3/21/2018. diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java index cc96186fc..db56ffdc6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanPublicCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.types.grant.GrantStateType; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java index ecd577308..e1e9b73e5 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java index d730d0127..f78caa2dd 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java @@ -1,8 +1,7 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.elastic.entities.Tag; -import eu.eudat.types.grant.GrantStateType; import java.util.Date; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java index c859cb2c8..e42bb5e86 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import java.util.Date; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java index 9e1d5d9e2..3f5b0940f 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java index 9554ed5b4..e0a034de2 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetPublicCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.elastic.entities.Tag; import eu.eudat.types.grant.GrantStateType; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java index c5cbfc984..d92440c88 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java @@ -1,8 +1,8 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.UserInfo; public class DatasetWizardUserDmpCriteria extends Criteria { private UserInfo userInfo; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/EmailConfirmationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/EmailConfirmationCriteria.java index 1436752b9..76235c287 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/EmailConfirmationCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/EmailConfirmationCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.EmailConfirmation; +import eu.eudat.data.old.EmailConfirmation; public class EmailConfirmationCriteria extends Criteria{ } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java index a5a6275e8..7b5f501a4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.ExternalDataset; +import eu.eudat.data.old.ExternalDataset; import java.util.UUID; public class ExternalDatasetCriteria extends Criteria { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/FunderCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/FunderCriteria.java index b67983aa0..52b952170 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/FunderCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/FunderCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Funder; +import eu.eudat.data.old.Funder; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/GrantCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/GrantCriteria.java index 1cfd88be7..1b0996b67 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/GrantCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/GrantCriteria.java @@ -1,7 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Grant; -import eu.eudat.types.grant.GrantStateType; +import eu.eudat.data.old.Grant; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java index 50cdeb6a1..c93ce4b9c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Invitation; +import eu.eudat.data.old.Invitation; public class InvitationCriteria extends Criteria { } diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/LockCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/LockCriteria.java index 55b8e48e5..7a888209e 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/LockCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/LockCriteria.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Lock; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Lock; +import eu.eudat.data.old.UserInfo; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/NotificationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/NotificationCriteria.java index 1cd361014..1ed4c3b0d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/NotificationCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/NotificationCriteria.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.NotifyState; public class NotificationCriteria { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java index 30e437df0..6fa34499e 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Organisation; +import eu.eudat.data.old.Organisation; public class OrganisationCriteria extends Criteria { private String labelLike; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java index a9d266ea6..61a1d2dfe 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Project; +import eu.eudat.data.old.Project; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java index 186f5e281..ccd9dce71 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java index 21cb1e5d2..f656cced3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java index 715511fb3..7bf9e277f 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java index 3d21d809e..82d2c6247 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java index 10654c0a6..d9e8e02d1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java @@ -1,6 +1,6 @@ package eu.eudat.data.dao.criteria; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserRole; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java index 438f9b3c5..abebdbfa2 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.Content; +import eu.eudat.data.old.Content; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java index 1d3f559d5..2ebc1dfaf 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Content; +import eu.eudat.data.old.Content; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java index 3073e1857..3946cc1cb 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java @@ -3,9 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java index aa1c7898e..27b49a4cb 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java @@ -4,8 +4,8 @@ import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDao.java index 36fc58752..bdef8642c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDao.java @@ -3,8 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria; import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java index 7033473c2..9d3392be5 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPProfileDaoImpl.java @@ -4,7 +4,7 @@ import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria; import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java index 68b64022b..fc3839342 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.DataRepositoryCriteria; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java index 4658b44f6..f64e1089a 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DataRepositoryCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java index 126958e11..6683a9ab1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.DatasetCriteria; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java index 841c2c08c..4b9f25395 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java @@ -3,10 +3,9 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DatasetCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDao.java index 6947aeb75..a77ac8579 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.DatasetExternalDataset; +import eu.eudat.data.old.DatasetExternalDataset; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDaoImpl.java index a0f7f6afa..7fee74ca0 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetExternalDatasetDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DatasetExternalDataset; +import eu.eudat.data.old.DatasetExternalDataset; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java index 10b4e85a7..fef12c40d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.queryable.QueryableList; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java index 03a942969..2c5d3b393 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java @@ -4,7 +4,7 @@ import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDao.java index 3666d4014..62536194e 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.DatasetService; +import eu.eudat.data.old.DatasetService; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDaoImpl.java index 2f000f4f8..f1dba039b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetServiceDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DatasetService; +import eu.eudat.data.old.DatasetService; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDao.java index 9febf7abf..0cc7afc41 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.DMPDatasetProfile; +import eu.eudat.data.old.DMPDatasetProfile; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDaoImpl.java index 6c65b804f..1bca0f6c1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DmpDatasetProfileDaoImpl.java @@ -2,8 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Content; -import eu.eudat.data.entities.DMPDatasetProfile; +import eu.eudat.data.old.DMPDatasetProfile; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDao.java index b379d964d..6fc5dbead 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.EmailConfirmationCriteria; -import eu.eudat.data.entities.EmailConfirmation; +import eu.eudat.data.old.EmailConfirmation; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDaoImpl.java index d53fc9774..b7a17c507 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EmailConfirmationDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.EmailConfirmationCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.EmailConfirmation; +import eu.eudat.data.old.EmailConfirmation; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java index ebc6aad1a..b675cc138 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.EntityDoi; +import eu.eudat.data.old.EntityDoi; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java index 4eaf59b87..c955dda63 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/EntityDoiDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.EntityDoi; +import eu.eudat.data.old.EntityDoi; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java index 236b430d2..be21dc3f6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; -import eu.eudat.data.entities.ExternalDataset; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java index 163eed579..e328bdcc2 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.ExternalDataset; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDao.java index c334b63d4..f98fd5890 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.FileUpload; +import eu.eudat.data.old.FileUpload; import java.util.List; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDaoImpl.java index 47cc10066..491f92faf 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FileUploadDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.FileUpload; +import eu.eudat.data.old.FileUpload; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDao.java index 7c884a9e5..84309d814 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.FunderCriteria; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Funder; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java index c5a146c47..30e1ee91b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/FunderDaoImpl.java @@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.FunderCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Funder; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDao.java index ef9316632..c31f7914d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.GrantCriteria; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java index a148f3644..740721dd9 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java @@ -3,15 +3,14 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.GrantCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.types.grant.GrantStateType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; -import schemasMicrosoftComOfficeOffice.LeftDocument; import jakarta.persistence.criteria.JoinType; import java.util.Date; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java index ba91f81f1..85b7198c9 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.InvitationCriteria; -import eu.eudat.data.entities.Invitation; +import eu.eudat.data.old.Invitation; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java index eba6d5669..9969caea8 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.InvitationCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Invitation; +import eu.eudat.data.old.Invitation; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDao.java index 35cd56bbe..ae5fffa08 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.LockCriteria; -import eu.eudat.data.entities.Lock; +import eu.eudat.data.old.Lock; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDaoImpl.java index f3a83e707..979a212e5 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/LockDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.LockCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Lock; +import eu.eudat.data.old.Lock; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDao.java index 508e03834..9cb0e8fc6 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.NotificationCriteria; -import eu.eudat.data.entities.Notification; +import eu.eudat.data.old.Notification; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDaoImpl.java index 17fa9dd18..5b4e33152 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/NotificationDaoImpl.java @@ -3,8 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.NotificationCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Lock; -import eu.eudat.data.entities.Notification; +import eu.eudat.data.old.Notification; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java index 900873ada..7ce34b6f4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.OrganisationCriteria; -import eu.eudat.data.entities.Organisation; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Organisation; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java index 82e6e7076..22dea8fce 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java @@ -3,9 +3,9 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.OrganisationCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Organisation; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Organisation; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java index 1c82fc0ed..e5194705d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.ProjectCriteria; -import eu.eudat.data.entities.Project; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Project; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java index cc9afd444..9f240148a 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java @@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.ProjectCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Project; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Project; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import org.springframework.stereotype.Service; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java index 88e741192..41fdab6fc 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.RegistryCriteria; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java index c02fee715..4651865f3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.RegistryCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java index 18af17f2a..869f49792 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.ResearcherCriteria; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java index 441ed9318..1a94a9157 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.ResearcherCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java index 025185c03..8b5400ba1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.ServiceCriteria; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java index 1843a4510..924b28970 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.ServiceCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDao.java index dfe500ca4..bcfe96c03 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDao.java @@ -1,8 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserDatasetProfile; +import eu.eudat.data.old.UserDatasetProfile; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDaoImpl.java index 73633d824..5ee982d73 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDatasetProfileDaoImpl.java @@ -2,8 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserDatasetProfile; +import eu.eudat.data.old.UserDatasetProfile; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java index 6fe396daf..7d782ddb4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java @@ -1,7 +1,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.UserDMP; +import eu.eudat.data.old.UserDMP; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java index eb99c65e3..ae94902d0 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.UserDMP; +import eu.eudat.data.old.UserDMP; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java index 4abb033f5..2bc61bf72 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java @@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.UserInfoCriteria; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java index c3f955d93..699a99b14 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java @@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.UserInfoCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java index 31ff3768e..a43a26a56 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java @@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccessLayer; import eu.eudat.data.dao.criteria.UserRoleCriteria; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.queryable.QueryableList; import java.util.List; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java index 96a1522c4..64cd1339c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java @@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities; import eu.eudat.data.dao.DatabaseAccess; import eu.eudat.data.dao.criteria.UserRoleCriteria; import eu.eudat.data.dao.databaselayer.service.DatabaseService; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ActiveStatus.java b/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ActiveStatus.java deleted file mode 100644 index 1fa16c2d8..000000000 --- a/dmp-backend/data/src/main/java/eu/eudat/data/enumeration/notification/ActiveStatus.java +++ /dev/null @@ -1,27 +0,0 @@ -package eu.eudat.data.enumeration.notification; - -public enum ActiveStatus { - ACTIVE(0), - INACTIVE(1); - - private int status; - - ActiveStatus(int status) { - this.status = status; - } - - public int getStatus() { - return status; - } - - public ActiveStatus fromInteger(int status) { - switch (status) { - case 0: - return ACTIVE; - case 1: - return INACTIVE; - default: - throw new RuntimeException("Unsupported Active Status"); - } - } -} diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java index 388a024a7..d3fac4120 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/dmpblueprint/DataManagementPlanBlueprintTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.dmpblueprint; import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dataset/DatasetWizardAutocompleteRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dataset/DatasetWizardAutocompleteRequest.java index cd02e9e2e..123c962b3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dataset/DatasetWizardAutocompleteRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dataset/DatasetWizardAutocompleteRequest.java @@ -1,13 +1,10 @@ package eu.eudat.data.query.items.item.dataset; import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; -import java.util.UUID; - - public class DatasetWizardAutocompleteRequest extends Query { @Override public QueryableList applyCriteria() { diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java index 984d44073..59fa5ad31 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileAutocompleteRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.datasetprofile; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java index c911fe3af..24c7e5ae7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/datasetprofile/DatasetProfileWizardAutocompleteRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.datasetprofile; import eu.eudat.data.dao.criteria.DatasetProfileWizardCriteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmp/DataManagementPlanCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmp/DataManagementPlanCriteriaRequest.java index 4ecc13a4c..126bc5e84 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmp/DataManagementPlanCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmp/DataManagementPlanCriteriaRequest.java @@ -1,15 +1,13 @@ package eu.eudat.data.query.items.item.dmp; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; import java.util.Arrays; -import java.util.UUID; - public class DataManagementPlanCriteriaRequest extends Query { @Override diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmpprofile/DataManagementPlanProfileCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmpprofile/DataManagementPlanProfileCriteriaRequest.java index a87d09532..0382b2ce3 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmpprofile/DataManagementPlanProfileCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/dmpprofile/DataManagementPlanProfileCriteriaRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.dmpprofile; import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/funder/FunderCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/funder/FunderCriteriaRequest.java index 49e5a4ef5..b5893c2a4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/funder/FunderCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/funder/FunderCriteriaRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.funder; import eu.eudat.data.dao.criteria.FunderCriteria; -import eu.eudat.data.entities.Funder; +import eu.eudat.data.old.Funder; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/grant/GrantCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/grant/GrantCriteriaRequest.java index b2f0bde72..8182cf3c1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/grant/GrantCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/grant/GrantCriteriaRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.grant; import eu.eudat.data.dao.criteria.GrantCriteria; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/lock/LockCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/lock/LockCriteriaRequest.java index 40208dd92..ab13fc6ff 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/lock/LockCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/lock/LockCriteriaRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.lock; import eu.eudat.data.dao.criteria.LockCriteria; -import eu.eudat.data.entities.Lock; +import eu.eudat.data.old.Lock; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/project/ProjectCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/project/ProjectCriteriaRequest.java index 5a66ebcd5..cb780ec8e 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/project/ProjectCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/project/ProjectCriteriaRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.project; import eu.eudat.data.dao.criteria.ProjectCriteria; -import eu.eudat.data.entities.Project; +import eu.eudat.data.old.Project; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/researcher/ResearcherCriteriaRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/researcher/ResearcherCriteriaRequest.java index 5e80f3cbc..7fb8355e4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/researcher/ResearcherCriteriaRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/researcher/ResearcherCriteriaRequest.java @@ -1,12 +1,10 @@ package eu.eudat.data.query.items.item.researcher; import eu.eudat.data.dao.criteria.ResearcherCriteria; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; -import java.util.UUID; - /** * Created by ikalyvas on 3/6/2018. */ diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/userinfo/UserInfoRequestItem.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/userinfo/UserInfoRequestItem.java index c7dcbff8d..74eaf0d79 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/userinfo/UserInfoRequestItem.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/item/userinfo/UserInfoRequestItem.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.item.userinfo; import eu.eudat.data.dao.criteria.UserInfoCriteria; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.definition.Query; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java index 6aa363095..b0d4e91a1 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetPublicTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.dataset; import eu.eudat.data.dao.criteria.DatasetPublicCriteria; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetTableRequest.java index a752014cd..aa0350107 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dataset/DatasetTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.dataset; import eu.eudat.data.dao.criteria.DatasetCriteria; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; @@ -10,7 +10,7 @@ import eu.eudat.queryable.types.SelectionField; import java.util.Arrays; import java.util.UUID; -public class DatasetTableRequest extends TableQuery { +public class DatasetTableRequest extends TableQuery { @Override public QueryableList applyCriteria() { QueryableList query = this.getQuery(); diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java index 17ad2a687..9bf4639db 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/datasetprofile/DatasetProfileTableRequestItem.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.datasetprofile; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagementPlanTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagementPlanTableRequest.java index ed1849a2d..597bd4c4b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagementPlanTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagementPlanTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.dmp; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java index f359fcb4b..e296f8798 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmp/DataManagmentPlanPublicTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.dmp; import eu.eudat.data.dao.criteria.DataManagementPlanPublicCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmpprofile/DataManagementPlanProfileTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmpprofile/DataManagementPlanProfileTableRequest.java index c06cd3867..9cad8dc8c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmpprofile/DataManagementPlanProfileTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/dmpprofile/DataManagementPlanProfileTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.dmpprofile; import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/externaldataset/ExternalDatasetTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/externaldataset/ExternalDatasetTableRequest.java index 1c0c4199b..cdedd781d 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/externaldataset/ExternalDatasetTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/externaldataset/ExternalDatasetTableRequest.java @@ -1,8 +1,7 @@ package eu.eudat.data.query.items.table.externaldataset; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; -import eu.eudat.data.entities.ExternalDataset; -import eu.eudat.data.query.definition.Query; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/grant/GrantTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/grant/GrantTableRequest.java index 223566e95..0162f8c6b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/grant/GrantTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/grant/GrantTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.grant; import eu.eudat.data.dao.criteria.GrantCriteria; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/lock/LockTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/lock/LockTableRequest.java index f2ccf8955..3d4616bd4 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/lock/LockTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/lock/LockTableRequest.java @@ -1,9 +1,8 @@ package eu.eudat.data.query.items.table.lock; import eu.eudat.data.dao.criteria.LockCriteria; -import eu.eudat.data.entities.Lock; +import eu.eudat.data.old.Lock; import eu.eudat.data.query.PaginationService; -import eu.eudat.data.query.definition.Query; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/organisations/OrganisationsTableRequest.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/organisations/OrganisationsTableRequest.java index 360d1683b..3c0e6f86c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/organisations/OrganisationsTableRequest.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/organisations/OrganisationsTableRequest.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.organisations; import eu.eudat.data.dao.criteria.OrganisationCriteria; -import eu.eudat.data.entities.Organisation; +import eu.eudat.data.old.Organisation; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/userinfo/UserInfoTableRequestItem.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/userinfo/UserInfoTableRequestItem.java index a4a3fc38f..155e756bc 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/userinfo/UserInfoTableRequestItem.java +++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/items/table/userinfo/UserInfoTableRequestItem.java @@ -1,7 +1,7 @@ package eu.eudat.data.query.items.table.userinfo; import eu.eudat.data.dao.criteria.UserInfoCriteria; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/DMPQuery.java b/dmp-backend/data/src/main/java/eu/eudat/query/DMPQuery.java index d47412e99..78d088ca7 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/query/DMPQuery.java +++ b/dmp-backend/data/src/main/java/eu/eudat/query/DMPQuery.java @@ -1,10 +1,10 @@ package eu.eudat.query; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/DatasetQuery.java b/dmp-backend/data/src/main/java/eu/eudat/query/DatasetQuery.java index aecf08155..b3f5f7164 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/query/DatasetQuery.java +++ b/dmp-backend/data/src/main/java/eu/eudat/query/DatasetQuery.java @@ -1,8 +1,8 @@ package eu.eudat.query; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/GrantQuery.java b/dmp-backend/data/src/main/java/eu/eudat/query/GrantQuery.java index d48365036..cb078f982 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/query/GrantQuery.java +++ b/dmp-backend/data/src/main/java/eu/eudat/query/GrantQuery.java @@ -1,8 +1,8 @@ package eu.eudat.query; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/LockQuery.java b/dmp-backend/data/src/main/java/eu/eudat/query/LockQuery.java index 8f58687de..1e6851e4c 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/query/LockQuery.java +++ b/dmp-backend/data/src/main/java/eu/eudat/query/LockQuery.java @@ -1,8 +1,8 @@ package eu.eudat.query; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.Lock; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Lock; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/UserQuery.java b/dmp-backend/data/src/main/java/eu/eudat/query/UserQuery.java index f6240b7c3..a4246c20b 100644 --- a/dmp-backend/data/src/main/java/eu/eudat/query/UserQuery.java +++ b/dmp-backend/data/src/main/java/eu/eudat/query/UserQuery.java @@ -1,7 +1,7 @@ package eu.eudat.query; import eu.eudat.data.dao.DatabaseAccessLayer; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.queryable.QueryableList; import java.util.List; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index 85202a611..28e885c0c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -1,8 +1,8 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.UserDatasetProfile; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.UserDatasetProfile; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException; import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java index 495d80f72..ace473c77 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java @@ -1,8 +1,8 @@ package eu.eudat.controllers; import eu.eudat.data.dao.criteria.RequestItem; -import eu.eudat.data.entities.DMPProfile; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DMPProfile; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest; import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest; import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException; @@ -30,7 +30,6 @@ import java.io.IOException; import java.util.List; import static eu.eudat.types.Authorities.ADMIN; -import static eu.eudat.types.Authorities.DATASET_PROFILE_MANAGER; /** * Created by ikalyvas on 3/21/2018. diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java index edb3fac48..2b4e85dd2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java @@ -5,8 +5,8 @@ import eu.eudat.configurations.dynamicgrant.DynamicGrantConfiguration; import eu.eudat.criteria.DMPCriteria; import eu.eudat.data.dao.criteria.DynamicFieldsCriteria; import eu.eudat.data.dao.criteria.RequestItem; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest; import eu.eudat.exceptions.datamanagementplan.DMPNewVersionException; @@ -342,7 +342,7 @@ public class DMPs extends BaseController { public @ResponseBody ResponseEntity> generateIndex(Principal principal) throws Exception { this.dataManagementPlanManager.generateIndex(principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null)); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null)); } @Transactional @@ -350,7 +350,7 @@ public class DMPs extends BaseController { public @ResponseBody ResponseEntity> clearIndex(Principal principal) throws Exception { this.dataManagementPlanManager.clearIndex(principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null)); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null)); } /* diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java index f6bfed9d3..9b765d255 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -1,6 +1,6 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import eu.eudat.logic.managers.DataRepositoryManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java index cffa509ef..7111eff0a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -1,7 +1,7 @@ package eu.eudat.controllers; import eu.eudat.data.dao.criteria.RequestItem; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.managers.AdminManager; import eu.eudat.logic.managers.DatasetProfileManager; import eu.eudat.logic.security.claims.ClaimedAuthorities; @@ -11,9 +11,7 @@ import eu.eudat.models.data.externaldataset.ExternalAutocompleteFieldModel; import eu.eudat.models.data.helpers.common.AutoCompleteLookupItem; import eu.eudat.models.data.helpers.common.AutoCompleteOptionsLookupItem; import eu.eudat.models.data.helpers.responses.ResponseItem; -import eu.eudat.models.data.properties.PropertiesModel; import eu.eudat.models.data.security.Principal; -import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,9 +19,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.xml.xpath.XPathExpressionException; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; import static eu.eudat.types.Authorities.ADMIN; @@ -44,7 +40,7 @@ public class DatasetProfileController extends BaseController { /* @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/datasetprofile/save/{id}"}, consumes = "application/json", produces = "application/json") public ResponseEntity updateDataset(@PathVariable String id, @RequestBody PropertiesModel properties) { - eu.eudat.data.entities.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); + eu.eudat.data.old.Dataset dataset = this.getApiContext().getOperationsContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); Map values = new HashMap<>(); properties.toMap(values); JSONObject jobject = new JSONObject(values); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java index 487f70d80..fa8818c3c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java @@ -1,7 +1,7 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest; import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest; @@ -331,7 +331,7 @@ public class Datasets extends BaseController { public @ResponseBody ResponseEntity> generateIndex(Principal principal) throws Exception { this.datasetManager.generateIndex(principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null)); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Generated").payload(null)); } @Transactional @@ -339,7 +339,7 @@ public class Datasets extends BaseController { public @ResponseBody ResponseEntity> clearIndex(Principal principal) throws Exception { this.datasetManager.clearIndex(principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null)); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Cleared").payload(null)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java index 642ff7f60..302437d92 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -1,13 +1,11 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.ExternalDataset; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.data.query.items.table.externaldataset.ExternalDatasetTableRequest; -import eu.eudat.logic.managers.DataRepositoryManager; import eu.eudat.logic.managers.ExternalDatasetManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.datarepository.DataRepositoryModel; import eu.eudat.models.data.externaldataset.ExternalDatasetListingModel; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.models.data.helpers.responses.ResponseItem; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java index cfaae57e9..25be25026 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java @@ -3,7 +3,8 @@ package eu.eudat.controllers; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.FileUpload; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.FileUpload; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.managers.DatasetProfileManager; import eu.eudat.logic.security.claims.ClaimedAuthorities; @@ -34,7 +35,6 @@ import java.io.*; import java.nio.file.Files; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @RestController @@ -144,7 +144,7 @@ public class FileController { } if(fileUpload.getEntityType().name().equals(FileUpload.EntityType.DATASET.name())) { - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(fileUpload.getEntityId(), HintedModelFactory.getHint(DatasetWizardModel.class)); + Dataset datasetEntity = databaseRepository.getDatasetDao().find(fileUpload.getEntityId(), HintedModelFactory.getHint(DatasetWizardModel.class)); if (datasetEntity == null) { throw new NoSuchElementException("No dataset with id " + fileUpload.getEntityId() + " found. This dataset was related to the file with id " + id); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java index 66e518417..9b771ff7b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java @@ -1,6 +1,5 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.Grant; import eu.eudat.data.query.items.item.grant.GrantCriteriaRequest; import eu.eudat.data.query.items.table.grant.GrantTableRequest; import eu.eudat.logic.managers.GrantManager; @@ -18,10 +17,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import jakarta.transaction.Transactional; import jakarta.validation.Valid; -import java.io.IOException; -import java.text.ParseException; + import java.util.List; import static eu.eudat.types.Authorities.ANONYMOUS; @@ -65,7 +62,7 @@ public class Grants extends BaseController { public @ResponseBody ResponseEntity> addGrant(@Valid @RequestBody eu.eudat.models.data.grant.Grant grant, Principal principal) throws IOException, ParseException { this.grantManager.createOrUpdate(grant, principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created")); }*/ /*@Transactional @@ -73,7 +70,7 @@ public class Grants extends BaseController { public @ResponseBody ResponseEntity> inactivate(@PathVariable String id, Principal principal) throws IllegalAccessException, InstantiationException { this.grantManager.inactivate(id); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); }*/ @RequestMapping(method = RequestMethod.POST, value = {"/external"}, consumes = "application/json", produces = "application/json") diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/JournalsController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/JournalsController.java index 5f597eb7c..437a8e761 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/JournalsController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/JournalsController.java @@ -1,6 +1,5 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DataRepository; import eu.eudat.logic.managers.DataRepositoryManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; @@ -12,7 +11,6 @@ import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java index 7c47240e3..b4633e607 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java @@ -42,7 +42,7 @@ public class LockController { @Transactional @RequestMapping(method = RequestMethod.POST, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> createOrUpdate(@RequestBody Lock lock, Principal principal) throws Exception { - eu.eudat.data.entities.Lock result = this.lockManager.createOrUpdate(lock, principal); + eu.eudat.data.old.Lock result = this.lockManager.createOrUpdate(lock, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Created").payload(result.getId())); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java index d1df0cc55..ee82cb14d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java @@ -1,9 +1,11 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.Project; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Funder; +import eu.eudat.data.old.Project; +import eu.eudat.data.old.Grant; import eu.eudat.logic.managers.DatasetManager; import eu.eudat.logic.managers.QuickWizardManager; import eu.eudat.logic.services.ApiContext; @@ -55,7 +57,7 @@ public class QuickWizardController extends BaseController { funderEntity = quickWizard.getFunder().getExistFunder().toDataModel(); } - eu.eudat.data.entities.Grant grantEntity; + Grant grantEntity; //Create Grant if (quickWizard.getGrant() == null) { grantEntity = null; @@ -80,7 +82,7 @@ public class QuickWizardController extends BaseController { //Create Dmp DataManagementPlan dataManagementPlan = quickWizard.getDmp().toDataDmp(grantEntity, projectEntity, principal); - eu.eudat.data.entities.DMP dmpEntity = this.quickWizardManager.createOrUpdate(dataManagementPlan, funderEntity, principal); + DMP dmpEntity = this.quickWizardManager.createOrUpdate(dataManagementPlan, funderEntity, principal); //Create Datasets quickWizard.getDmp().setId(dmpEntity.getId()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java index c0a5a58b9..04ddc71d7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java @@ -1,6 +1,6 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import eu.eudat.logic.managers.RegistryManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java index d24928ca1..37146eef1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java @@ -1,6 +1,6 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import eu.eudat.logic.managers.ServiceManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Validation.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Validation.java index f9e26d6dd..96be70f48 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Validation.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Validation.java @@ -1,24 +1,17 @@ package eu.eudat.controllers; -import eu.eudat.data.entities.Service; -import eu.eudat.logic.managers.ServiceManager; import eu.eudat.logic.managers.ValidationManager; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.security.Principal; -import eu.eudat.models.data.services.ServiceModel; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import java.util.List; - - @RestController @CrossOrigin @RequestMapping(value = {"/api"}) diff --git a/dmp-backend/web/src/main/java/eu/eudat/interceptors/UserInterceptor.java b/dmp-backend/web/src/main/java/eu/eudat/interceptors/UserInterceptor.java index 743281495..91e530259 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/interceptors/UserInterceptor.java +++ b/dmp-backend/web/src/main/java/eu/eudat/interceptors/UserInterceptor.java @@ -5,8 +5,8 @@ import eu.eudat.commons.enums.ProviderType; import eu.eudat.commons.enums.IsActive; import eu.eudat.commons.scope.user.UserScope; import eu.eudat.data.CredentialEntity; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.types.Authorities; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/ContentBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/ContentBuilder.java index 1a41fb5c5..6e180e6dd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/ContentBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/ContentBuilder.java @@ -1,7 +1,7 @@ package eu.eudat.logic.builders.entity; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.Content; +import eu.eudat.data.old.Content; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java index 379b704e2..214195717 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/CredentialBuilder.java @@ -4,7 +4,7 @@ import eu.eudat.commons.enums.ProviderType; import eu.eudat.commons.enums.IsActive; import eu.eudat.data.CredentialEntity; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java index 6cd3c86aa..1ce744f9b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/DatasetProfileBuilder.java @@ -1,9 +1,9 @@ package eu.eudat.logic.builders.entity; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import java.util.Date; import java.util.Set; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserInfoBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserInfoBuilder.java index 29725bffb..0ab2ff17e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserInfoBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserInfoBuilder.java @@ -2,9 +2,9 @@ package eu.eudat.logic.builders.entity; import eu.eudat.data.CredentialEntity; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import java.util.Date; import java.util.HashSet; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserRoleBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserRoleBuilder.java index e1d18b401..edae42fe2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserRoleBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/entity/UserRoleBuilder.java @@ -1,8 +1,8 @@ package eu.eudat.logic.builders.entity; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java index ae8414d49..3b5020ec2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java @@ -12,7 +12,7 @@ public class FunderBuilder extends Builder { private String label; private String reference; private String definition; - private eu.eudat.data.entities.Funder.Status status; + private eu.eudat.data.old.Funder.Status status; private Date created; private Date modified; private Integer type; @@ -39,7 +39,7 @@ public class FunderBuilder extends Builder { return this; } - public FunderBuilder status(eu.eudat.data.entities.Funder.Status status) { + public FunderBuilder status(eu.eudat.data.old.Funder.Status status) { this.status = status; return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/GrantBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/GrantBuilder.java index cd8d57df2..14d717ade 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/GrantBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/GrantBuilder.java @@ -1,7 +1,7 @@ package eu.eudat.logic.builders.model.models; import eu.eudat.logic.builders.Builder; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.data.dmp.DataManagementPlan; import eu.eudat.models.data.grant.Grant; @@ -29,7 +29,7 @@ public class GrantBuilder extends Builder { private Date endDate; - private eu.eudat.data.entities.Grant.Status status; + private eu.eudat.data.old.Grant.Status status; private UserInfo creationUser; @@ -88,7 +88,7 @@ public class GrantBuilder extends Builder { return this; } - public GrantBuilder status(eu.eudat.data.entities.Grant.Status status) { + public GrantBuilder status(eu.eudat.data.old.Grant.Status status) { this.status = status; return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java index a0560d5d5..dac2a1734 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java @@ -1,7 +1,7 @@ package eu.eudat.logic.builders.model.models; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.logic.builders.Builder; import eu.eudat.models.data.dmp.DataManagementPlan; import eu.eudat.models.data.project.Project; @@ -22,7 +22,7 @@ public class ProjectBuilder extends Builder { private String definition; private Date startDate; private Date endDate; - private eu.eudat.data.entities.Project.Status status; + private eu.eudat.data.old.Project.Status status; private UserInfo creationUser; private Date created; private Date modified; @@ -80,7 +80,7 @@ public class ProjectBuilder extends Builder { return this; } - public ProjectBuilder status(eu.eudat.data.entities.Project.Status status) { + public ProjectBuilder status(eu.eudat.data.old.Project.Status status) { this.status = status; return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java index 067f9860a..cbb0e3b7b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/AdminManager.java @@ -2,7 +2,7 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.DatasetProfileDao; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.DescriptionTemplateTypeEntity; import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption; import eu.eudat.logic.builders.entity.DatasetProfileBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java index ea2ecce35..18b3057be 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ContactEmailManager.java @@ -1,6 +1,6 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.ContactEmail.ContactEmailModel; import eu.eudat.models.data.ContactEmail.PublicContactEmailModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java index 50421a683..90d3ce664 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java @@ -8,10 +8,10 @@ import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.GrantDao; import eu.eudat.data.dao.entities.OrganisationDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest; import eu.eudat.logic.builders.model.models.RecentActivityDataBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index 8c461a094..abeb71ff6 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -6,14 +6,14 @@ import eu.eudat.configurations.dynamicgrant.DynamicGrantConfiguration; import eu.eudat.configurations.dynamicgrant.entities.Property; import eu.eudat.data.dao.criteria.*; import eu.eudat.data.dao.entities.*; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.Organisation; -import eu.eudat.data.entities.Researcher; -import eu.eudat.data.entities.*; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.ContactType; -import eu.eudat.data.enumeration.notification.NotificationType; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.*; +import eu.eudat.data.old.Researcher; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.ContactType; +import eu.eudat.commons.enums.old.notification.NotificationType; +import eu.eudat.commons.enums.old.notification.NotifyState; +import eu.eudat.data.old.Organisation; import eu.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; import eu.eudat.data.query.items.table.dmp.DataManagementPlanTableRequest; @@ -902,10 +902,10 @@ public class DataManagementPlanManager { private void createResearchersIfTheyDontExist(DMP newDmp, ResearcherDao researcherRepository, UserInfo user) { if (newDmp.getResearchers() != null && !newDmp.getResearchers().isEmpty()) { - for (eu.eudat.data.entities.Researcher researcher : newDmp.getResearchers()) { + for (eu.eudat.data.old.Researcher researcher : newDmp.getResearchers()) { ResearcherCriteria criteria = new ResearcherCriteria(); criteria.setReference(researcher.getReference()); - List entries = researcherRepository.getWithCriteria(criteria).toList(); + List entries = researcherRepository.getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) researcher.setId(entries.get(0).getId()); else { researcher.setCreationUser(user); @@ -918,12 +918,12 @@ public class DataManagementPlanManager { private void createOrganisationsIfTheyDontExist(DMP newDmp, OrganisationDao organisationRepository) { if (newDmp.getOrganisations() != null && !newDmp.getOrganisations().isEmpty()) { - for (eu.eudat.data.entities.Organisation organisation : newDmp.getOrganisations()) { + for (Organisation organisation : newDmp.getOrganisations()) { boolean createNew = false; if (organisation.getReference() != null) { OrganisationCriteria criteria = new OrganisationCriteria(); criteria.setLike(organisation.getReference()); - List entries = organisationRepository.getWithCriteria(criteria).toList(); + List entries = organisationRepository.getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) organisation.setId(entries.get(0).getId()); else createNew = true; } else { @@ -946,7 +946,7 @@ public class DataManagementPlanManager { GrantCriteria criteria = new GrantCriteria(); if (grant.getReference() != null) { criteria.setReference(grant.getReference()); - eu.eudat.data.entities.Grant grantEntity = grantDao.getWithCriteria(criteria).toList().stream().max(Comparator.comparing(grant1 -> grant1.getModified().getTime())).orElse(null); + Grant grantEntity = grantDao.getWithCriteria(criteria).toList().stream().max(Comparator.comparing(grant1 -> grant1.getModified().getTime())).orElse(null); if (grantEntity != null) grant.setId(grantEntity.getId()); else { grant.setType(Grant.GrantType.EXTERNAL.getValue()); @@ -974,7 +974,7 @@ public class DataManagementPlanManager { FunderCriteria criteria = new FunderCriteria(); if (funder.getReference() != null) { criteria.setReference(funder.getReference()); - eu.eudat.data.entities.Funder funderEntity = funderDao.getWithCritetia(criteria).toList().stream().max(Comparator.comparing(funder1 -> funder1.getModified().getTime())).orElse(null); + Funder funderEntity = funderDao.getWithCritetia(criteria).toList().stream().max(Comparator.comparing(funder1 -> funder1.getModified().getTime())).orElse(null); if (funderEntity != null) funder.setId(funderEntity.getId()); else { funderDao.createOrUpdate(funder); @@ -992,7 +992,7 @@ public class DataManagementPlanManager { ProjectCriteria criteria = new ProjectCriteria(); if (project.getReference() != null) { criteria.setReference(project.getReference()); - eu.eudat.data.entities.Project projectEntity = projectDao.getWithCritetia(criteria).toList().stream().max(Comparator.comparing(project1 -> project1.getModified().getTime())).orElse(null); + Project projectEntity = projectDao.getWithCritetia(criteria).toList().stream().max(Comparator.comparing(project1 -> project1.getModified().getTime())).orElse(null); if (projectEntity != null) project.setId(projectEntity.getId()); else { createExternalProject(project, projectDao); @@ -1301,7 +1301,7 @@ public class DataManagementPlanManager { DatasetWizardModel dataset = new DatasetWizardModel(); XWPFDocument document = configLoader.getDocument(); - eu.eudat.data.entities.DMP dmpEntity = databaseRepository.getDmpDao().find(UUID.fromString(id)); + DMP dmpEntity = databaseRepository.getDmpDao().find(UUID.fromString(id)); if (!dmpEntity.isPublic() && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0) throw new UnauthorisedException(); @@ -1681,7 +1681,7 @@ public class DataManagementPlanManager { private FileEnvelope getXmlDocument(String id, Principal principal) throws InstantiationException, IllegalAccessException, IOException { ExportXmlBuilder xmlBuilder = new ExportXmlBuilder(); VisibilityRuleService visibilityRuleService = new VisibilityRuleServiceImpl(); - eu.eudat.data.entities.DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id)); + DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id)); if (!dmp.isPublic() && dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0) throw new UnauthorisedException(); final Boolean isFinalized = dmp.getStatus() == DMP.DMPStatus.FINALISED.getValue(); @@ -1959,7 +1959,7 @@ public class DataManagementPlanManager { } public FileEnvelope getRDAJsonDocument(String id, Principal principal) throws Exception { - eu.eudat.data.entities.DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id)); + DMP dmp = databaseRepository.getDmpDao().find(UUID.fromString(id)); if (!dmp.isPublic() && dmp.getUsers().stream().noneMatch(userInfo -> userInfo.getUser().getId() == principal.getId())) throw new UnauthorisedException(); final boolean isFinalized = dmp.getStatus() == DMP.DMPStatus.FINALISED.getValue(); @@ -2194,7 +2194,7 @@ public class DataManagementPlanManager { List datasets = new LinkedList<>(); for (DatasetImportModels das: dataManagementPlans.get(0).getDatasetImportModels()) { - eu.eudat.data.entities.Dataset dataset = new eu.eudat.data.entities.Dataset(); + Dataset dataset = new Dataset(); dataset.setLabel(das.getName()); dataset.setDmpSectionIndex(das.getDmpSectionIndex()); try { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java index 9735e9e99..f320c5ea9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementProfileManager.java @@ -4,14 +4,10 @@ import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.JsonPath; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.criteria.RequestItem; -import eu.eudat.data.dao.entities.DatasetDao; -import eu.eudat.data.dao.entities.DatasetProfileDao; -import eu.eudat.data.entities.DMPProfile; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DMPProfile; import eu.eudat.data.query.items.dmpblueprint.DataManagementPlanBlueprintTableRequest; import eu.eudat.data.query.items.item.dmpprofile.DataManagementPlanProfileCriteriaRequest; import eu.eudat.data.query.items.table.dmpprofile.DataManagementPlanProfileTableRequest; -import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption; import eu.eudat.exceptions.dmpblueprint.DmpBlueprintUsedException; import eu.eudat.logic.services.operations.DatabaseRepository; import eu.eudat.logic.utilities.builders.XmlBuilder; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java index 2a45bc6ba..b5a738f95 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataRepositoryManager.java @@ -3,7 +3,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.criteria.DataRepositoryCriteria; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java index 00f8a65c0..18694945d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetManager.java @@ -8,11 +8,11 @@ import eu.eudat.data.dao.criteria.*; import eu.eudat.data.dao.entities.DataRepositoryDao; import eu.eudat.data.dao.entities.DatasetDao; import eu.eudat.data.dao.entities.RegistryDao; -import eu.eudat.data.entities.*; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.ContactType; -import eu.eudat.data.enumeration.notification.NotificationType; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.ContactType; +import eu.eudat.commons.enums.old.notification.NotificationType; +import eu.eudat.commons.enums.old.notification.NotifyState; +import eu.eudat.data.old.*; import eu.eudat.data.query.items.table.dataset.DatasetPublicTableRequest; import eu.eudat.data.query.items.table.dataset.DatasetTableRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; @@ -55,7 +55,6 @@ import eu.eudat.types.MetricNames; import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFParagraph; -import org.apache.poi.xwpf.usermodel.XWPFRun; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; @@ -169,8 +168,8 @@ public class DatasetManager { } UserInfo userInfo = builderFactory.getBuilder(UserInfoBuilder.class).id(principal.getId()).build(); -// QueryableList items = databaseRepository.getDatasetDao().getWithCriteria(datasetTableRequest.getCriteria()).withHint(HintedModelFactory.getHint(DatasetListingModel.class)); - QueryableList items; +// QueryableList items = databaseRepository.getDatasetDao().getWithCriteria(datasetTableRequest.getCriteria()).withHint(HintedModelFactory.getHint(DatasetListingModel.class)); + QueryableList items; if (datasets != null) { if (!datasets.isEmpty()) { @@ -186,8 +185,8 @@ public class DatasetManager { items = databaseRepository.getDatasetDao().getWithCriteria(datasetTableRequest.getCriteria()).withHint(HintedModelFactory.getHint(DatasetListingModel.class));//.withFields(Collections.singletonList("id")); } List roles = new LinkedList<>(); - QueryableList pagedItems; - QueryableList authItems; + QueryableList pagedItems; + QueryableList authItems; if (!datasetTableRequest.getCriteria().getIsPublic()) { if (principal.getId() == null) { throw new UnauthorisedException("You are not allowed to access those datasets"); @@ -269,7 +268,7 @@ public class DatasetManager { if (count == 0L) { count = items.count(); } - QueryableList pagedItems = PaginationManager.applyPaging(items, datasetTableRequest); + QueryableList pagedItems = PaginationManager.applyPaging(items, datasetTableRequest); DataTableData dataTable = new DataTableData<>(); List datasetListis = pagedItems. @@ -284,7 +283,7 @@ public class DatasetManager { public DatasetWizardModel getSingle(String id, Principal principal) { DatasetWizardModel dataset = new DatasetWizardModel(); - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); + Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); if (datasetEntity.getDmp().getUsers() .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()) .collect(Collectors.toList()).size() == 0 && !datasetEntity.getDmp().isPublic()) @@ -348,7 +347,7 @@ public class DatasetManager { public DatasetWizardModel getSinglePublic(String id) throws Exception { DatasetWizardModel dataset = new DatasetWizardModel(); - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().isPublicDataset(UUID.fromString(id)); + Dataset datasetEntity = databaseRepository.getDatasetDao().isPublicDataset(UUID.fromString(id)); if (datasetEntity != null && datasetEntity.getStatus() == 1 && datasetEntity.getDmp().getStatus() == 1) { dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity)); @@ -383,7 +382,7 @@ public class DatasetManager { return databaseRepository.getDatasetDao().find(id); } - public PagedDatasetProfile getPagedProfile(DatasetWizardModel dataset, eu.eudat.data.entities.Dataset datasetEntity) { + public PagedDatasetProfile getPagedProfile(DatasetWizardModel dataset, Dataset datasetEntity) { eu.eudat.models.data.user.composite.DatasetProfile datasetprofile = userManager.generateDatasetProfileModel(datasetEntity.getProfile()); datasetprofile.setStatus(dataset.getStatus()); if (datasetEntity.getProperties() != null) { @@ -396,12 +395,12 @@ public class DatasetManager { return pagedDatasetProfile; } - private XWPFDocument getWordDocument(ConfigLoader configLoader, eu.eudat.data.entities.Dataset datasetEntity, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException { + private XWPFDocument getWordDocument(ConfigLoader configLoader, Dataset datasetEntity, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException { WordBuilder wordBuilder = new WordBuilder(this.environment, configLoader); DatasetWizardModel dataset = new DatasetWizardModel(); XWPFDocument document = configLoader.getDatasetDocument(); - eu.eudat.data.entities.DMP dmpEntity = datasetEntity.getDmp(); + DMP dmpEntity = datasetEntity.getDmp(); if (!dmpEntity.isPublic() && dmpEntity.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()).collect(Collectors.toList()).size() == 0) throw new UnauthorisedException(); @@ -539,7 +538,7 @@ public class DatasetManager { } public FileEnvelope getWordDocumentFile(ConfigLoader configLoader, String id, VisibilityRuleService visibilityRuleService, Principal principal) throws IOException { - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); + Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); if (!datasetEntity.getDmp().isPublic() && datasetEntity.getDmp().getUsers() .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()) .collect(Collectors.toList()).size() == 0) @@ -568,7 +567,7 @@ public class DatasetManager { public FileEnvelope getXmlDocument(String id, VisibilityRuleService visibilityRuleService, Principal principal) throws InstantiationException, IllegalAccessException, IOException { ExportXmlBuilder xmlBuilder = new ExportXmlBuilder(); DatasetWizardModel dataset = new DatasetWizardModel(); - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); + Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); if (!datasetEntity.getDmp().isPublic() && datasetEntity.getDmp().getUsers() .stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()) .collect(Collectors.toList()).size() == 0) @@ -589,7 +588,7 @@ public class DatasetManager { return fileEnvelope; } - public eu.eudat.data.entities.Dataset createOrUpdate(DatasetWizardModel datasetWizardModel, Principal principal) throws Exception { + public Dataset createOrUpdate(DatasetWizardModel datasetWizardModel, Principal principal) throws Exception { Boolean sendNotification = false; Dataset tempDataset = null; DMP dmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(datasetWizardModel.getDmp().getId()); @@ -609,7 +608,7 @@ public class DatasetManager { } if (dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue()) && datasetWizardModel.getId() != null) throw new Exception("DMP is finalized, therefore Dataset cannot be edited."); - eu.eudat.data.entities.Dataset dataset = datasetWizardModel.toDataModel(); + Dataset dataset = datasetWizardModel.toDataModel(); dataset.setDmp(dmp); dataset.setProperties(propertiesModelToString(datasetWizardModel.getDatasetProfileDefinition())); if (this.apiContext.getOperationsContext().getElasticRepository().getDatasetRepository().getClient() != null) { @@ -854,12 +853,12 @@ public class DatasetManager { - private void createRegistriesIfTheyDontExist(RegistryDao registryDao, eu.eudat.data.entities.Dataset dataset) { + private void createRegistriesIfTheyDontExist(RegistryDao registryDao, Dataset dataset) { if (dataset.getRegistries() != null && !dataset.getRegistries().isEmpty()) { - for (eu.eudat.data.entities.Registry registry : dataset.getRegistries()) { + for (Registry registry : dataset.getRegistries()) { RegistryCriteria criteria = new RegistryCriteria(); criteria.setLike(registry.getReference()); - List entries = registryDao.getWithCriteria(criteria).toList(); + List entries = registryDao.getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) registry.setId(entries.get(0).getId()); else { registry.setCreated(new Date()); @@ -869,12 +868,12 @@ public class DatasetManager { } } - private void createDataRepositoriesIfTheyDontExist(DataRepositoryDao dataRepositoryDao, eu.eudat.data.entities.Dataset dataset) { + private void createDataRepositoriesIfTheyDontExist(DataRepositoryDao dataRepositoryDao, Dataset dataset) { if (dataset.getDatasetDataRepositories() != null && !dataset.getDatasetDataRepositories().isEmpty()) { - for (eu.eudat.data.entities.DatasetDataRepository datasetDataRepository : dataset.getDatasetDataRepositories()) { + for (DatasetDataRepository datasetDataRepository : dataset.getDatasetDataRepositories()) { DataRepositoryCriteria criteria = new DataRepositoryCriteria(); criteria.setLike(datasetDataRepository.getDataRepository().getReference()); - List entries = dataRepositoryDao.getWithCriteria(criteria).toList(); + List entries = dataRepositoryDao.getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) { datasetDataRepository.getDataRepository().setId(entries.get(0).getId()); datasetDataRepository.setDataset(dataset); @@ -890,12 +889,12 @@ public class DatasetManager { } } - private void createServicesIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { + private void createServicesIfTheyDontExist(Dataset dataset) { if (dataset.getServices() != null && !dataset.getServices().isEmpty()) { for (DatasetService service : dataset.getServices()) { ServiceCriteria criteria = new ServiceCriteria(); criteria.setLike(service.getService().getReference()); - List entries = databaseRepository.getServiceDao().getWithCriteria(criteria).toList(); + List entries = databaseRepository.getServiceDao().getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) { service.setDataset(dataset); service.getService().setCreated(new Date()); @@ -907,12 +906,12 @@ public class DatasetManager { } } - private void createExternalDatasetsIfTheyDontExist(eu.eudat.data.entities.Dataset dataset) { + private void createExternalDatasetsIfTheyDontExist(Dataset dataset) { if (dataset.getDatasetExternalDatasets() != null && !dataset.getDatasetExternalDatasets().isEmpty()) { - for (eu.eudat.data.entities.DatasetExternalDataset datasetExternalDataset : dataset.getDatasetExternalDatasets()) { + for (DatasetExternalDataset datasetExternalDataset : dataset.getDatasetExternalDatasets()) { ExternalDatasetCriteria criteria = new ExternalDatasetCriteria(); criteria.setLike(datasetExternalDataset.getExternalDataset().getReference()); - List entries = databaseRepository.getExternalDatasetDao().getWithCriteria(criteria).toList(); + List entries = databaseRepository.getExternalDatasetDao().getWithCriteria(criteria).toList(); if (entries != null && !entries.isEmpty()) { datasetExternalDataset.getExternalDataset().setId(entries.get(0).getId()); datasetExternalDataset.setDataset(dataset); @@ -929,8 +928,8 @@ public class DatasetManager { } public void makePublic(DatasetDao datasetDao, UUID id) throws Exception { - eu.eudat.data.entities.Dataset dataset = datasetDao.find(id); - if (dataset.getStatus() != eu.eudat.data.entities.Dataset.Status.FINALISED.getValue()) + Dataset dataset = datasetDao.find(id); + if (dataset.getStatus() != Dataset.Status.FINALISED.getValue()) throw new Exception("You cannot make public a Dataset That Has not Been Finalised"); datasetDao.createOrUpdate(dataset); metricsManager.increaseValue(MetricNames.DATASET, 1, MetricNames.PUBLISHED); @@ -958,7 +957,7 @@ public class DatasetManager { HttpStatus.OK); } - public eu.eudat.data.entities.Dataset createDatasetFromXml(MultipartFile importFile, String dmpId, String datasetProfileId, Principal principal) throws JAXBException, IOException { + public Dataset createDatasetFromXml(MultipartFile importFile, String dmpId, String datasetProfileId, Principal principal) throws JAXBException, IOException { DatasetImportPagedDatasetProfile importModel = new DatasetImportPagedDatasetProfile(); JAXBContext jaxbContext; @@ -1001,7 +1000,7 @@ public class DatasetManager { JSONObject jsonDatasetProperties = new JSONObject(importMap); // Creates the entity data set to save. - eu.eudat.data.entities.Dataset entity = new Dataset(); + Dataset entity = new Dataset(); entity.setProperties(jsonDatasetProperties.toString()); entity.setLabel(importFile.getOriginalFilename()); DMP dmp = new DMP(); @@ -1033,7 +1032,7 @@ public class DatasetManager { public DatasetWizardModel datasetUpdateProfile(String id) { DatasetWizardModel dataset = new DatasetWizardModel(); - eu.eudat.data.entities.Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); + Dataset datasetEntity = databaseRepository.getDatasetDao().find(UUID.fromString(id), HintedModelFactory.getHint(DatasetWizardModel.class)); dataset.setDatasetProfileDefinition(getPagedProfile(dataset, datasetEntity)); dataset.fromDataModel(datasetEntity); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java index 05e227776..7c9b18a8b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java @@ -1,20 +1,16 @@ package eu.eudat.logic.managers; -import com.jayway.jsonpath.DocumentContext; -import com.jayway.jsonpath.JsonPath; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.UserDatasetProfile; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.UserDatasetProfile; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileAutocompleteRequest; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException; import eu.eudat.logic.builders.model.models.DataTableDataBuilder; import eu.eudat.logic.proxy.config.*; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; -import eu.eudat.logic.proxy.config.entities.DatasetUrls; import eu.eudat.logic.proxy.config.entities.GeneralUrls; -import eu.eudat.logic.proxy.config.entities.GenericUrls; import eu.eudat.logic.proxy.fetching.RemoteFetcher; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.DatabaseRepository; @@ -40,9 +36,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import org.springframework.http.*; -import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java index 123f70881..10c4a6694 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetWizardManager.java @@ -3,10 +3,10 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.criteria.DatasetProfileCriteria; import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.DatasetProfileDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.item.dataset.DatasetWizardAutocompleteRequest; import eu.eudat.data.query.items.item.datasetprofile.DatasetProfileWizardAutocompleteRequest; import eu.eudat.exceptions.datasetwizard.DatasetWizardCannotUnlockException; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java index e02724e43..abea79456 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/EmailConfirmationManager.java @@ -1,8 +1,8 @@ package eu.eudat.logic.managers; import eu.eudat.data.CredentialEntity; -import eu.eudat.data.entities.EmailConfirmation; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.EmailConfirmation; +import eu.eudat.data.old.UserInfo; import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException; import eu.eudat.exceptions.emailconfirmation.TokenExpiredException; import eu.eudat.logic.services.ApiContext; @@ -12,7 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Date; -import java.util.List; import java.util.UUID; @Component diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java index f8f72ce31..185fa8563 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ExternalDatasetManager.java @@ -2,17 +2,14 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.logic.builders.model.criteria.ExternalDatasetCriteriaBuilder; import eu.eudat.logic.builders.model.models.DataTableDataBuilder; -import eu.eudat.data.entities.ExternalDataset; import eu.eudat.data.dao.criteria.ExternalDatasetCriteria; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.services.operations.DatabaseRepository; -import eu.eudat.models.data.external.ExternalDatasetSourcesModel; -import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.externaldataset.ExternalDatasetListingModel; import eu.eudat.data.query.items.table.externaldataset.ExternalDatasetTableRequest; -import eu.eudat.models.data.externaldataset.ExternalDatasetModel; import eu.eudat.models.data.helpers.common.DataTableData; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; @@ -53,7 +50,7 @@ public class ExternalDatasetManager { // Fetch the local saved external Datasets that belong to the user. ExternalDatasetCriteria criteria = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ExternalDatasetCriteriaBuilder.class).like(query).build(); criteria.setCreationUserId(principal.getId()); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getExternalDatasetDao().getWithCriteria(criteria); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getExternalDatasetDao().getWithCriteria(criteria); // Fetch external Datasets from external sources. ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FileManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FileManager.java index cb65ffa34..2e60d4473 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FileManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FileManager.java @@ -1,8 +1,7 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.FileUpload; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; +import eu.eudat.data.old.FileUpload; +import eu.eudat.data.old.UserInfo; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.operations.DatabaseRepository; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java index a14a1e8df..e724d3044 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java @@ -1,9 +1,9 @@ package eu.eudat.logic.managers; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; import eu.eudat.logic.builders.model.models.FunderBuilder; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; -import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.proxy.fetching.RemoteFetcher; @@ -35,11 +35,11 @@ public class FunderManager { } public List getCriteriaWithExternal(FunderCriteriaRequest funderCriteria, Principal principal) throws HugeResultSet, NoURLFound { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); funderCriteria.getCriteria().setReference("dmp:"); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); List funders = authItems.select(item -> new eu.eudat.models.data.funder.Funder().fromDataModel(item)); ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(funderCriteria.getCriteria().getLike()); List> remoteRepos = remoteFetcher.getFunders(externalUrlCriteria); @@ -47,7 +47,7 @@ public class FunderManager { for (ExternalSourcesItemModel externalListingItem : fundersExternalSourcesModel) { eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) - .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) + .status(eu.eudat.data.old.Funder.Status.fromInteger(0)) .key(externalListingItem.getKey()) .source(externalListingItem.getTag()) .build(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java index e020593ed..7e56d7169 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/GrantManager.java @@ -1,12 +1,11 @@ package eu.eudat.logic.managers; -import eu.eudat.data.dao.criteria.FunderCriteria; -import eu.eudat.data.entities.Funder; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.table.grant.GrantTableRequest; import eu.eudat.exceptions.grant.GrantWithDMPsDeleteException; import eu.eudat.logic.builders.model.models.GrantBuilder; import eu.eudat.data.dao.entities.GrantDao; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.services.operations.DatabaseRepository; import eu.eudat.logic.utilities.helpers.ListHelper; @@ -49,12 +48,12 @@ public class GrantManager { } public DataTableData getPaged(GrantTableRequest grantTableRequest, Principal principal, String fieldsGroup) throws Exception { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); GrantDao grantRepository = databaseRepository.getGrantDao(); - QueryableList items = grantRepository.getWithCriteria(grantTableRequest.getCriteria()); - QueryableList authItems = grantRepository.getAuthenticated(items, userInfo); - QueryableList pagedItems = PaginationManager.applyPaging(authItems, grantTableRequest); + QueryableList items = grantRepository.getWithCriteria(grantTableRequest.getCriteria()); + QueryableList authItems = grantRepository.getAuthenticated(items, userInfo); + QueryableList pagedItems = PaginationManager.applyPaging(authItems, grantTableRequest); DataTableData dataTable = new DataTableData<>(); CompletableFuture grantsFuture; if (fieldsGroup.equals("listing")) { @@ -77,8 +76,8 @@ public class GrantManager { public DataTableData getPublicPaged(GrantTableRequest grantTableRequest) throws Exception { GrantDao grantRepository = databaseRepository.getGrantDao(); grantTableRequest.getCriteria().setPublic(true); - QueryableList items = grantRepository.getWithCriteria(grantTableRequest.getCriteria()); - QueryableList pagedItems = PaginationManager.applyPaging(items, grantTableRequest); + QueryableList items = grantRepository.getWithCriteria(grantTableRequest.getCriteria()); + QueryableList pagedItems = PaginationManager.applyPaging(items, grantTableRequest); DataTableData dataTable = new DataTableData<>(); CompletableFuture grantsFuture; grantsFuture = pagedItems.selectAsync(item -> new GrantListingModel().fromDataModel(item)) @@ -97,16 +96,16 @@ public class GrantManager { return grant; } - /*public eu.eudat.data.entities.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { + /*public eu.eudat.data.old.Grant inactivate(String id) throws InstantiationException, IllegalAccessException { GrantDao grantRepository = databaseRepository.getGrantDao(); - eu.eudat.data.entities.Grant grant = grantRepository.find(UUID.fromString(id)); - grant.setStatus(eu.eudat.data.entities.Grant.Status.DELETED.getValue()); + eu.eudat.data.old.Grant grant = grantRepository.find(UUID.fromString(id)); + grant.setStatus(eu.eudat.data.old.Grant.Status.DELETED.getValue()); grant = grantRepository.createOrUpdate(grant); return grant; }*/ public List getCriteriaWithExternal(GrantCriteriaRequest grantCriteria, Principal principal) throws HugeResultSet, NoURLFound { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); /*if (grantCriteria.getCriteria().getFunderReference() != null && !grantCriteria.getCriteria().getFunderReference().trim().isEmpty()) { FunderCriteria funderCriteria = new FunderCriteria(); @@ -122,8 +121,8 @@ public class GrantManager { grantCriteria.getCriteria().setFunderReference(null); } grantCriteria.getCriteria().setReference("dmp:"); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getWithCriteria(grantCriteria.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getAuthenticated(items, userInfo); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getWithCriteria(grantCriteria.getCriteria()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getAuthenticated(items, userInfo); List grants = authItems.select(item -> new Grant().fromDataModel(item)); List> remoteRepos = remoteFetcher.getGrants(externalUrlCriteria); @@ -134,7 +133,7 @@ public class GrantManager { .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .description(externalListingItem.getDescription()).uri(externalListingItem.getUri()) .key(externalListingItem.getKey()) - .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.entities.Grant.Status.fromInteger(0)) + .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.old.Grant.Status.fromInteger(0)) .source(externalListingItem.getTag()) .build(); @@ -147,14 +146,14 @@ public class GrantManager { public List getCriteria(GrantCriteriaRequest grantCriteria) throws IllegalAccessException, InstantiationException, HugeResultSet, NoURLFound { GrantDao grantRepository = databaseRepository.getGrantDao(); - QueryableList items = grantRepository.getWithCriteria(grantCriteria.getCriteria()); + QueryableList items = grantRepository.getWithCriteria(grantCriteria.getCriteria()); if (grantCriteria.getLength() != null) items.take(grantCriteria.getLength()); List grants = items.select(item -> new Grant().fromDataModel(item)); return grants; } /*public void createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { - eu.eudat.data.entities.Grant grantEntity = grant.toDataModel(); + eu.eudat.data.old.Grant grantEntity = grant.toDataModel(); if (grant.getFiles() != null) { for (ContentFile file : grant.getFiles()) { try { @@ -171,13 +170,13 @@ public class GrantManager { } } } - grantEntity.setType(eu.eudat.data.entities.Grant.GrantType.INTERNAL.getValue()); + grantEntity.setType(eu.eudat.data.old.Grant.GrantType.INTERNAL.getValue()); grantEntity.setCreationUser(databaseRepository.getUserInfoDao().find(principal.getId())); databaseRepository.getGrantDao().createOrUpdate(grantEntity); }*/ public void delete(UUID uuid) { - eu.eudat.data.entities.Grant oldGrant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(uuid); + eu.eudat.data.old.Grant oldGrant = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().find(uuid); if (oldGrant.getDmps().size() > 0) throw new GrantWithDMPsDeleteException("You cannot Remove Grants with DMPs"); oldGrant.setStatus(DMP.DMPStatus.DELETED.getValue()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java index 0e6171ca5..6c68b8e80 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/InvitationsManager.java @@ -1,8 +1,8 @@ package eu.eudat.logic.managers; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.UserDMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.item.userinfo.UserInfoRequestItem; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.services.ApiContext; @@ -101,7 +101,7 @@ public class InvitationsManager { } public UUID assignUserAcceptedInvitation(UUID invitationID, Principal principal) throws UnauthorisedException, JAXBException, IOException { - eu.eudat.data.entities.Invitation invitation = apiContext.getOperationsContext().getDatabaseRepository().getInvitationDao().find(invitationID); + eu.eudat.data.old.Invitation invitation = apiContext.getOperationsContext().getDatabaseRepository().getInvitationDao().find(invitationID); if (invitation == null) throw new UnauthorisedException("There is no Data Management Plan assigned to this Link"); if (invitation.getAcceptedInvitation()) return invitation.getDmp().getId(); //throw new UnauthorisedException("This Url Has Expired"); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java index 39da2a9bf..6b7161c40 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LicenseManager.java @@ -3,14 +3,11 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.criteria.DataRepositoryCriteria; -import eu.eudat.data.entities.DataRepository; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; import eu.eudat.logic.services.ApiContext; -import eu.eudat.models.data.datarepository.DataRepositoryModel; import eu.eudat.models.data.license.LicenseModel; -import eu.eudat.models.data.security.Principal; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java index 365cf7ec9..77a3f08b2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/LockManager.java @@ -16,7 +16,7 @@ import java.util.UUID; @Component public class LockManager { - private final Comparator compareByTouchedAt = Comparator.comparing(o -> o.getTouchedAt().getTime()); + private final Comparator compareByTouchedAt = Comparator.comparing(o -> o.getTouchedAt().getTime()); private ApiContext apiContext; private Environment environment; @@ -27,10 +27,10 @@ public class LockManager { this.environment = environment; } - public eu.eudat.data.entities.Lock createOrUpdate(Lock lock, Principal principal) throws Exception { + public eu.eudat.data.old.Lock createOrUpdate(Lock lock, Principal principal) throws Exception { if (lock.getId() != null) { try { - eu.eudat.data.entities.Lock entity = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().find(lock.getId()); + eu.eudat.data.old.Lock entity = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().find(lock.getId()); if (entity != null) { if (!entity.getLockedBy().getId().equals(principal.getId())) { throw new Exception("Is not locked by that user"); @@ -40,7 +40,7 @@ public class LockManager { lock.setId(null); } } - eu.eudat.data.entities.Lock newLock = lock.toDataModel(); + eu.eudat.data.old.Lock newLock = lock.toDataModel(); newLock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().createOrUpdate(newLock); return newLock; @@ -51,7 +51,7 @@ public class LockManager { criteria.setTarget(UUID.fromString(targetId)); Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); if (availableLocks == 1) { - eu.eudat.data.entities.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); + eu.eudat.data.old.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); if (lock.getLockedBy().getId().equals(principal.getId())) { lock.setTouchedAt(new Date()); this.createOrUpdate(new Lock().fromDataModel(lock), principal); @@ -71,16 +71,16 @@ public class LockManager { Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); long deletedLocks = 0L; if (availableLocks > 0) { - List locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); - for (eu.eudat.data.entities.Lock lock : locks) { + List locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); + for (eu.eudat.data.old.Lock lock : locks) { if (new Date().getTime() - lock.getTouchedAt().getTime() > environment.getProperty("database.lock-fail-interval", Integer.class)) { this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().delete(lock); deletedLocks++; } } if (deletedLocks == 0) { - eu.eudat.data.entities.Lock recentlock = locks.stream().max(compareByTouchedAt).get(); - for (eu.eudat.data.entities.Lock lock : locks) { + eu.eudat.data.old.Lock recentlock = locks.stream().max(compareByTouchedAt).get(); + for (eu.eudat.data.old.Lock lock : locks) { if (lock != recentlock) { this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().delete(lock); deletedLocks++; @@ -96,13 +96,13 @@ public class LockManager { criteria.setTarget(UUID.fromString(targetId)); Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); if (availableLocks == 1) { - eu.eudat.data.entities.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); + eu.eudat.data.old.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); if (!lock.getLockedBy().getId().equals(principal.getId())) { throw new Exception("Only the user who created that lock can delete it"); } this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().delete(lock); } else if (availableLocks > 1) { - List locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); + List locks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).toList(); locks.stream().filter(lock -> lock.getLockedBy().getId().equals(principal.getId())).forEach(lock -> this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().delete(lock)); } } @@ -112,7 +112,7 @@ public class LockManager { criteria.setTarget(UUID.fromString(targetId)); Long availableLocks = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).count(); if (availableLocks > 0) { - eu.eudat.data.entities.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); + eu.eudat.data.old.Lock lock = this.apiContext.getOperationsContext().getDatabaseRepository().getLockDao().getWithCriteria(criteria).getSingle(); if (!lock.getLockedBy().getId().equals(principal.getId())) { throw new Exception("Only the user who created that lock can access it"); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java index 642fb92d8..75fef69b8 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java @@ -1,9 +1,9 @@ package eu.eudat.logic.managers; import eu.eudat.data.CredentialEntity; -import eu.eudat.data.entities.EmailConfirmation; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.EmailConfirmation; +import eu.eudat.data.old.UserDMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.elastic.criteria.DmpCriteria; import eu.eudat.elastic.entities.Collaborator; import eu.eudat.elastic.entities.Dmp; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java index 70f305028..e1ed24361 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/MetricsManager.java @@ -1,7 +1,7 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.criteria.*; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.services.ApiContext; import eu.eudat.types.MetricNames; import io.micrometer.prometheus.PrometheusMeterRegistry; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java index 1f3a57dfb..35660e695 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java @@ -1,10 +1,10 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.Notification; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.data.old.Notification; +import eu.eudat.data.old.UserInfo; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.NotifyState; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.services.utilities.MailService; import eu.eudat.models.data.mail.SimpleMail; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/OrganisationsManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/OrganisationsManager.java index 238bf9be9..4747e2549 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/OrganisationsManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/OrganisationsManager.java @@ -1,6 +1,7 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.entities.OrganisationDao; +import eu.eudat.data.old.UserInfo; import eu.eudat.data.query.items.table.organisations.OrganisationsTableRequest; import eu.eudat.logic.builders.model.models.OrganisationBuilder; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; @@ -35,13 +36,13 @@ public class OrganisationsManager { } public DataTableData getPagedOrganisations(OrganisationsTableRequest organisationsTableRequest, Principal principal) throws Exception { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); OrganisationDao organisationDao = databaseRepository.getOrganisationDao(); - QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); - QueryableList authItems = organisationDao.getAuthenticated(items, userInfo); - QueryableList pagedItems = PaginationManager.applyPaging(authItems, organisationsTableRequest); + QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); + QueryableList authItems = organisationDao.getAuthenticated(items, userInfo); + QueryableList pagedItems = PaginationManager.applyPaging(authItems, organisationsTableRequest); List org = pagedItems.toList().stream().distinct().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()); DataTableData organisationDataTableData = new DataTableData<>(); @@ -55,8 +56,8 @@ public class OrganisationsManager { organisationsTableRequest.getCriteria().setPublic(true); OrganisationDao organisationDao = databaseRepository.getOrganisationDao(); - QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); - QueryableList pagedItems = PaginationManager.applyPaging(items, organisationsTableRequest); + QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); + QueryableList pagedItems = PaginationManager.applyPaging(items, organisationsTableRequest); List org = pagedItems.toList().stream().distinct().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()); DataTableData organisationDataTableData = new DataTableData<>(); @@ -67,13 +68,13 @@ public class OrganisationsManager { } public List getWithExternal(OrganisationsTableRequest organisationsTableRequest, Principal principal) throws Exception { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); OrganisationDao organisationDao = databaseRepository.getOrganisationDao(); - QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); - QueryableList authItems = organisationDao.getAuthenticated(items, userInfo); - QueryableList pagedItems = PaginationManager.applyPaging(authItems, organisationsTableRequest); + QueryableList items = organisationDao.getWithCriteria(organisationsTableRequest.getCriteria()); + QueryableList authItems = organisationDao.getAuthenticated(items, userInfo); + QueryableList pagedItems = PaginationManager.applyPaging(authItems, organisationsTableRequest); List org = pagedItems.toList().stream().distinct().map(item -> new Organisation().fromDataModel(item)).collect(Collectors.toList()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java index 73d39b708..19aa2c74b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PrefillingManager.java @@ -2,7 +2,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.mapper.prefilling.PrefillingMapper; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java index 6919a5de5..2c5c5b098 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java @@ -1,5 +1,6 @@ package eu.eudat.logic.managers; +import eu.eudat.data.old.UserInfo; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.utilities.helpers.ListHelper; import eu.eudat.models.data.external.ProjectsExternalSourcesModel; @@ -34,11 +35,11 @@ public class ProjectManager { } public List getCriteriaWithExternal(ProjectCriteriaRequest projectCriteria, Principal principal) throws HugeResultSet, NoURLFound { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); + UserInfo userInfo = new UserInfo(); userInfo.setId(principal.getId()); projectCriteria.getCriteria().setReference("dmp:"); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria()); + QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo); List projects = authItems.select(item -> new Project().fromDataModel(item)); ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(projectCriteria.getCriteria().getLike()); List> remoteRepos = remoteFetcher.getProjects(externalUrlCriteria); @@ -47,7 +48,7 @@ public class ProjectManager { eu.eudat.models.data.project.Project project = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ProjectBuilder.class) .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .description(externalListingItem.getDescription()).uri(externalListingItem.getUri()) - .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.entities.Project.Status.fromInteger(0)) + .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.old.Project.Status.fromInteger(0)) .key(externalListingItem.getKey()) .source(externalListingItem.getTag()) .build(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java index 0f3dd9b45..c849ff462 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/QuickWizardManager.java @@ -3,7 +3,7 @@ package eu.eudat.logic.managers; import eu.eudat.data.dao.criteria.FunderCriteria; import eu.eudat.data.dao.criteria.GrantCriteria; import eu.eudat.data.dao.criteria.ProjectCriteria; -import eu.eudat.data.entities.*; +import eu.eudat.data.old.*; import eu.eudat.elastic.entities.Dmp; import eu.eudat.logic.mapper.elastic.DmpMapper; import eu.eudat.logic.services.ApiContext; @@ -37,8 +37,8 @@ public class QuickWizardManager { } public Grant createOrUpdate(eu.eudat.models.data.grant.Grant grant, Principal principal) throws ParseException, IOException { - eu.eudat.data.entities.Grant grantEntity = grant.toDataModel(); - grantEntity.setType(eu.eudat.data.entities.Grant.GrantType.INTERNAL.getValue()); + Grant grantEntity = grant.toDataModel(); + grantEntity.setType(Grant.GrantType.INTERNAL.getValue()); grantEntity.setCreationUser(databaseRepository.getUserInfoDao().find(principal.getId())); return databaseRepository.getGrantDao().createOrUpdate(grantEntity); } @@ -92,7 +92,7 @@ public class QuickWizardManager { Grant grant = newDmp.getGrant(); GrantCriteria criteria = new GrantCriteria(); criteria.setReference(grant.getReference()); - eu.eudat.data.entities.Grant grantEntity = databaseRepository.getGrantDao().getWithCriteria(criteria).getSingleOrDefault(); + Grant grantEntity = databaseRepository.getGrantDao().getWithCriteria(criteria).getSingleOrDefault(); if (grantEntity != null) grant.setId(grantEntity.getId()); else { grant.setType(Grant.GrantType.EXTERNAL.getValue()); @@ -106,7 +106,7 @@ public class QuickWizardManager { Funder funder = newDmp.getGrant().getFunder(); FunderCriteria criteria = new FunderCriteria(); criteria.setReference(funder.getReference()); - eu.eudat.data.entities.Funder funderEntity = databaseRepository.getFunderDao().getWithCritetia(criteria).getSingleOrDefault(); + Funder funderEntity = databaseRepository.getFunderDao().getWithCritetia(criteria).getSingleOrDefault(); if (funderEntity != null) funder.setId(funderEntity.getId()); else { funder.setType(Funder.FunderType.EXTERNAL.getValue()); @@ -120,7 +120,7 @@ public class QuickWizardManager { Project project = newDmp.getProject(); ProjectCriteria criteria = new ProjectCriteria(); criteria.setReference(project.getReference()); - eu.eudat.data.entities.Project projectEntity = databaseRepository.getProjectDao().getWithCritetia(criteria).getSingleOrDefault(); + Project projectEntity = databaseRepository.getProjectDao().getWithCritetia(criteria).getSingleOrDefault(); if (projectEntity != null) project.setId(projectEntity.getId()); else { if (project.getId() == null) project.setId(UUID.randomUUID()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java index dc81cc6bf..14ca7bfa1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RDAManager.java @@ -2,7 +2,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.models.rda.Dmp; import eu.eudat.models.rda.RDAModel; import eu.eudat.models.rda.mapper.DmpRDAMapper; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java index 9220d6221..a8c6ba855 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/RegistryManager.java @@ -3,7 +3,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.criteria.RegistryCriteria; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java index 3a7a13568..2cc95e672 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ResearcherManager.java @@ -1,10 +1,9 @@ package eu.eudat.logic.managers; import eu.eudat.logic.builders.model.models.ResearcherBuilder; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; -import eu.eudat.logic.utilities.helpers.ListHelper; import eu.eudat.models.data.external.ExternalSourcesItemModel; import eu.eudat.models.data.external.ResearchersExternalSourcesModel; import eu.eudat.data.query.items.item.researcher.ResearcherCriteriaRequest; @@ -46,7 +45,7 @@ public class ResearcherManager { public List getCriteriaWithExternal(ResearcherCriteriaRequest researcherCriteriaRequest, Principal principal) throws HugeResultSet, NoURLFound { - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao().getWithCriteria(researcherCriteriaRequest.getCriteria()); + QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao().getWithCriteria(researcherCriteriaRequest.getCriteria()); items.where((builder, root) -> builder.equal(root.get("creationUser").get("id"), principal.getId())); List researchers = items.select(item -> new eu.eudat.models.data.dmp.Researcher().fromDataModel(item)); researchers = researchers.stream().filter(item -> item.getKey().equals("Internal")).collect(Collectors.toList()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java index 222aa3675..3e492449b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ServiceManager.java @@ -3,7 +3,7 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.criteria.ServiceCriteria; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import eu.eudat.logic.proxy.config.ExternalUrlCriteria; import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; import eu.eudat.logic.proxy.config.exceptions.NoURLFound; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UnlinkEmailConfirmationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UnlinkEmailConfirmationManager.java index 452a11a86..5503f6cf6 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UnlinkEmailConfirmationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UnlinkEmailConfirmationManager.java @@ -3,8 +3,8 @@ package eu.eudat.logic.managers; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.CredentialEntity; -import eu.eudat.data.entities.EmailConfirmation; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.EmailConfirmation; +import eu.eudat.data.old.UserInfo; import eu.eudat.exceptions.emailconfirmation.HasConfirmedEmailException; import eu.eudat.exceptions.emailconfirmation.TokenExpiredException; import eu.eudat.logic.services.ApiContext; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java index 54e009158..a843a0f0f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/UserManager.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.CredentialEntity; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; import eu.eudat.data.dao.entities.UserInfoDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.DescriptionTemplate; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.DescriptionTemplate; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.data.query.items.table.userinfo.UserInfoTableRequestItem; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.logic.builders.entity.UserRoleBuilder; @@ -66,8 +66,8 @@ public class UserManager { } public DataTableData getPaged(UserInfoTableRequestItem userInfoTableRequestItem) throws Exception { - QueryableList users = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().getWithCriteria(userInfoTableRequestItem.getCriteria()).withHint(HintedModelFactory.getHint(UserListingModel.class)); - QueryableList pagedUsers = PaginationManager.applyPaging(users, userInfoTableRequestItem); + QueryableList users = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().getWithCriteria(userInfoTableRequestItem.getCriteria()).withHint(HintedModelFactory.getHint(UserListingModel.class)); + QueryableList pagedUsers = PaginationManager.applyPaging(users, userInfoTableRequestItem); List modelUsers = pagedUsers.select(item -> new UserListingModel().fromDataModel(item)); return apiContext.getOperationsContext().getBuilderFactory().getBuilder(DataTableDataBuilder.class).totalCount(users.count()).data(modelUsers).build(); @@ -75,7 +75,7 @@ public class UserManager { public List getCredentials(UUID userId) { List results = new ArrayList<>(); - eu.eudat.data.entities.UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); + UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); List credentials = apiContext.getOperationsContext().getDatabaseRepository().getCredentialDao().asQueryable().where((builder, root) -> builder.equal(root.get("userId"), user.getId())).toList(); credentials.forEach(credential -> { UserCredential userCredential = new UserCredential(); @@ -87,7 +87,7 @@ public class UserManager { } public UserProfile getSingle(UUID userId) throws Exception { - eu.eudat.data.entities.UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); + UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(userId); UserProfile profile = new UserProfile().fromDataModel(user); List roles = new LinkedList<>(); DataManagementPlanCriteria criteria = new DataManagementPlanCriteria(); @@ -99,7 +99,7 @@ public class UserManager { } public void editRoles(UserListingModel user) { - eu.eudat.data.entities.UserInfo userInfo = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(user.getId()); + UserInfo userInfo = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(user.getId()); userInfo.getUserRoles().stream().forEach(item -> apiContext.getOperationsContext().getDatabaseRepository().getUserRoleDao().delete(item)); for (Integer role : user.getAppRoles()) { UserRole userRole = apiContext.getOperationsContext().getBuilderFactory().getBuilder(UserRoleBuilder.class).role(role).userInfo(userInfo).build(); @@ -108,7 +108,7 @@ public class UserManager { } public void updateSettings(Map settings, Principal principal) throws IOException { - eu.eudat.data.entities.UserInfo userInfo = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); + UserInfo userInfo = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); apiContext.getOperationsContext().getDatabaseRepository().detachEntity(userInfo); HashMap result = new ObjectMapper().readValue(userInfo.getAdditionalinfo(), HashMap.class); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java index 2ae10cba8..3ffec38f4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/CollaboratorMapper.java @@ -1,6 +1,6 @@ package eu.eudat.logic.mapper.elastic; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.elastic.entities.Collaborator; public class CollaboratorMapper { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java index d799a4b10..310ff1247 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetMapper.java @@ -1,7 +1,7 @@ package eu.eudat.logic.mapper.elastic; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.elastic.criteria.DatasetCriteria; import eu.eudat.elastic.entities.Dataset; import eu.eudat.elastic.entities.Tag; @@ -22,7 +22,7 @@ public class DatasetMapper { this.datasetManager = datasetManager; } - public Dataset toElastic(eu.eudat.data.entities.Dataset dataset, List tags) throws Exception { + public Dataset toElastic(eu.eudat.data.old.Dataset dataset, List tags) throws Exception { if (dataset.getProfile() == null) { return null; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java index 75e979175..7bea29416 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DatasetTemplateMapper.java @@ -2,8 +2,7 @@ package eu.eudat.logic.mapper.elastic; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.DMPDatasetProfile; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DMPDatasetProfile; import eu.eudat.elastic.entities.DatasetTempalate; import java.util.HashMap; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java index a1b10170a..3b35f9eec 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/DmpMapper.java @@ -1,7 +1,7 @@ package eu.eudat.logic.mapper.elastic; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.elastic.entities.Dataset; import eu.eudat.elastic.entities.Dmp; import eu.eudat.elastic.entities.Tag; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java index 4eb5fb9d6..ff3a02f41 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/OrganizationMapper.java @@ -1,6 +1,6 @@ package eu.eudat.logic.mapper.elastic; -import eu.eudat.data.entities.Organisation; +import eu.eudat.data.old.Organisation; import eu.eudat.elastic.entities.Organization; public class OrganizationMapper { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java index d2345621f..3092d6dab 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/elastic/criteria/DmpCriteriaMapper.java @@ -1,7 +1,7 @@ package eu.eudat.logic.mapper.elastic.criteria; import eu.eudat.data.dao.criteria.DataManagementPlanCriteria; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.data.query.definition.helpers.ColumnOrderings; import eu.eudat.data.query.definition.helpers.Ordering; import eu.eudat.elastic.criteria.DmpCriteria; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java index 2cac6179c..b824216e3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/mapper/prefilling/PrefillingMapper.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.elastic.entities.Tag; import eu.eudat.logic.managers.DatasetManager; import eu.eudat.logic.managers.DatasetProfileManager; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/repositorydeposit/mapper/DMPToDepositMapper.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/repositorydeposit/mapper/DMPToDepositMapper.java index 4c6eeb975..db21be3e7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/repositorydeposit/mapper/DMPToDepositMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/repositorydeposit/mapper/DMPToDepositMapper.java @@ -1,9 +1,8 @@ package eu.eudat.logic.security.repositorydeposit.mapper; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.*; +import eu.eudat.data.old.*; import eu.eudat.depositinterface.models.*; import eu.eudat.logic.utilities.builders.XmlBuilder; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java index bbbb6d2f4..b1106f09d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java @@ -1,6 +1,6 @@ package eu.eudat.logic.services.operations.authentication; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.logic.managers.MetricsManager; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.data.security.Principal; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java index 12a341fb4..cd7fd5156 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/NonVerifiedUserEmailAuthenticationService.java @@ -1,8 +1,6 @@ package eu.eudat.logic.services.operations.authentication; -import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.logic.builders.model.models.PrincipalBuilder; import eu.eudat.logic.managers.MetricsManager; @@ -19,7 +17,6 @@ import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.HashSet; -import java.util.List; import java.util.UUID; @Service("nonVerifiedUserAuthenticationService") diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java index 36e399ae6..2aa2384eb 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/VerifiedUserAuthenticationService.java @@ -1,8 +1,8 @@ package eu.eudat.logic.services.operations.authentication; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.logic.builders.model.models.PrincipalBuilder; import eu.eudat.logic.managers.MetricsManager; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailService.java index dfb712d0f..d80e36768 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailService.java @@ -1,7 +1,7 @@ package eu.eudat.logic.services.utilities; import eu.eudat.data.dao.entities.EmailConfirmationDao; -import eu.eudat.data.entities.EmailConfirmation; +import eu.eudat.data.old.EmailConfirmation; import eu.eudat.models.data.security.Principal; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java index 52400bc01..912a17606 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import eu.eudat.data.dao.entities.EmailConfirmationDao; -import eu.eudat.data.entities.EmailConfirmation; +import eu.eudat.data.old.EmailConfirmation; import eu.eudat.models.data.mail.SimpleMail; import eu.eudat.models.data.security.Principal; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationService.java index 5c0ba9e37..cb40ea5c7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationService.java @@ -3,20 +3,22 @@ package eu.eudat.logic.services.utilities; import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.InvitationDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Invitation; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Invitation; +import eu.eudat.data.old.UserDMP; +import eu.eudat.data.old.UserInfo; import jakarta.mail.MessagingException; import java.util.List; import java.util.concurrent.CompletableFuture; public interface InvitationService { - void assignToDmp(DMPDao dmpDao, List users, DMP dmp); + void assignToDmp(DMPDao dmpDao, List users, DMP dmp); - void assignToDmp(DMPDao dmpDao, eu.eudat.data.entities.UserDMP user, DMP dmp); + void assignToDmp(DMPDao dmpDao, UserDMP user, DMP dmp); - void createInvitations(InvitationDao invitationDao, MailService mailService, List users, DMP dmp, Integer role, eu.eudat.data.entities.UserInfo creator) throws MessagingException; + void createInvitations(InvitationDao invitationDao, MailService mailService, List users, DMP dmp, Integer role, UserInfo creator) throws MessagingException; CompletableFuture sendInvitationAsync(DMP dmp, Invitation invitation, String recipient, MailService mailService, Integer role) throws MessagingException; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java index 7aa4067aa..de5c8a462 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java @@ -3,9 +3,10 @@ package eu.eudat.logic.services.utilities; import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.InvitationDao; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Invitation; -import eu.eudat.data.entities.UserDMP; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Invitation; +import eu.eudat.data.old.UserDMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.data.invitation.Properties; import eu.eudat.models.data.mail.SimpleMail; import org.slf4j.Logger; @@ -35,15 +36,15 @@ public class InvitationServiceImpl implements InvitationService { } @Override - public void assignToDmp(DMPDao dmpDao, List users, DMP dmp) { - for (eu.eudat.data.entities.UserDMP user : users) { + public void assignToDmp(DMPDao dmpDao, List users, DMP dmp) { + for (UserDMP user : users) { dmp.getUsers().add(user); } dmpDao.createOrUpdate(dmp); } @Override - public void assignToDmp(DMPDao dmpDao, eu.eudat.data.entities.UserDMP user, DMP dmp) { + public void assignToDmp(DMPDao dmpDao, UserDMP user, DMP dmp) { if (!dmp.getUsers().stream().map(x -> x.getUser().getId()).collect(Collectors.toList()).contains(user.getId())) { dmp.getUsers().add(user); dmpDao.createOrUpdate(dmp); @@ -51,8 +52,8 @@ public class InvitationServiceImpl implements InvitationService { } @Override - public void createInvitations(InvitationDao invitationDao, MailService mailService, List users, DMP dmp, Integer role, eu.eudat.data.entities.UserInfo creator) throws MessagingException { - for (eu.eudat.data.entities.UserInfo userInfo : users) { + public void createInvitations(InvitationDao invitationDao, MailService mailService, List users, DMP dmp, Integer role, UserInfo creator) throws MessagingException { + for (UserInfo userInfo : users) { Invitation invitation = new Invitation(); invitation.setDmp(dmp); invitation.setInvitationEmail(userInfo.getEmail()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index dea584ddd..39693ba22 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -3,10 +3,10 @@ package eu.eudat.logic.utilities.documents.word; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.Organisation; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.Organisation; +import eu.eudat.data.old.Researcher; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; import eu.eudat.logic.services.forms.VisibilityRuleService; import eu.eudat.logic.utilities.documents.types.ParagraphStyle; @@ -14,7 +14,6 @@ import eu.eudat.logic.utilities.interfaces.ApplierWithValue; import eu.eudat.logic.utilities.json.JavaToJson; import eu.eudat.models.data.components.commons.datafield.*; import eu.eudat.models.data.pid.PidLink; -import eu.eudat.models.data.pid.PidLinks; import eu.eudat.models.data.user.components.datasetprofile.Field; import eu.eudat.models.data.user.components.datasetprofile.FieldSet; import eu.eudat.models.data.user.components.datasetprofile.Section; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java index 2ada5ed33..3bef7e122 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java @@ -1,7 +1,7 @@ package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileModel; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprint.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprint.java index bf21ffd08..3de7cbe6a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprint.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/dmpXml/dmpBlueprintModel/DmpBlueprint.java @@ -1,6 +1,6 @@ package eu.eudat.logic.utilities.documents.xml.dmpXml.dmpBlueprintModel; -import eu.eudat.data.entities.DMPProfile; +import eu.eudat.data.old.DMPProfile; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/schedule/notification/NotificationScheduleJob.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/schedule/notification/NotificationScheduleJob.java index 60a6ef393..f1518e1b1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/schedule/notification/NotificationScheduleJob.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/schedule/notification/NotificationScheduleJob.java @@ -1,8 +1,8 @@ package eu.eudat.logic.utilities.schedule.notification; -import eu.eudat.data.entities.Notification; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.data.old.Notification; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.NotifyState; import eu.eudat.logic.managers.NotificationManager; import eu.eudat.logic.services.ApiContext; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java index 4037b3f13..d0304d0f2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java @@ -1,6 +1,6 @@ package eu.eudat.models.data.dashboard.recent.model; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel; import eu.eudat.models.data.listingmodels.UserInfoListingModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java index a8c62e188..537f0558f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java @@ -1,6 +1,6 @@ package eu.eudat.models.data.dashboard.recent.model; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.models.data.listingmodels.UserInfoListingModel; import eu.eudat.models.data.urls.DatasetUrlListing; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java index fc8b32c26..5023ca212 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/datarepository/DataRepositoryModel.java @@ -1,7 +1,7 @@ package eu.eudat.models.data.datarepository; -import eu.eudat.data.entities.DataRepository; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.DataRepository; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.DataModel; import java.util.Date; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java index 7a17bf7a4..475b9882f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DataRepository.java @@ -6,7 +6,7 @@ import eu.eudat.logic.utilities.helpers.LabelGenerator; import java.util.Date; import java.util.UUID; -public class DataRepository implements DataModel, LabelGenerator { +public class DataRepository implements DataModel, LabelGenerator { private String id; private String pid; private String name; @@ -80,7 +80,7 @@ public class DataRepository implements DataModel { +public class Dataset implements DataModel { private UUID id; private String label; private String reference; @@ -131,7 +131,7 @@ public class Dataset implements DataModel()); + entity.setRegistries(new HashSet()); for (Registry registry : this.registries) { entity.getRegistries().add(registry.toDataModel()); } @@ -170,7 +170,7 @@ public class Dataset implements DataModel()); for (DataRepository dataRepositoryModel : this.dataRepositories) { DatasetDataRepository datasetDataRepository = new DatasetDataRepository(); - eu.eudat.data.entities.DataRepository dataRepository = dataRepositoryModel.toDataModel(); + eu.eudat.data.old.DataRepository dataRepository = dataRepositoryModel.toDataModel(); datasetDataRepository.setDataRepository(dataRepository); entity.getDatasetDataRepositories().add(datasetDataRepository); } @@ -179,7 +179,7 @@ public class Dataset implements DataModel()); for (Service serviceModel : this.services) { - eu.eudat.data.entities.Service service = serviceModel.toDataModel(); + eu.eudat.data.old.Service service = serviceModel.toDataModel(); DatasetService datasetService = new DatasetService(); datasetService.setService(service); entity.getServices().add(datasetService); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java index 4091988ae..b989a8083 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/DatasetOverviewModel.java @@ -1,6 +1,6 @@ package eu.eudat.models.data.dataset; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.models.DataModel; import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel; import eu.eudat.models.data.grant.GrantOverviewModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java index 1c035e6a3..89fd7b774 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dataset/Registry.java @@ -6,7 +6,7 @@ import eu.eudat.logic.utilities.helpers.LabelGenerator; import java.util.Date; import java.util.UUID; -public class Registry implements DataModel, LabelGenerator { +public class Registry implements DataModel, LabelGenerator { private UUID id; private String label; private String abbreviation; @@ -68,7 +68,7 @@ public class Registry implements DataModel, LabelGenerator { +public class Service implements DataModel, LabelGenerator { private UUID id; private String label; @@ -65,7 +65,7 @@ public class Service implements DataModel()); for (DataRepository dataRepositoryModel : this.dataRepositories) { - eu.eudat.data.entities.DataRepository dataRepository = dataRepositoryModel.toDataModel(); + eu.eudat.data.old.DataRepository dataRepository = dataRepositoryModel.toDataModel(); DatasetDataRepository datasetDataRepository = new DatasetDataRepository(); datasetDataRepository.setDataRepository(dataRepository); Map> data = new HashMap<>(); @@ -283,7 +283,7 @@ public class DatasetWizardModel implements DataModel()); for (Service serviceModel : this.services) { - eu.eudat.data.entities.Service service = serviceModel.toDataModel(); + eu.eudat.data.old.Service service = serviceModel.toDataModel(); DatasetService datasetService = new DatasetService(); datasetService.setService(service); entity.getServices().add(datasetService); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java index 13343fa5b..0fc98b443 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/AssociatedProfile.java @@ -1,6 +1,6 @@ package eu.eudat.models.data.dmp; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.utilities.interfaces.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java index cf9905ffd..e2913fdf3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java @@ -2,13 +2,11 @@ package eu.eudat.models.data.dmp; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.*; -import eu.eudat.logic.utilities.builders.XmlBuilder; +import eu.eudat.data.old.*; import eu.eudat.models.DataModel; import eu.eudat.models.data.datasetwizard.DatasetWizardModel; import eu.eudat.models.data.doi.Doi; import eu.eudat.models.data.dynamicfields.DynamicFieldWithValue; -import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile; import eu.eudat.models.data.funder.Funder; import eu.eudat.models.data.helpermodels.Tuple; import eu.eudat.models.data.listingmodels.UserInfoListingModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java index c23ad1f14..c7e6fae0f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java @@ -2,12 +2,10 @@ package eu.eudat.models.data.dmp; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.*; -import eu.eudat.logic.utilities.builders.XmlBuilder; +import eu.eudat.data.old.*; import eu.eudat.models.DataModel; import eu.eudat.models.data.datasetwizard.DatasetWizardModel; import eu.eudat.models.data.dynamicfields.DynamicFieldWithValue; -import eu.eudat.models.data.entities.xmlmodels.dmpprofiledefinition.DataManagementPlanProfile; import eu.eudat.models.data.funder.FunderDMPEditorModel; import eu.eudat.models.data.helpermodels.Tuple; import eu.eudat.models.data.listingmodels.UserInfoListingModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java index 19f336111..796e8ef06 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanNewVersionModel.java @@ -1,7 +1,7 @@ package eu.eudat.models.data.dmp; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.*; +import eu.eudat.data.old.*; import eu.eudat.models.DataModel; import eu.eudat.models.data.dataset.Dataset; import eu.eudat.models.data.funder.FunderDMPEditorModel; @@ -176,10 +176,10 @@ public class DataManagementPlanNewVersionModel implements DataModel datasets = new LinkedList<>(); + List datasets = new LinkedList<>(); if (this.datasets != null) { for (Dataset dataset : this.datasets) { - eu.eudat.data.entities.Dataset entityDataset = new eu.eudat.data.entities.Dataset(); + eu.eudat.data.old.Dataset entityDataset = new eu.eudat.data.old.Dataset(); entityDataset.setId(dataset.getId()); datasets.add(entityDataset); } @@ -197,11 +197,11 @@ public class DataManagementPlanNewVersionModel implements DataModel, LabelGenerator { +public class Organisation implements DataModel, LabelGenerator { private String label; private String name; private String id; @@ -66,7 +66,7 @@ public class Organisation implements DataModel, LabelGenerator { +public class Researcher implements DataModel, LabelGenerator { private static final Logger logger = LoggerFactory.getLogger(Researcher.class); private String label; private String name; @@ -70,7 +70,7 @@ public class Researcher implements DataModel { +public class Funder implements DataModel { private UUID id; private String label; @@ -89,7 +90,7 @@ public class Funder implements DataModel } @Override - public Funder fromDataModel(eu.eudat.data.entities.Funder entity) { + public Funder fromDataModel(eu.eudat.data.old.Funder entity) { this.id = entity.getId(); this.label = entity.getLabel(); this.reference = entity.getReference(); @@ -111,8 +112,8 @@ public class Funder implements DataModel } @Override - public eu.eudat.data.entities.Funder toDataModel() { - eu.eudat.data.entities.Funder entity = new eu.eudat.data.entities.Funder(); + public eu.eudat.data.old.Funder toDataModel() { + eu.eudat.data.old.Funder entity = new eu.eudat.data.old.Funder(); if (this.getId() != null) { entity.setId(this.getId()); } else { @@ -137,7 +138,7 @@ public class Funder implements DataModel } entity.setDefinition(this.definition); entity.setCreated(this.created == null ? new Date() : this.created); - entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue()); + entity.setStatus(this.status != null ? this.getStatus() : Grant.Status.ACTIVE.getValue()); entity.setModified(new Date()); return entity; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java index 75e16a118..77bfa049c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java @@ -1,6 +1,6 @@ package eu.eudat.models.data.funder; -import eu.eudat.data.entities.Funder; +import eu.eudat.data.old.Funder; import eu.eudat.models.DataModel; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java index 798b3a6ab..b7ed79bbf 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/Grant.java @@ -1,7 +1,7 @@ package eu.eudat.models.data.grant; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Funder; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.DataModel; import eu.eudat.models.data.dmp.DataManagementPlan; import eu.eudat.models.data.files.ContentFile; @@ -12,7 +12,7 @@ import java.util.List; import java.util.UUID; -public class Grant implements DataModel { +public class Grant implements DataModel { private UUID id; private List dmps; @@ -24,7 +24,7 @@ public class Grant implements DataModel { private String definition; private Date startDate; private Date endDate; - private eu.eudat.data.entities.Grant.Status status; + private eu.eudat.data.old.Grant.Status status; private UserInfo creationUser; private Date created; private Date modified; @@ -108,7 +108,7 @@ public class Grant implements DataModel { return status.getValue(); } public void setStatus(Short status) { - this.status = eu.eudat.data.entities.Grant.Status.fromInteger(status); + this.status = eu.eudat.data.old.Grant.Status.fromInteger(status); } public UserInfo getCreationUser() { @@ -168,7 +168,7 @@ public class Grant implements DataModel { } @Override - public Grant fromDataModel(eu.eudat.data.entities.Grant entity) { + public Grant fromDataModel(eu.eudat.data.old.Grant entity) { this.id = entity.getId(); this.label = entity.getLabel(); this.abbreviation = entity.getAbbreviation(); @@ -198,8 +198,8 @@ public class Grant implements DataModel { } @Override - public eu.eudat.data.entities.Grant toDataModel() { - eu.eudat.data.entities.Grant entity = new eu.eudat.data.entities.Grant(); + public eu.eudat.data.old.Grant toDataModel() { + eu.eudat.data.old.Grant entity = new eu.eudat.data.old.Grant(); if (this.getId() != null) { entity.setId(this.getId()); } else { @@ -223,7 +223,7 @@ public class Grant implements DataModel { entity.setStartdate(this.startDate); entity.setCreated(this.created == null ? new Date() : this.created); entity.setEnddate(this.endDate); - entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.entities.Grant.Status.ACTIVE.getValue()); + entity.setStatus(this.status != null ? this.getStatus() : eu.eudat.data.old.Grant.Status.ACTIVE.getValue()); entity.setModified(new Date()); entity.setDescription(this.description); if (this.funderId != null) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantCriteriaModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantCriteriaModel.java index 3b1a4d01e..7eff562fa 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantCriteriaModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantCriteriaModel.java @@ -1,12 +1,12 @@ package eu.eudat.models.data.grant; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.models.DataModel; import java.util.UUID; -public class GrantCriteriaModel implements DataModel { +public class GrantCriteriaModel implements DataModel { private UUID id; public UUID getId() { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantListingModel.java index 89851c9b9..905d1faf2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantListingModel.java @@ -1,7 +1,7 @@ package eu.eudat.models.data.grant; -import eu.eudat.data.entities.Grant; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.Grant; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.DataModel; import eu.eudat.models.data.files.ContentFile; import eu.eudat.models.data.urls.DataManagementPlanUrlListing; @@ -13,7 +13,7 @@ import java.util.UUID; import java.util.stream.Collectors; -public class GrantListingModel implements DataModel { +public class GrantListingModel implements DataModel { private UUID id; @@ -171,13 +171,13 @@ public class GrantListingModel implements DataModel { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/lock/Lock.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/lock/Lock.java index c8a078057..46d8e5e9c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/lock/Lock.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/lock/Lock.java @@ -6,7 +6,7 @@ import eu.eudat.models.data.userinfo.UserInfo; import java.util.Date; import java.util.UUID; -public class Lock implements DataModel { +public class Lock implements DataModel { private UUID id; private UUID target; private UserInfo lockedBy; @@ -54,7 +54,7 @@ public class Lock implements DataModel { } @Override - public Lock fromDataModel(eu.eudat.data.entities.Lock entity) { + public Lock fromDataModel(eu.eudat.data.old.Lock entity) { this.id = entity.getId(); this.target = entity.getTarget(); this.lockedBy = new UserInfo().fromDataModel(entity.getLockedBy()); @@ -64,8 +64,8 @@ public class Lock implements DataModel { } @Override - public eu.eudat.data.entities.Lock toDataModel() throws Exception { - eu.eudat.data.entities.Lock entity = new eu.eudat.data.entities.Lock(); + public eu.eudat.data.old.Lock toDataModel() throws Exception { + eu.eudat.data.old.Lock entity = new eu.eudat.data.old.Lock(); entity.setId(this.getId()); entity.setTarget(this.getTarget()); entity.setLockedAt(this.getLockedAt()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/notiication/Notification.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/notiication/Notification.java index 4ee5d13f4..44897e010 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/notiication/Notification.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/notiication/Notification.java @@ -1,16 +1,16 @@ package eu.eudat.models.data.notiication; -import eu.eudat.data.enumeration.notification.ActiveStatus; -import eu.eudat.data.enumeration.notification.ContactType; -import eu.eudat.data.enumeration.notification.NotificationType; -import eu.eudat.data.enumeration.notification.NotifyState; +import eu.eudat.commons.enums.old.notification.ActiveStatus; +import eu.eudat.commons.enums.old.notification.ContactType; +import eu.eudat.commons.enums.old.notification.NotificationType; +import eu.eudat.commons.enums.old.notification.NotifyState; import eu.eudat.models.DataModel; import eu.eudat.models.data.userinfo.UserInfo; import java.util.Date; import java.util.UUID; -public class Notification implements DataModel { +public class Notification implements DataModel { private UUID id; private UserInfo userId; @@ -122,7 +122,7 @@ public class Notification implements DataModel { +public class Project implements DataModel { private UUID id; private List dmps; @@ -158,7 +159,7 @@ public class Project implements DataModel { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java index f84c204bf..57f9314bc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/researcher/Researcher.java @@ -7,7 +7,7 @@ import java.util.Date; /** * Created by ikalyvas on 2/5/2018. */ -public class Researcher implements DataModel { +public class Researcher implements DataModel { private String firstName; @@ -30,13 +30,13 @@ public class Researcher implements DataModel { +public class UserInfo implements DataModel { private UUID id; private String email = null; @@ -97,7 +97,7 @@ public class UserInfo implements DataModel { +public class UserInfoInvitationModel implements DataModel { private UUID id; private String email; private String name; @@ -36,7 +36,7 @@ public class UserInfoInvitationModel implements DataModel { +public class UserListingModel implements DataModel { private static final Logger logger = LoggerFactory.getLogger(UserListingModel.class); private UUID id; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/userinfo/UserProfile.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/userinfo/UserProfile.java index c6f04af26..85e4ea6dc 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/userinfo/UserProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/userinfo/UserProfile.java @@ -1,24 +1,20 @@ package eu.eudat.models.data.userinfo; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.*; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.DataModel; import eu.eudat.models.data.dmp.DataManagementPlan; import eu.eudat.models.data.dmp.Organisation; -import net.minidev.json.parser.JSONParser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.*; -import java.util.stream.Collectors; /** * Created by ikalyvas on 8/24/2018. */ -public class UserProfile implements DataModel { +public class UserProfile implements DataModel { private static final Logger logger = LoggerFactory.getLogger(UserProfile.class); private UUID id; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContactRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContactRDAMapper.java index 45d1248ec..d2999d6c4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContactRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContactRDAMapper.java @@ -1,8 +1,7 @@ package eu.eudat.models.rda.mapper; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.rda.Contact; -import eu.eudat.models.rda.ContactId; public class ContactRDAMapper { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContributorRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContributorRDAMapper.java index 2c2f1bcf0..88d41802e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContributorRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ContributorRDAMapper.java @@ -1,8 +1,8 @@ package eu.eudat.models.rda.mapper; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.Researcher; -import eu.eudat.data.entities.UserDMP; +import eu.eudat.data.old.Researcher; +import eu.eudat.data.old.UserDMP; import eu.eudat.models.rda.Contributor; import eu.eudat.models.rda.ContributorId; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java index 71b7df1b0..6b5bc6ac9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DatasetRDAMapper.java @@ -3,7 +3,7 @@ package eu.eudat.models.rda.mapper; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.elastic.criteria.DatasetCriteria; import eu.eudat.elastic.entities.Tag; import eu.eudat.logic.managers.DatasetManager; @@ -43,7 +43,7 @@ public class DatasetRDAMapper { } @Transactional - public Dataset toRDA(eu.eudat.data.entities.Dataset dataset, eu.eudat.models.rda.Dmp dmp) { + public Dataset toRDA(eu.eudat.data.old.Dataset dataset, eu.eudat.models.rda.Dmp dmp) { Dataset rda = new Dataset(); // rda.setDatasetId(DatasetIdRDAMapper.toRDA(dataset.getId())); if (dataset.getLabel() == null) { @@ -280,8 +280,8 @@ public class DatasetRDAMapper { } - public eu.eudat.data.entities.Dataset toEntity(Dataset rda, DescriptionTemplate defaultProfile) { - eu.eudat.data.entities.Dataset entity = new eu.eudat.data.entities.Dataset(); + public eu.eudat.data.old.Dataset toEntity(Dataset rda, DescriptionTemplate defaultProfile) { + eu.eudat.data.old.Dataset entity = new eu.eudat.data.old.Dataset(); entity.setLabel(rda.getTitle()); entity.setDescription(rda.getDescription()); try { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java index 219f3399f..e93aa35fd 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/DmpRDAMapper.java @@ -1,6 +1,6 @@ package eu.eudat.models.rda.mapper; -import eu.eudat.data.entities.*; +import eu.eudat.data.old.*; import eu.eudat.logic.services.ApiContext; import eu.eudat.logic.utilities.helpers.StreamDistinctBy; import eu.eudat.models.rda.Dmp; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/FundingRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/FundingRDAMapper.java index 2e692478f..3fea3d499 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/FundingRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/FundingRDAMapper.java @@ -1,8 +1,8 @@ package eu.eudat.models.rda.mapper; import eu.eudat.data.dao.criteria.GrantCriteria; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Funder; +import eu.eudat.data.old.Grant; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.rda.Funding; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ProjectRDAMapper.java b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ProjectRDAMapper.java index 2eccb27c7..bea495085 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ProjectRDAMapper.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/rda/mapper/ProjectRDAMapper.java @@ -1,7 +1,6 @@ package eu.eudat.models.rda.mapper; -import eu.eudat.data.entities.Funder; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.rda.Project; import org.slf4j.Logger; @@ -14,7 +13,7 @@ public class ProjectRDAMapper { private final static Logger logger = LoggerFactory.getLogger(ProjectRDAMapper.class); @Transactional - public static Project toRDA(eu.eudat.data.entities.Project project, Grant grant) { + public static Project toRDA(eu.eudat.data.old.Project project, Grant grant) { Project rda = new Project(); try { rda.setTitle(project.getLabel()); @@ -40,17 +39,17 @@ public class ProjectRDAMapper { public static Map toEntity(Project rda, ApiContext apiContext) { Map entities = new HashMap<>(); - entities.put("project", new eu.eudat.data.entities.Project()); - ((eu.eudat.data.entities.Project) entities.get("project")).setLabel(rda.getTitle()); - ((eu.eudat.data.entities.Project) entities.get("project")).setDescription(rda.getDescription()); - ((eu.eudat.data.entities.Project) entities.get("project")).setId(UUID.randomUUID()); - ((eu.eudat.data.entities.Project) entities.get("project")).setStatus((short)1); - ((eu.eudat.data.entities.Project) entities.get("project")).setCreated(new Date()); - ((eu.eudat.data.entities.Project) entities.get("project")).setModified(new Date()); - ((eu.eudat.data.entities.Project) entities.get("project")).setStartdate(new Date()); - ((eu.eudat.data.entities.Project) entities.get("project")).setEnddate(new Date()); - ((eu.eudat.data.entities.Project) entities.get("project")).setType(0); - apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().createOrUpdate(((eu.eudat.data.entities.Project) entities.get("project"))); + entities.put("project", new eu.eudat.data.old.Project()); + ((eu.eudat.data.old.Project) entities.get("project")).setLabel(rda.getTitle()); + ((eu.eudat.data.old.Project) entities.get("project")).setDescription(rda.getDescription()); + ((eu.eudat.data.old.Project) entities.get("project")).setId(UUID.randomUUID()); + ((eu.eudat.data.old.Project) entities.get("project")).setStatus((short)1); + ((eu.eudat.data.old.Project) entities.get("project")).setCreated(new Date()); + ((eu.eudat.data.old.Project) entities.get("project")).setModified(new Date()); + ((eu.eudat.data.old.Project) entities.get("project")).setStartdate(new Date()); + ((eu.eudat.data.old.Project) entities.get("project")).setEnddate(new Date()); + ((eu.eudat.data.old.Project) entities.get("project")).setType(0); + apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().createOrUpdate(((eu.eudat.data.old.Project) entities.get("project"))); for (int i = 0; i < rda.getFunding().size(); i++) { entities.put("grant" + (i + 1), FundingRDAMapper.toEntity(rda.getFunding().get(i), apiContext)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/v2/AccountBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/models/v2/AccountBuilder.java index ad1a31b50..c4398a63f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/v2/AccountBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/v2/AccountBuilder.java @@ -1,8 +1,8 @@ package eu.eudat.models.v2; import eu.eudat.commons.scope.user.UserScope; -import eu.eudat.data.entities.UserInfo; -import eu.eudat.data.entities.UserRole; +import eu.eudat.data.old.UserInfo; +import eu.eudat.data.old.UserRole; import eu.eudat.logic.services.ApiContext; import gr.cite.commons.web.authz.configuration.AuthorizationConfiguration; import gr.cite.commons.web.oidc.principal.CurrentPrincipalResolver; diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/validators/GrantModelValidator.java b/dmp-backend/web/src/main/java/eu/eudat/models/validators/GrantModelValidator.java index 7c2a80d34..8e0588071 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/validators/GrantModelValidator.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/validators/GrantModelValidator.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; public class GrantModelValidator extends FluentValidator { public GrantModelValidator() { - ruleFor(x -> x.getType()).compareAs((x -> eu.eudat.data.entities.Grant.GrantType.EXTERNAL.getValue()), (leftItem, rightItem) -> leftItem == rightItem) + ruleFor(x -> x.getType()).compareAs((x -> eu.eudat.data.old.Grant.GrantType.EXTERNAL.getValue()), (leftItem, rightItem) -> leftItem == rightItem) .withName("type").withMessage("grant.external.edit"); ruleFor(x -> x.getStartDate()).compareAs((x -> x.getEndDate()), (leftItem, rightItem) -> leftItem.after(rightItem)) .withName("startDate").withMessage("grant.startDate.overlapping") diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java index fd3f210b1..16e63d2b0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dataset/DatasetPublicCriteria.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.criteria.dataset; import eu.eudat.data.dao.criteria.Criteria; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.elastic.entities.Tag; import io.swagger.annotations.ApiModelProperty; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dmp/DataManagementPlanPublicCriteria.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dmp/DataManagementPlanPublicCriteria.java index 6a430deb1..9c2cc721c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dmp/DataManagementPlanPublicCriteria.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/criteria/dmp/DataManagementPlanPublicCriteria.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.criteria.dmp; import eu.eudat.data.dao.criteria.Criteria; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import io.swagger.annotations.ApiModelProperty; import java.util.Date; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DataManagementPlanPublicManager.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DataManagementPlanPublicManager.java index bf8a6339d..d92c98324 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DataManagementPlanPublicManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DataManagementPlanPublicManager.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.managers; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.exceptions.security.ForbiddenException; import eu.eudat.logic.managers.PaginationManager; import eu.eudat.logic.services.ApiContext; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java index d2b27919d..5b3f92790 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/managers/DatasetPublicManager.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.managers; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.data.query.definition.helpers.ColumnOrderings; import eu.eudat.elastic.criteria.DatasetCriteria; import eu.eudat.elastic.repository.DatasetRepository; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java index b04f57678..f3232baa3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/associatedprofile/AssociatedProfilePublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.associatedprofile; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.utilities.interfaces.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java index 3bcd38302..bb9d2f486 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetprofile/DatasetProfilePublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.datasetprofile; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.models.DataModel; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/DataRepositoryPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/DataRepositoryPublicModel.java index a99af2a20..d922c7447 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/DataRepositoryPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/DataRepositoryPublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.datasetwizard; -import eu.eudat.data.entities.DataRepository; +import eu.eudat.data.old.DataRepository; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ExternalDatasetPublicListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ExternalDatasetPublicListingModel.java index e625eff85..13e8f2239 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ExternalDatasetPublicListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ExternalDatasetPublicListingModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.datasetwizard; -import eu.eudat.data.entities.ExternalDataset; +import eu.eudat.data.old.ExternalDataset; import eu.eudat.models.DataModel; import eu.eudat.types.externalsourcetype.ExternalDatasetType; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/RegistryPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/RegistryPublicModel.java index 8fbfa8329..9e6a5a34f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/RegistryPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/RegistryPublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.datasetwizard; -import eu.eudat.data.entities.Registry; +import eu.eudat.data.old.Registry; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ServicePublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ServicePublicModel.java index 8ff8184f2..6e9359da5 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ServicePublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/datasetwizard/ServicePublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.datasetwizard; -import eu.eudat.data.entities.Service; +import eu.eudat.data.old.Service; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/doi/DoiPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/doi/DoiPublicModel.java index 4b8c5dbae..ec0b12d52 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/doi/DoiPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/doi/DoiPublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.doi; -import eu.eudat.data.entities.EntityDoi; +import eu.eudat.data.old.EntityDoi; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/funder/FunderPublicOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/funder/FunderPublicOverviewModel.java index 86accf613..c64eac892 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/funder/FunderPublicOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/funder/FunderPublicOverviewModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.funder; -import eu.eudat.data.entities.Funder; +import eu.eudat.data.old.Funder; import eu.eudat.models.DataModel; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/grant/GrantPublicOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/grant/GrantPublicOverviewModel.java index 75f17c937..04fb519cf 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/grant/GrantPublicOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/grant/GrantPublicOverviewModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.grant; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.Grant; import eu.eudat.models.DataModel; import eu.eudat.publicapi.models.funder.FunderPublicOverviewModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java index b8750a85d..a2ec2b725 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DataManagementPlanPublicListingModel.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.models.listingmodels; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Grant; import eu.eudat.models.DataModel; import eu.eudat.publicapi.models.researcher.ResearcherPublicModel; import eu.eudat.publicapi.models.user.UserInfoPublicModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DatasetPublicListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DatasetPublicListingModel.java index 5a9685d26..9744fb82b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DatasetPublicListingModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/listingmodels/DatasetPublicListingModel.java @@ -1,8 +1,8 @@ package eu.eudat.publicapi.models.listingmodels; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.Grant; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.Grant; import eu.eudat.models.DataModel; import eu.eudat.publicapi.models.datasetprofile.DatasetProfilePublicModel; import eu.eudat.publicapi.models.user.UserInfoPublicModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/organisation/OrganizationPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/organisation/OrganizationPublicModel.java index 05042d65e..05157ceba 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/organisation/OrganizationPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/organisation/OrganizationPublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.organisation; -import eu.eudat.data.entities.Organisation; +import eu.eudat.data.old.Organisation; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java index fb71677c5..8f280c1ff 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DataManagementPlanPublicModel.java @@ -2,13 +2,12 @@ package eu.eudat.publicapi.models.overviewmodels; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.entities.DMP; -import eu.eudat.data.entities.DMPDatasetProfile; -import eu.eudat.data.entities.Dataset; -import eu.eudat.data.entities.DescriptionTemplate; +import eu.eudat.data.old.DMP; +import eu.eudat.data.old.DMPDatasetProfile; +import eu.eudat.data.old.Dataset; +import eu.eudat.data.old.DescriptionTemplate; import eu.eudat.logic.utilities.builders.XmlBuilder; import eu.eudat.models.DataModel; -import eu.eudat.models.data.dmp.AssociatedProfile; import eu.eudat.models.data.user.composite.PagedDatasetProfile; import eu.eudat.publicapi.models.associatedprofile.AssociatedProfilePublicModel; import eu.eudat.publicapi.models.doi.DoiPublicModel; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java index aa3ae7779..ec0ca0d59 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/overviewmodels/DatasetPublicModel.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.models.overviewmodels; -import eu.eudat.data.entities.*; +import eu.eudat.data.old.*; import eu.eudat.elastic.entities.Tag; import eu.eudat.models.DataModel; import eu.eudat.models.data.user.composite.PagedDatasetProfile; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/researcher/ResearcherPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/researcher/ResearcherPublicModel.java index 0630ffd12..bf57f8423 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/researcher/ResearcherPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/researcher/ResearcherPublicModel.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.models.researcher; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import eu.eudat.data.entities.Researcher; +import eu.eudat.data.old.Researcher; import eu.eudat.logic.utilities.helpers.LabelGenerator; import eu.eudat.models.DataModel; import org.slf4j.Logger; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/user/UserInfoPublicModel.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/user/UserInfoPublicModel.java index 8e08fab36..c553644e2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/user/UserInfoPublicModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/models/user/UserInfoPublicModel.java @@ -1,7 +1,7 @@ package eu.eudat.publicapi.models.user; -import eu.eudat.data.entities.UserDMP; -import eu.eudat.data.entities.UserInfo; +import eu.eudat.data.old.UserDMP; +import eu.eudat.data.old.UserInfo; import eu.eudat.models.DataModel; import java.util.UUID; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dataset/DatasetPublicTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dataset/DatasetPublicTableRequest.java index 44f096e89..73e61ff8e 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dataset/DatasetPublicTableRequest.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dataset/DatasetPublicTableRequest.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.request.dataset; -import eu.eudat.data.entities.Dataset; +import eu.eudat.data.old.Dataset; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.publicapi.criteria.dataset.DatasetPublicCriteria; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dmp/DataManagmentPlanPublicTableRequest.java b/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dmp/DataManagmentPlanPublicTableRequest.java index c28bf6040..133be1a93 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dmp/DataManagmentPlanPublicTableRequest.java +++ b/dmp-backend/web/src/main/java/eu/eudat/publicapi/request/dmp/DataManagmentPlanPublicTableRequest.java @@ -1,6 +1,6 @@ package eu.eudat.publicapi.request.dmp; -import eu.eudat.data.entities.DMP; +import eu.eudat.data.old.DMP; import eu.eudat.data.query.PaginationService; import eu.eudat.data.query.definition.TableQuery; import eu.eudat.publicapi.criteria.dmp.DataManagementPlanPublicCriteria; @@ -10,7 +10,6 @@ import eu.eudat.queryable.types.SelectionField; import jakarta.persistence.criteria.Predicate; import java.util.*; -import java.util.stream.Collectors; public class DataManagmentPlanPublicTableRequest extends TableQuery { From b2119abc08cca7e83ce02dc64ac941d4bc019564 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 13:48:20 +0300 Subject: [PATCH 7/8] fix issue --- .../eu/eudat/model/ExternalReference.java | 124 ------------ .../eu/eudat/model/ExternalReference2.java | 178 ------------------ .../eu/eudat/service/ValidationService.java | 30 --- .../ExternalReferencesCacheOptions.java | 10 - .../ExternalReferencesCacheService.java | 67 ------- .../ExternalReferencesServiceImpl.java | 97 ---------- .../externalreferences/FunderService.java | 64 ------- .../externalreferences/ProjectService.java | 60 ------ 8 files changed, 630 deletions(-) delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java delete mode 100644 dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java deleted file mode 100644 index 3361db6a5..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference.java +++ /dev/null @@ -1,124 +0,0 @@ -package eu.eudat.model; - -import eu.eudat.data.entities.DataRepository; -import eu.eudat.data.entities.UserInfo; - -import java.util.Date; -import java.util.UUID; - -public class ExternalReference { - private UUID id; - private String name; - private String pid; - private String abbreviation; - private String uri; - private Date created; - private Date modified; - private String tag; // Api fetching the data - private String source; // Actual harvested source - - public UUID getId() { - return id; - } - public void setId(UUID id) { - this.id = id; - } - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - public String getPid() { - return pid; - } - public void setPid(String pid) { - this.pid = pid; - } - - public String getAbbreviation() { - return abbreviation; - } - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getUri() { - return uri; - } - public void setUri(String uri) { - this.uri = uri; - } - - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; - } - - public Date getModified() { - return modified; - } - public void setModified(Date modified) { - this.modified = modified; - } - - public String getTag() { - return tag; - } - public void setTag(String tag) { - this.tag = tag; - } - - public String getSource() { - return source; - } - public void setSource(String source) { - this.source = source; - } - - - public ExternalReference fromDataModel(DataRepository entity) { - this.setAbbreviation(entity.getAbbreviation()); - this.setName(entity.getLabel()); - this.setUri(entity.getUri()); - this.setId(entity.getId()); - this.setPid(entity.getReference()); - String source1 = entity.getReference().substring(0, entity.getReference().indexOf(":")); - if (source1.equals("dmp")) { - this.source = "Internal"; - } else { - this.source = source1; - } - return this; - } - - public DataRepository toDataModel() throws Exception { - DataRepository dataRepository = new DataRepository(); - dataRepository.setId(this.id != null ? this.id : UUID.randomUUID()); - dataRepository.setAbbreviation(this.abbreviation); - dataRepository.setCreated(this.created != null ? this.created : new Date()); - dataRepository.setModified(new Date()); - dataRepository.setLabel(this.name); - if (this.source != null) { - if (this.source.equals("Internal") || this.source.equals(this.id.toString().substring(0, this.source.length()))) { - dataRepository.setReference(this.id.toString()); - } else { - dataRepository.setReference(this.source + ":" + dataRepository.getId()); - } - } else { - dataRepository.setReference("dmp:" + dataRepository.getId()); - } - dataRepository.setUri(this.uri); - dataRepository.setStatus((short) 0); - dataRepository.setCreationUser(new UserInfo()); - return dataRepository; - } - - public String getHint() { - return null; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java b/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java deleted file mode 100644 index 60b7a66f5..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/model/ExternalReference2.java +++ /dev/null @@ -1,178 +0,0 @@ -package eu.eudat.model; - -import eu.eudat.data.entities.Registry; -import eu.eudat.data.entities.Service; -import eu.eudat.data.entities.UserInfo; - -import java.util.Date; -import java.util.UUID; - -public class ExternalReference2 { - private UUID id; - private String label; - private String name; - private String pid; - private String abbreviation; - private String uri; - private Date created; - private Date modified; - private String reference; - private String tag; - private String source; - - public UUID getId() { - return id; - } - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - public void setLabel(String label) { - this.label = label; - } - - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - - public String getPid() { - return pid; - } - public void setPid(String pid) { - this.pid = pid; - } - - public String getAbbreviation() { - return abbreviation; - } - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getUri() { - return uri; - } - public void setUri(String uri) { - this.uri = uri; - } - - public Date getCreated() { - return created; - } - public void setCreated(Date created) { - this.created = created; - } - - public Date getModified() { - return modified; - } - public void setModified(Date modified) { - this.modified = modified; - } - - public String getReference() { - return reference; - } - public void setReference(String reference) { - this.reference = reference; - } - - public String getTag() { - return tag; - } - public void setTag(String tag) { - this.tag = tag; - } - - public String getSource() { - return source; - } - public void setSource(String source) { - this.source = source; - } - - public ExternalReference2 fromDataModel(Service entity) { - this.abbreviation = entity.getAbbreviation(); - this.created = entity.getCreated(); - this.id = entity.getId(); - this.label = entity.getLabel(); - this.name = entity.getLabel(); - this.modified = entity.getModified(); - this.uri = entity.getUri(); - String source = entity.getReference().substring(0, entity.getReference().indexOf(":")); - if (source.equals("dmp")) { - this.source = "Internal"; - } else { - this.source = source; - } - return this; - } - - public ExternalReference2 fromDataModel(Registry entity) { - this.id = entity.getId(); - this.abbreviation = entity.getAbbreviation(); - this.created = entity.getCreated(); - this.label = entity.getLabel(); - this.name = entity.getLabel(); - this.modified = entity.getModified(); - this.uri = entity.getUri(); - String source1 = entity.getReference().substring(0, entity.getReference().indexOf(":")); - if (source1.equals("dmp")) { - this.source = "Internal"; - } else { - this.source = source1; - } - this.reference = entity.getReference(); - return this; - } - - public Service toDataModelService() throws Exception { - Service service = new Service(); - service.setId(this.id != null ? this.id : UUID.randomUUID()); - service.setAbbreviation(this.abbreviation); - service.setCreated(this.created != null ? this.created : new Date()); - service.setLabel(this.label != null ? this.label : this.name); - service.setModified(new Date()); - service.setUri(this.uri); - if (this.source == null) this.source = "dmp"; - if (this.reference == null) this.reference = service.getId().toString(); - if (this.source.equals(this.reference.substring(0, this.source.length()))) { - service.setReference(this.reference); - } else { - service.setReference(this.source + ":" + this.reference); - } - service.setModified(new Date()); - service.setStatus((short) 0); - service.setCreationUser(new UserInfo()); - return service; - } - - public Registry toDataModelRegistry() throws Exception { - Registry registry = new Registry(); - registry.setAbbreviation(this.abbreviation); - registry.setCreated(this.created != null ? this.created : new Date()); - registry.setId(this.id != null ? this.id : UUID.randomUUID()); - registry.setLabel(this.label != null ? this.label : this.name); - registry.setUri(this.uri); - registry.setModified(new Date()); - if (this.source == null) this.source = "dmp"; - if (this.source.equals(registry.getId().toString().substring(0, this.source.length()))) { - registry.setReference(registry.getId().toString()); - } else { - registry.setReference(this.source + ":" + registry.getId()); - } - registry.setStatus((short)0); - registry.setCreationUser(new UserInfo()); - return registry; - } - - public String getHint() { - return null; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java b/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java deleted file mode 100644 index b736a2018..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/ValidationService.java +++ /dev/null @@ -1,30 +0,0 @@ -package eu.eudat.service; - -import eu.eudat.logic.proxy.config.ExternalUrlCriteria; -import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; -import eu.eudat.logic.proxy.config.exceptions.NoURLFound; -import eu.eudat.logic.proxy.fetching.RemoteFetcher; -import eu.eudat.models.data.security.Principal; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ValidationService { - - private RemoteFetcher remoteFetcher; - - @Autowired - public ValidationService(RemoteFetcher remoteFetcher) { - super(); - this.remoteFetcher = remoteFetcher; - } - - public Boolean validateIdentifier(String identifier, String type, Principal principal) throws NoURLFound, HugeResultSet { - ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(identifier); - Integer count = this.remoteFetcher.findEntries(externalUrlCriteria, type); - return principal != null && count > 0; - } - - - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java deleted file mode 100644 index d224ee815..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheOptions.java +++ /dev/null @@ -1,10 +0,0 @@ -package eu.eudat.service.externalreferences; - -import gr.cite.tools.cache.CacheOptions; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@ConfigurationProperties(prefix = "cache.external-reference") -public class ExternalReferencesCacheOptions extends CacheOptions { -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java deleted file mode 100644 index 18d82d1b5..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesCacheService.java +++ /dev/null @@ -1,67 +0,0 @@ -package eu.eudat.service.externalreferences; - -import eu.eudat.proxy.config.ExternalUrlCriteria; -import gr.cite.tools.cache.CacheService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Locale; - -@Service -public class ExternalReferencesCacheService extends CacheService { - - public static class ExternalReferencesCacheValue { - - public ExternalReferencesCacheValue() {} - - public ExternalReferencesCacheValue(String externalType, ExternalUrlCriteria externalUrlCriteria) { - this.externalType = externalType; - this.externalUrlCriteria = externalUrlCriteria; - } - - private String externalType; - - private ExternalUrlCriteria externalUrlCriteria; - - public String getExternalType() { - return externalType; - } - - public void setExternalType(String externalType) { - this.externalType = externalType; - } - - public ExternalUrlCriteria getExternalUrlCriteria() { - return externalUrlCriteria; - } - - public void setExternalUrlCriteria(ExternalUrlCriteria externalUrlCriteria) { - this.externalUrlCriteria = externalUrlCriteria; - } - } - - @Autowired - public ExternalReferencesCacheService(ExternalReferencesCacheOptions options) { - super(options); - } - - @Override - protected Class valueClass() {return ExternalReferencesCacheService.ExternalReferencesCacheValue.class;} - - public String keyOf(ExternalReferencesCacheService.ExternalReferencesCacheValue value) { - return this.buildKey(value.getExternalType(), value.getExternalUrlCriteria()); - } - - public String buildKey(String externalType, ExternalUrlCriteria externalUrlCriteria) { - HashMap keyParts = new HashMap<>(); - - keyParts.put("$type$", externalType.toLowerCase(Locale.ROOT)); - - StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(externalUrlCriteria); - keyParts.put("$criteria$", stringBuffer.toString().toLowerCase(Locale.ROOT)); - - return this.generateKey(keyParts); - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java deleted file mode 100644 index 41f2c0331..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ExternalReferencesServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package eu.eudat.service.externalreferences; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import eu.eudat.data.dao.criteria.DataRepositoryCriteria; -import eu.eudat.data.dao.criteria.RegistryCriteria; -import eu.eudat.data.dao.criteria.ServiceCriteria; -import eu.eudat.data.entities.DataRepository; -import eu.eudat.data.entities.Registry; -import eu.eudat.data.entities.Service; -import eu.eudat.logic.proxy.config.ExternalUrlCriteria; -import eu.eudat.logic.proxy.config.exceptions.HugeResultSet; -import eu.eudat.logic.proxy.config.exceptions.NoURLFound; -import eu.eudat.logic.services.ApiContext; -import eu.eudat.model.ExternalReference2; -import eu.eudat.model.ExternalReference; -import eu.eudat.models.data.security.Principal; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -public class ExternalReferencesServiceImpl implements ExternalReferencesService{ - - private final ApiContext apiContext; - - public ExternalReferencesServiceImpl(ApiContext apiContext) { - this.apiContext = apiContext; - } - - @Override - public DataRepository create(ExternalReference externalReference, Principal principal) throws Exception { - // only dataRepositories, pubRepositories, journals - DataRepository dataRepository = externalReference.toDataModel(); - dataRepository.getCreationUser().setId(principal.getId()); - return apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().createOrUpdate(dataRepository); - } - - @Override - public List getExternal(String externalType, String query, String type, Principal principal) throws HugeResultSet, NoURLFound { - ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().get(externalType, externalUrlCriteria, type); - - DataRepositoryCriteria criteria = new DataRepositoryCriteria(); - if (!query.isEmpty()) criteria.setLike(query); - - List list = new LinkedList<>(); - if((externalType.equals("dataRepositories") || externalType.equals("pubRepositories") || externalType.equals("journals"))){ - criteria.setCreationUserId(principal.getId()); - if (type.equals("")) { - List dataRepositoryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getDataRepositoryDao().getWithCriteria(criteria)).toList(); - list = dataRepositoryList.stream().map(item -> new ExternalReference().fromDataModel(item)).collect(Collectors.toList()); - } - } - - ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - list.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ExternalReference.class)).collect(Collectors.toList())); - list = list.stream().filter(licenseModel -> licenseModel.getName().toLowerCase().contains(query.toLowerCase())).collect(Collectors.toList()); - return list; - } - - public List getExternal2(String externalType, String query, String type, Principal principal) throws HugeResultSet,NoURLFound { - ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().get(externalType,externalUrlCriteria, type); - - List list = new LinkedList<>(); - - if (externalType.equals("registries")){ - RegistryCriteria criteria = new RegistryCriteria(); - - if (!query.isEmpty()) criteria.setLike(query); - criteria.setCreationUserId(principal.getId()); - - if (type.equals("")) { - List registryList = (this.apiContext.getOperationsContext().getDatabaseRepository().getRegistryDao().getWithCriteria(criteria)).toList(); - list = registryList.stream().map(item -> new ExternalReference2().fromDataModel(item)).collect(Collectors.toList()); - } - } else if (externalType.equals("services")) { - ServiceCriteria criteria = new ServiceCriteria(); - - if (!query.isEmpty()) criteria.setLike(query); - criteria.setCreationUserId(principal.getId()); - - if (type.equals("")) { - List serviceList = (this.apiContext.getOperationsContext().getDatabaseRepository().getServiceDao().getWithCriteria(criteria)).toList(); - list = serviceList.stream().map(item -> new ExternalReference2().fromDataModel(item)).collect(Collectors.toList()); - } - } - - ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - list.addAll(remoteRepos.stream().map(item -> mapper.convertValue(item, ExternalReference2.class)).collect(Collectors.toList())); - - return list; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java deleted file mode 100644 index 6596e0d53..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/FunderService.java +++ /dev/null @@ -1,64 +0,0 @@ -package eu.eudat.service.externalreferences; - -import eu.eudat.data.query.items.item.funder.FunderCriteriaRequest; -import eu.eudat.logic.builders.model.models.FunderBuilder; -import eu.eudat.proxy.config.ExternalUrlCriteria; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; -import eu.eudat.proxy.fetching.RemoteFetcher; -import eu.eudat.logic.utilities.helpers.ListHelper; -import eu.eudat.models.data.external.ExternalSourcesItemModel; -import eu.eudat.models.data.external.FundersExternalSourcesModel; -import eu.eudat.models.data.funder.Funder; -import eu.eudat.models.data.security.Principal; -import eu.eudat.queryable.QueryableList; -import org.springframework.stereotype.Service; - -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class FunderService { - - private ApiContext apiContext; - private RemoteFetcher remoteFetcher; - private ListHelper listHelper; - - public FunderService(ApiContext apiContext, RemoteFetcher remoteFetcher, ListHelper listHelper) { - this.apiContext = apiContext; - this.remoteFetcher = remoteFetcher; - this.listHelper = listHelper; - } - - public List getCriteriaWithExternal(FunderCriteriaRequest funderCriteria, Principal principal) throws HugeResultSet, NoURLFound { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); - userInfo.setId(principal.getId()); - funderCriteria.getCriteria().setReference("dmp:"); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getWithCritetia(funderCriteria.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getFunderDao().getAuthenticated(items, userInfo); - List funders = authItems.select(item -> new Funder().fromDataModel(item)); - ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(funderCriteria.getCriteria().getLike()); - List> remoteRepos = remoteFetcher.getFunders(externalUrlCriteria); - FundersExternalSourcesModel fundersExternalSourcesModel = new FundersExternalSourcesModel().fromExternalItem(remoteRepos); - for (ExternalSourcesItemModel externalListingItem : fundersExternalSourcesModel) { - Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) - .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) - .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) - .key(externalListingItem.getKey()) - .source(externalListingItem.getTag()) - .build(); - if (externalListingItem.getSource() != null) { - funder.setSource(externalListingItem.getSource()); - } else { - funder.setSource(externalListingItem.getTag()); - } - - funders.add(funder); - } - funders.sort(Comparator.comparing(Funder::getLabel)); - funders = funders.stream().filter(listHelper.distinctByKey(Funder::getLabel)).collect(Collectors.toList()); - return funders; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java b/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java deleted file mode 100644 index 48f7bd910..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/service/externalreferences/ProjectService.java +++ /dev/null @@ -1,60 +0,0 @@ -package eu.eudat.service.externalreferences; - -import eu.eudat.data.query.items.item.project.ProjectCriteriaRequest; -import eu.eudat.logic.builders.model.models.ProjectBuilder; -import eu.eudat.proxy.config.ExternalUrlCriteria; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; -import eu.eudat.proxy.fetching.RemoteFetcher; -import eu.eudat.logic.utilities.helpers.ListHelper; -import eu.eudat.models.data.external.ExternalSourcesItemModel; -import eu.eudat.models.data.external.ProjectsExternalSourcesModel; -import eu.eudat.models.data.project.Project; -import eu.eudat.models.data.security.Principal; -import eu.eudat.queryable.QueryableList; -import org.springframework.stereotype.Service; - -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -public class ProjectService { - - private ApiContext apiContext; - private RemoteFetcher remoteFetcher; - private ListHelper listHelper; - - public ProjectService(ApiContext apiContext, ListHelper listHelper) { - this.apiContext = apiContext; - this.remoteFetcher = apiContext.getOperationsContext().getRemoteFetcher(); - this.listHelper = listHelper; - } - - public List getCriteriaWithExternal(ProjectCriteriaRequest projectCriteria, Principal principal) throws HugeResultSet, NoURLFound { - eu.eudat.data.entities.UserInfo userInfo = new eu.eudat.data.entities.UserInfo(); - userInfo.setId(principal.getId()); - projectCriteria.getCriteria().setReference("dmp:"); - QueryableList items = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getWithCritetia(projectCriteria.getCriteria()); - QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getProjectDao().getAuthenticated(items, userInfo); - List projects = authItems.select(item -> new Project().fromDataModel(item)); - ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(projectCriteria.getCriteria().getLike()); - List> remoteRepos = remoteFetcher.getProjects(externalUrlCriteria); - ProjectsExternalSourcesModel projectsExternalSourcesModel = new ProjectsExternalSourcesModel().fromExternalItem(remoteRepos); - for (ExternalSourcesItemModel externalListingItem : projectsExternalSourcesModel) { - Project project = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ProjectBuilder.class) - .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) - .description(externalListingItem.getDescription()).uri(externalListingItem.getUri()) - .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.entities.Project.Status.fromInteger(0)) - .key(externalListingItem.getKey()) - .source(externalListingItem.getTag()) - .build(); - - projects.add(project); - } - projects.sort(Comparator.comparing(Project::getLabel)); - projects = projects.stream().filter(listHelper.distinctByKey(Project::getLabel)).collect(Collectors.toList()); - return projects; - } -} From 5203ec4b729b03825bab447c49644b872f157eb9 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 18 Oct 2023 13:53:52 +0300 Subject: [PATCH 8/8] fix remote fetcher --- .../logic/proxy/fetching/RemoteFetcher.java | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java index 212d8f4ad..86a9742f9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/fetching/RemoteFetcher.java @@ -50,56 +50,6 @@ public class RemoteFetcher { ).clientConnector(new ReactorClientHttpConnector(HttpClient.create().followRedirect(true))).build(); } - //@Cacheable(value = "tempexternalType", keyGenerator = "externalUrlsKeyGenerator") - public List> get(String externalType, ExternalUrlCriteria externalUrlCriteria, String key) throws eu.eudat.proxy.config.exceptions.NoURLFound, eu.eudat.proxy.config.exceptions.HugeResultSet { - List urlConfigs = null; - FetchStrategy fetchStrategy = null; - switch (externalType){ - case "taxonomies": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getTaxonomies().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getTaxonomies().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getTaxonomies().getFetchMode(); - break; - case "licenses": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getLicenses().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getLicenses().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getLicenses().getFetchMode(); - break; - case "publications": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPublications().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getPublications().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getPublications().getFetchMode(); - break; - case "journals": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getJournals().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getJournals().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getJournals().getFetchMode(); - break; - case "pubRepositories": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getPubRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getPubRepositories().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getPubRepositories().getFetchMode(); - break; - case "dataRepositories": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRepositories().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getRepositories().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getRepositories().getFetchMode(); - break; - case "registries": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getRegistries().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getRegistries().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getRegistries().getFetchMode(); - break; - case "services": - urlConfigs = key != null && !key.isEmpty() ? configLoader.getExternalUrls().getServices().getUrls().stream().filter(item -> item.getKey().equals(key)).collect(Collectors.toList()) - : configLoader.getExternalUrls().getServices().getUrls(); - fetchStrategy = configLoader.getExternalUrls().getServices().getFetchMode(); - break; - } - - return getAll(urlConfigs, fetchStrategy, externalUrlCriteria); - } - @Cacheable(value = "repositories", keyGenerator = "externalUrlsKeyGenerator") public List> getRepositories(ExternalUrlCriteria externalUrlCriteria, String key) throws NoURLFound, HugeResultSet { List urlConfigs =