diff --git a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeConfiguration.java deleted file mode 100644 index 5276394ee..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeConfiguration.java +++ /dev/null @@ -1,17 +0,0 @@ -package eu.eudat.configurations.referencetype; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties({ReferenceTypeProperties.class}) -public class ReferenceTypeConfiguration { - - private final ReferenceTypeProperties referenceTypeProperties; - - @Autowired - public ReferenceTypeConfiguration(ReferenceTypeProperties referenceTypeProperties) { - this.referenceTypeProperties = referenceTypeProperties; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeField.java b/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeField.java deleted file mode 100644 index 729880ac4..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeField.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.configurations.referencetype; - -public class ReferenceTypeField { - - String code; - - String dataType; - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public String getDataType() { - return dataType; - } - - public void setDataType(String dataType) { - this.dataType = dataType; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeProperties.java b/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeProperties.java deleted file mode 100644 index 62a2d8dfb..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/configurations/referencetype/ReferenceTypeProperties.java +++ /dev/null @@ -1,164 +0,0 @@ -package eu.eudat.configurations.referencetype; - -import eu.eudat.model.persist.referencedefinition.DefinitionPersist; -import eu.eudat.model.referencedefinition.Field; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.bind.ConstructorBinding; - -import java.util.List; -import java.util.Map; - -@ConfigurationProperties(prefix = "reference-type") -public class ReferenceTypeProperties { - - private Map> grant; - private Map> funder; - private Map> researcher; - private Map> service; - private Map> registry; - private Map> project; - private Map> organisation; - private Map> dataset; - private Map> dataRepository; - private Map> pubRepository; - private Map> journal; - private Map> publication; - private Map> licence; - private Map> taxonomy; - - @ConstructorBinding - public ReferenceTypeProperties(Map> grant, Map> funder, - Map> researcher, Map> service, - Map> registry, Map> project, - Map> organisation, Map> dataset, - Map> dataRepository, Map> pubRepository, - Map> journal, Map> publication, - Map> licence, Map> taxonomy) { - this.grant = grant; - this.funder = funder; - this.researcher = researcher; - this.service = service; - this.registry = registry; - this.project = project; - this.organisation = organisation; - this.dataset = dataset; - this.dataRepository = dataRepository; - this.pubRepository = pubRepository; - this.journal = journal; - this.publication = publication; - this.licence = licence; - this.taxonomy = taxonomy; - } - - public Map> getGrant() { - return grant; - } - - public void setGrant(Map> grant) { - this.grant = grant; - } - - public Map> getFunder() { - return funder; - } - - public void setFunder(Map> funder) { - this.funder = funder; - } - - public Map> getResearcher() { - return researcher; - } - - public void setResearcher(Map> researcher) { - this.researcher = researcher; - } - - public Map> getService() { - return service; - } - - public void setService(Map> service) { - this.service = service; - } - - public Map> getRegistry() { - return registry; - } - - public void setRegistry(Map> registry) { - this.registry = registry; - } - - public Map> getProject() { - return project; - } - - public void setProject(Map> project) { - this.project = project; - } - - public Map> getOrganisation() { - return organisation; - } - - public void setOrganisation(Map> organisation) { - this.organisation = organisation; - } - - public Map> getDataset() { - return dataset; - } - - public void setDataset(Map> dataset) { - this.dataset = dataset; - } - - public Map> getDataRepository() { - return dataRepository; - } - - public void setDataRepository(Map> dataRepository) { - this.dataRepository = dataRepository; - } - - public Map> getPubRepository() { - return pubRepository; - } - - public void setPubRepository(Map> pubRepository) { - this.pubRepository = pubRepository; - } - - public Map> getJournal() { - return journal; - } - - public void setJournal(Map> journal) { - this.journal = journal; - } - - public Map> getPublication() { - return publication; - } - - public void setPublication(Map> publication) { - this.publication = publication; - } - - public Map> getLicence() { - return licence; - } - - public void setLicence(Map> licence) { - this.licence = licence; - } - - public Map> getTaxonomy() { - return taxonomy; - } - - public void setTaxonomy(Map> taxonomy) { - this.taxonomy = taxonomy; - } -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/ReferenceSearchLookup.java b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/ReferenceSearchLookup.java index 727998400..ca01a6c84 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/query/lookup/ReferenceSearchLookup.java +++ b/dmp-backend/core/src/main/java/eu/eudat/query/lookup/ReferenceSearchLookup.java @@ -1,9 +1,11 @@ package eu.eudat.query.lookup; +import eu.eudat.model.Reference; import eu.eudat.query.ReferenceQuery; import gr.cite.tools.data.query.Lookup; import gr.cite.tools.data.query.QueryFactory; +import java.util.List; import java.util.UUID; public class ReferenceSearchLookup extends Lookup { @@ -14,6 +16,8 @@ public class ReferenceSearchLookup extends Lookup { private String key; + private List dependencyReferences; + public String getLike() { return like; } @@ -38,6 +42,14 @@ public class ReferenceSearchLookup extends Lookup { this.key = key; } + public List getDependencyReferences() { + return dependencyReferences; + } + + public void setDependencyReferences(List dependencyReferences) { + this.dependencyReferences = dependencyReferences; + } + public ReferenceQuery enrich(QueryFactory queryFactory) { ReferenceQuery query = queryFactory.query(ReferenceQuery.class); if (this.typeId != null) query.typeIds(this.typeId); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java index f7a6fea76..598ce26a9 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/reference/ReferenceServiceImpl.java @@ -175,7 +175,7 @@ public class ReferenceServiceImpl implements ReferenceService { } else { like = null; } - ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(like); + ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(like, lookup.getDependencyReferences()); ExternalDataResult remoteRepos = this.getReferenceData(data, externalReferenceCriteria, lookup.getKey()); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/remotefetcher/criteria/ExternalReferenceCriteria.java b/dmp-backend/core/src/main/java/eu/eudat/service/remotefetcher/criteria/ExternalReferenceCriteria.java index 7e7a01833..e8f7ffd58 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/remotefetcher/criteria/ExternalReferenceCriteria.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/remotefetcher/criteria/ExternalReferenceCriteria.java @@ -14,6 +14,11 @@ public class ExternalReferenceCriteria { private List dependencyReferences; + public ExternalReferenceCriteria(String like, List dependencyReferences) { + this.like = like; + this.dependencyReferences = dependencyReferences; + } + public String getLike() { return like; } @@ -51,10 +56,6 @@ public class ExternalReferenceCriteria { this.host = host; } - public ExternalReferenceCriteria(String like) { - this.like = like; - } - public ExternalReferenceCriteria() { } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ValidationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ValidationManager.java index 27a37f8c9..6adef39df 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ValidationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ValidationManager.java @@ -21,7 +21,7 @@ public class ValidationManager { } public Boolean validateIdentifier(String identifier, String type) throws MyNotFoundException { - ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(identifier); + ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(identifier, null); // Integer count = this.remoteFetcherService.countEntries(externalReferenceCriteria, type); Integer count = 1; return this.userScope.isSet() && count > 0; diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/ExternalValidationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/ExternalValidationService.java index d3906fd2a..89933a101 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/ExternalValidationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/ExternalValidationService.java @@ -20,7 +20,7 @@ public class ExternalValidationService { } public Boolean validateIdentifier(String identifier, String type) throws MyNotFoundException { - ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(identifier); + ExternalReferenceCriteria externalReferenceCriteria = new ExternalReferenceCriteria(identifier, null); // Integer count = this.remoteFetcherService.countEntries(externalReferenceCriteria, type); Integer count = 1; return userScope.isSet() && count > 0;