From 7a3b4a18ca812118ba1227f1a71d9ac63da966db Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 7 Oct 2020 14:22:37 +0300 Subject: [PATCH] Fixed compile issues --- .../java/eu/eudat/logic/managers/DataRepositoryManager.java | 2 +- .../java/eu/eudat/logic/managers/ExternalDatasetManager.java | 2 +- .../src/main/java/eu/eudat/logic/managers/FunderManager.java | 2 +- .../src/main/java/eu/eudat/logic/managers/GrantManager.java | 2 +- .../src/main/java/eu/eudat/logic/managers/LicenseManager.java | 2 +- .../java/eu/eudat/logic/managers/OrganisationsManager.java | 2 +- .../src/main/java/eu/eudat/logic/managers/ProjectManager.java | 2 +- .../main/java/eu/eudat/logic/managers/RegistryManager.java | 2 +- .../main/java/eu/eudat/logic/managers/ResearcherManager.java | 2 +- .../src/main/java/eu/eudat/logic/managers/ServiceManager.java | 2 +- .../models/data/external/ExternalDatasetSourcesModel.java | 4 ++-- .../main/java/eu/eudat/models/data/external/ExternalItem.java | 2 +- .../models/data/external/FundersExternalSourcesModel.java | 4 ++-- .../models/data/external/GrantsExternalSourcesModel.java | 4 ++-- .../models/data/external/LicensesExternalSourcesModel.java | 4 ++-- .../data/external/OrganisationsExternalSourcesModel.java | 4 ++-- .../models/data/external/ProjectsExternalSourcesModel.java | 4 ++-- .../models/data/external/RegistriesExternalSourcesModel.java | 4 ++-- .../models/data/external/ServiceExternalSourcesModel.java | 4 ++-- .../eudat/models/data/external/TagExternalSourcesModel.java | 4 ++-- 20 files changed, 29 insertions(+), 29 deletions(-) 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 fc6cb8f9d..31634fe0c 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 @@ -38,7 +38,7 @@ public class DataRepositoryManager { public List getDataRepositories(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRepositories(externalUrlCriteria, type); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRepositories(externalUrlCriteria, type); DataRepositoryCriteria criteria = new DataRepositoryCriteria(); if (!query.isEmpty()) criteria.setLike(query); 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 2d8f12fa7..f8f72ce31 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 @@ -57,7 +57,7 @@ public class ExternalDatasetManager { // Fetch external Datasets from external sources. ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = remoteFetcher.getDatasets(externalUrlCriteria, type); + List> remoteRepos = remoteFetcher.getDatasets(externalUrlCriteria, type); // Parse items from external sources to listing models. ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); 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 fd4567e03..a14a1e8df 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 @@ -42,7 +42,7 @@ public class FunderManager { 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); + List> remoteRepos = remoteFetcher.getFunders(externalUrlCriteria); FundersExternalSourcesModel fundersExternalSourcesModel = new FundersExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : fundersExternalSourcesModel) { eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) 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 885940a36..e020593ed 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 @@ -126,7 +126,7 @@ public class GrantManager { QueryableList authItems = apiContext.getOperationsContext().getDatabaseRepository().getGrantDao().getAuthenticated(items, userInfo); List grants = authItems.select(item -> new Grant().fromDataModel(item)); - List> remoteRepos = remoteFetcher.getGrants(externalUrlCriteria); + List> remoteRepos = remoteFetcher.getGrants(externalUrlCriteria); GrantsExternalSourcesModel grantsExternalSourcesModel = new GrantsExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : grantsExternalSourcesModel) { 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 fe174fe29..da06aedd3 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 @@ -33,7 +33,7 @@ public class LicenseManager { public List getLicenses(String query, String type) throws HugeResultSet, NoURLFound { ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getlicenses(externalUrlCriteria, type); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getlicenses(externalUrlCriteria, type); DataRepositoryCriteria criteria = new DataRepositoryCriteria(); if (!query.isEmpty()) criteria.setLike(query); 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 0860c3391..5e67be552 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 @@ -68,7 +68,7 @@ public class OrganisationsManager { public List getCriteriaWithExternal(String query, String type) throws HugeResultSet, NoURLFound { ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = apiContext.getOperationsContext().getRemoteFetcher().getOrganisations(externalUrlCriteria, type); + List> remoteRepos = apiContext.getOperationsContext().getRemoteFetcher().getOrganisations(externalUrlCriteria, type); OrganisationsExternalSourcesModel organisationsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); List organisations = new LinkedList<>(); for (ExternalSourcesItemModel externalListingItem : organisationsExternalSourcesModel) { 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 f02242826..6919a5de5 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 @@ -41,7 +41,7 @@ public class ProjectManager { 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); + List> remoteRepos = remoteFetcher.getProjects(externalUrlCriteria); ProjectsExternalSourcesModel projectsExternalSourcesModel = new ProjectsExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : projectsExternalSourcesModel) { eu.eudat.models.data.project.Project project = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ProjectBuilder.class) 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 c9444e002..9220d6221 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 @@ -39,7 +39,7 @@ public class RegistryManager { public List getRegistries(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRegistries(externalUrlCriteria, type); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getRegistries(externalUrlCriteria, type); RegistryCriteria criteria = new RegistryCriteria(); if (!query.isEmpty()) criteria.setLike(query); 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 e7c54eecc..0d9104056 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 @@ -57,7 +57,7 @@ public class ResearcherManager { item.setTag(keyToSourceMap.get(item.getKey())); } ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(researcherCriteriaRequest.getCriteria().getName()); - List> remoteRepos = remoteFetcher.getResearchers(externalUrlCriteria,null); + List> remoteRepos = remoteFetcher.getResearchers(externalUrlCriteria,null); ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos); for (ExternalSourcesItemModel externalListingItem : researchersExternalSourcesModel) { eu.eudat.models.data.dmp.Researcher researcher = apiContext.getOperationsContext().getBuilderFactory().getBuilder(ResearcherBuilder.class) 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 2b724ca27..222aa3675 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 @@ -36,7 +36,7 @@ public class ServiceManager { public List getServices(String query, String type, Principal principal) throws HugeResultSet, NoURLFound { ExternalUrlCriteria externalUrlCriteria = new ExternalUrlCriteria(query); - List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getServices(externalUrlCriteria, type); + List> remoteRepos = this.apiContext.getOperationsContext().getRemoteFetcher().getServices(externalUrlCriteria, type); ServiceCriteria criteria = new ServiceCriteria(); if (!query.isEmpty()) criteria.setLike(query); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalDatasetSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalDatasetSourcesModel.java index 0e19c57f2..e969b4276 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalDatasetSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalDatasetSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class ExternalDatasetSourcesModel extends ExternalListingItem { @Override - public ExternalDatasetSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public ExternalDatasetSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId((String)item.get("pid")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalItem.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalItem.java index 65c05c520..a8fed07a2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalItem.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ExternalItem.java @@ -5,5 +5,5 @@ import java.util.Map; public interface ExternalItem { - T fromExternalItem(List> values); + T fromExternalItem(List> values); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java index 78a766235..2f78b024b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class FundersExternalSourcesModel extends ExternalListingItem { @Override - public FundersExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public FundersExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setRemoteId((String)item.get("pid")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/GrantsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/GrantsExternalSourcesModel.java index 0a9e442c2..99bd8d448 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/GrantsExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/GrantsExternalSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class GrantsExternalSourcesModel extends ExternalListingItem { @Override - public GrantsExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public GrantsExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setRemoteId((String)item.get("pid")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/LicensesExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/LicensesExternalSourcesModel.java index 18c3793f4..f2def68c4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/LicensesExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/LicensesExternalSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class LicensesExternalSourcesModel extends ExternalListingItem { @Override - public LicensesExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public LicensesExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId((String)item.get("id")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java index 66a94b38f..29743a725 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/OrganisationsExternalSourcesModel.java @@ -8,8 +8,8 @@ import java.util.Map; @Component public class OrganisationsExternalSourcesModel extends ExternalListingItem { @Override - public OrganisationsExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public OrganisationsExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setRemoteId((String)item.get("pid")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ProjectsExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ProjectsExternalSourcesModel.java index 1d83d7939..52de8bc32 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ProjectsExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ProjectsExternalSourcesModel.java @@ -14,8 +14,8 @@ public class ProjectsExternalSourcesModel extends ExternalListingItem> values) { - for (Map item : values) { + public ProjectsExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); try { JsonNode node = mapper.readTree(mapper.writeValueAsBytes(item)); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/RegistriesExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/RegistriesExternalSourcesModel.java index 90f436758..380e59ad7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/RegistriesExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/RegistriesExternalSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class RegistriesExternalSourcesModel extends ExternalListingItem { @Override - public RegistriesExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public RegistriesExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId((String)item.get("pid")); model.setUri((String)item.get("uri")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java index 316e10f6f..f09013b28 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/ServiceExternalSourcesModel.java @@ -6,8 +6,8 @@ import java.util.Map; public class ServiceExternalSourcesModel extends ExternalListingItem { @Override - public ServiceExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public ServiceExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId((String)item.get("pid")); model.setUri((String)item.get("label")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/TagExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/TagExternalSourcesModel.java index 5e6ce1c97..b23d5afba 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/TagExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/TagExternalSourcesModel.java @@ -9,8 +9,8 @@ import java.util.Map; public class TagExternalSourcesModel extends ExternalListingItem { @Override - public TagExternalSourcesModel fromExternalItem(List> values) { - for (Map item : values) { + public TagExternalSourcesModel fromExternalItem(List> values) { + for (Map item : values) { ExternalSourcesItemModel model = new ExternalSourcesItemModel(); model.setId((String)item.get("pid")); model.setUri((String)item.get("label"));