From e884153bf2acc5eda79124a7543c8ba0f465b4a4 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 17 Sep 2019 11:45:09 +0300 Subject: [PATCH] Fixes bug on fetching multiple instances of the same Organisations. --- .../src/main/java/eu/eudat/controllers/Organisations.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java index 0cc2bf1b9..8ba8d4ac2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java @@ -26,12 +26,10 @@ import java.util.Map; @RequestMapping(value = {"/api"}) public class Organisations extends BaseController { - private OrganisationsExternalSourcesModel organisationsExternalSourcesModel; private OrganisationsManager organisationsManager; @Autowired - public Organisations(ApiContext apiContext, OrganisationsExternalSourcesModel organisationsExternalSourcesModel, OrganisationsManager organisationsManager) { + public Organisations(ApiContext apiContext, OrganisationsManager organisationsManager) { super(apiContext); - this.organisationsExternalSourcesModel = organisationsExternalSourcesModel; this.organisationsManager = organisationsManager; } @@ -41,7 +39,7 @@ public class Organisations extends BaseController { @RequestParam(value = "query", required = false) String query, @RequestParam(value = "type", required = false) String type ) throws HugeResultSet, NoURLFound { List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getOrganisations(query, type); - OrganisationsExternalSourcesModel organisationsExternalSourcesModel = this.organisationsExternalSourcesModel.fromExternalItem(remoteRepos); + OrganisationsExternalSourcesModel organisationsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(organisationsExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); }