diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java index 469702b6e..1bd12d156 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java @@ -19,6 +19,7 @@ import eu.eudat.validators.DataManagementPlanTableRequestValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; @@ -49,38 +50,38 @@ public class DMPs extends BaseController { } @RequestMapping(method = RequestMethod.POST, value = { "/dmps/getPaged" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem> getPaged(@Valid @RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest,Principal principal) { + public @ResponseBody ResponseEntity>> getPaged(@Valid @RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal) { try { DataTableData dataTable = new DataManagementPlanManager().getPaged(this.getApiContext(), dataManagementPlanTableRequest,principal); - return new ResponseItem>().status(HttpStatus.OK).payload(dataTable); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataTable)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.GET, value = { "/dmps/getSingle/{id}" }, produces="application/json") - public @ResponseBody ResponseItem getSingle(@PathVariable String id,Principal principal) { + public @ResponseBody ResponseEntity> getSingle(@PathVariable String id,Principal principal) { try { eu.eudat.models.dmp.DataManagementPlan project = new DataManagementPlanManager().getSingle(this.getApiContext().getDatabaseRepository().getDmpDao(), id,principal); - return new ResponseItem().status(HttpStatus.OK).payload(project); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(project)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/dmps/createOrUpdate" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem createOrUpdate(@RequestBody eu.eudat.models.dmp.DataManagementPlan dataManagementPlan, Principal principal) { + public @ResponseBody ResponseEntity> createOrUpdate(@RequestBody eu.eudat.models.dmp.DataManagementPlan dataManagementPlan, Principal principal) { try{ DataManagementPlanManager.createOrUpdate(this.getApiContext(),dataManagementPlan,principal); - return new ResponseItem().status(HttpStatus.CREATED); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.CREATED)); }catch (Exception ex){ ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } @@ -88,15 +89,14 @@ public class DMPs extends BaseController { @RequestMapping(method = RequestMethod.POST, value = { "/dmps/get" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem> getWithCriteria(@RequestBody DataManagementPlanCriteriaRequest dataManagementPlanCriteria,Principal principal) { + public @ResponseBody ResponseEntity>> getWithCriteria(@RequestBody DataManagementPlanCriteriaRequest dataManagementPlanCriteria,Principal principal) { try { List dataTable = new DataManagementPlanManager().getWithCriteria(this.getApiContext().getDatabaseRepository().getDmpDao(), dataManagementPlanCriteria); - - return new ResponseItem>().status(HttpStatus.OK).payload(dataTable); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataTable)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java index 1d5256c70..d4aa50513 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java @@ -5,6 +5,7 @@ import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -26,15 +27,15 @@ public class DashBoardController extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/dashboard/getStatistics" }, produces="application/json") - public ResponseItem getStatistics(Principal principal){ + public ResponseEntity> getStatistics(Principal principal){ try { DashBoardStatistics statistics = new DashBoardManager().getStatistics(this.getApiContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getDatabaseRepository().getDmpDao() , this.getApiContext().getDatabaseRepository().getProjectDao()); - return new ResponseItem().status(HttpStatus.OK).payload(statistics); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(statistics)); } catch(Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.INTERNAL_SERVER_ERROR).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.INTERNAL_SERVER_ERROR).message(ex.getMessage())); } } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java index 822af96f2..ba966356a 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -48,16 +48,16 @@ public class DataRepositories extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/external/datarepos" }, produces="application/json") - public @ResponseBody ResponseItem>> listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>>> listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getRepositories(query); - return new ResponseItem>>().status(HttpStatus.OK).payload(remoteRepos); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().status(HttpStatus.OK).payload(remoteRepos)); } catch(NoURLFound ex) { - return new ResponseItem>>().status(HttpStatus.INTERNAL_SERVER_ERROR).payload(null); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(HttpStatus.INTERNAL_SERVER_ERROR).payload(null)); } catch(HugeResultSet ex) { - return new ResponseItem>>().status(HttpStatus.UNPROCESSABLE_ENTITY).payload(null); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(HttpStatus.UNPROCESSABLE_ENTITY).payload(null)); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java index 34810514e..7f0ab4909 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.UUID; import eu.eudat.models.components.commons.datafield.AutoCompleteData; +import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.models.user.composite.DatasetProfile; import eu.eudat.services.ApiContext; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +43,7 @@ public class DatasetProfileController extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/datasetwizard/get/{id}" }, produces="application/json") - public ResponseEntity getSingle(@PathVariable String id){ + public ResponseEntity> getSingle(@PathVariable String id){ try { eu.eudat.entities.Dataset dataset = this.getApiContext().getDatabaseRepository().getDatasetDao().find(UUID.fromString(id)); eu.eudat.models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(dataset.getProfile()); @@ -51,11 +53,11 @@ public class DatasetProfileController extends BaseController{ Map properties = (Map)jobject.toMap(); datasetprofile.fromJsonObject(properties); } - return ResponseEntity.status(HttpStatus.OK).body(datasetprofile); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(datasetprofile)); } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java index ac34dabe3..72bd8b25e 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java @@ -44,44 +44,44 @@ import eu.eudat.dao.entities.ServiceDao; @RestController @CrossOrigin -public class DatasetProfiles extends BaseController{ +public class DatasetProfiles extends BaseController { - @Autowired - public DatasetProfiles(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public DatasetProfiles(ApiContext apiContext) { + super(apiContext); + } - @RequestMapping(method = RequestMethod.POST, value = { "/dmps/datasetprofiles/get" }, produces="application/json") - public @ResponseBody ResponseItem> get(@RequestBody DatasetProfileAutocompleteRequest datasetProfileAutocompleteRequest) { - try { - List datasetProfileAutocompleteItems = DatasetProfileManager.getWithCriteria(this.getApiContext().getDatabaseRepository().getDatasetProfileDao(),datasetProfileAutocompleteRequest); - return new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileAutocompleteItems); - } - catch(Exception ex) { - return new ResponseItem>().status(HttpStatus.BAD_REQUEST); - } - } + @RequestMapping(method = RequestMethod.POST, value = {"/dmps/datasetprofiles/get"}, produces = "application/json") + public @ResponseBody + ResponseEntity>> get(@RequestBody DatasetProfileAutocompleteRequest datasetProfileAutocompleteRequest) { + try { + List datasetProfileAutocompleteItems = DatasetProfileManager.getWithCriteria(this.getApiContext().getDatabaseRepository().getDatasetProfileDao(), datasetProfileAutocompleteRequest); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileAutocompleteItems)); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST)); + } + } - @RequestMapping(method = RequestMethod.POST, value = { "/dmps/datasetprofiles/getPaged" }, produces="application/json") - public @ResponseBody ResponseItem> getPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem) { - try { - DataTableData datasetProfileTableData = DatasetProfileManager.getPaged(this.getApiContext().getDatabaseRepository().getDatasetProfileDao(),datasetProfileTableRequestItem); - return new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileTableData ); - } - catch(Exception ex) { - return new ResponseItem>().status(HttpStatus.BAD_REQUEST); - } - } + @RequestMapping(method = RequestMethod.POST, value = {"/dmps/datasetprofiles/getPaged"}, produces = "application/json") + public @ResponseBody + ResponseEntity>> getPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem) { + try { + DataTableData datasetProfileTableData = DatasetProfileManager.getPaged(this.getApiContext().getDatabaseRepository().getDatasetProfileDao(), datasetProfileTableRequestItem); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileTableData)); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST)); + } + } - @RequestMapping(method = RequestMethod.GET, value = { "/datasetprofiles/getAll" }, produces="application/json") - public @ResponseBody ResponseItem> getAll() { - try { - List datasetProfileTableData = DatasetProfileManager.getAll(this.getApiContext().getDatabaseRepository().getDatasetProfileDao()); - return new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileTableData ); - } - catch(Exception ex) { - return new ResponseItem>().status(HttpStatus.BAD_REQUEST); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/datasetprofiles/getAll"}, produces = "application/json") + public @ResponseBody + ResponseEntity>> getAll() { + try { + List datasetProfileTableData = DatasetProfileManager.getAll(this.getApiContext().getDatabaseRepository().getDatasetProfileDao()); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(datasetProfileTableData)); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST)); + } + } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java index 33e5a9f61..54e2c2bc9 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetWizardController.java @@ -1,6 +1,7 @@ package eu.eudat.controllers; import eu.eudat.dao.entities.*; +import eu.eudat.entities.Dataset; import eu.eudat.managers.DatasetManager; import eu.eudat.managers.DatasetWizardManager; import eu.eudat.managers.UserManager; @@ -19,6 +20,7 @@ import eu.eudat.services.ApiContext; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.transaction.Transactional; @@ -40,53 +42,49 @@ public class DatasetWizardController extends BaseController { } @RequestMapping(method = RequestMethod.POST, value = {"/userDmps"}, produces = "application/json") - public @ResponseBody - ResponseItem> getUserDmps(@RequestBody DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, Principal principal) { + public @ResponseBody ResponseEntity>> getUserDmps(@RequestBody DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, Principal principal) { try { List dataManagementPlans = DatasetWizardManager.getUserDmps(this.getApiContext().getDatabaseRepository().getDmpDao(), datasetWizardAutocompleteRequest, principal); - return new ResponseItem>().status(HttpStatus.OK).payload(dataManagementPlans); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataManagementPlans)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = {"/getAvailableProfiles"}, produces = "application/json") - public @ResponseBody - ResponseItem> getAvailableProfiles(@RequestBody DatasetProfileWizardAutocompleteRequest datasetProfileWizardAutocompleteRequest, Principal principal) { + public @ResponseBody ResponseEntity>> getAvailableProfiles(@RequestBody DatasetProfileWizardAutocompleteRequest datasetProfileWizardAutocompleteRequest, Principal principal) { try { List dataManagementPlans = DatasetWizardManager.getAvailableProfiles(this.getApiContext().getDatabaseRepository().getDmpDao(), datasetProfileWizardAutocompleteRequest); - return new ResponseItem>().status(HttpStatus.OK).payload(dataManagementPlans); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataManagementPlans)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.GET, value = {"/getSingle/{id}"}, produces = "application/json") - public @ResponseBody - ResponseItem getPaged(@PathVariable String id, Principal principal) { + public @ResponseBody ResponseEntity> getPaged(@PathVariable String id, Principal principal) { try { DatasetWizardModel dataset = new DatasetManager().getSingle(this.getApiContext().getDatabaseRepository().getDatasetDao(), id); - return new ResponseItem().status(HttpStatus.OK).payload(dataset); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(dataset)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/createOrUpdate"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) { + public @ResponseBody ResponseEntity> createOrUpdate(@RequestBody DatasetWizardModel profile, Principal principal) { try { eu.eudat.entities.Dataset dataset = DatasetManager.createOrUpdate(this.getApiContext(), profile); - return new ResponseItem().status(HttpStatus.OK).payload(dataset); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(dataset)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java index 467c55412..3b5bf66bc 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java @@ -39,28 +39,27 @@ public class Datasets extends BaseController { } @RequestMapping(method = RequestMethod.POST, value = {"/datasets/getPaged"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem> getPaged(@RequestBody DatasetTableRequest datasetTableRequest, Principal principal) { + public @ResponseBody ResponseEntity>> getPaged(@RequestBody DatasetTableRequest datasetTableRequest, Principal principal) { try { DataTableData dataTable = new DatasetManager().getPaged(this.getApiContext(), datasetTableRequest, principal); - return new ResponseItem>().status(HttpStatus.OK).payload(dataTable); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataTable)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.GET, value = {"/datasets/makepublic/{id}"}, produces = "application/json") - public @ResponseBody ResponseItem makePublic(@PathVariable UUID id, Principal principal) { + public @ResponseBody ResponseEntity> makePublic(@PathVariable UUID id, Principal principal) { try { DatasetManager.makePublic(this.getApiContext().getDatabaseRepository().getDatasetDao(), id); - return new ResponseItem().status(HttpStatus.OK).message("Dataset Has Been Made Public"); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).message("Dataset Has Been Made Public")); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java index ee9934d75..afe29054b 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -16,6 +16,7 @@ import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; 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; @@ -34,25 +35,25 @@ public class ExternalDatasets extends BaseController{ } @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getPaged"}, consumes = "application/json", produces = "application/json") - public @ResponseBody ResponseItem> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) { + public @ResponseBody ResponseEntity>> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) { try { DataTableData dataTable = new ExternalDatasetManager().getPaged(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), datasetTableRequest); - return new ResponseItem>().status(HttpStatus.OK).payload(dataTable); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(dataTable)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.GET, value = {"/external/datasets"}, produces = "application/json") - public @ResponseBody ResponseItem> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) { + public @ResponseBody ResponseEntity>> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) { try { List dataTable = new ExternalDatasetManager().getWithExternal(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), query, this.getApiContext().getRemoteFetcher()); - return new ResponseItem>().payload(dataTable).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java index 02fce7364..108e49642 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java @@ -10,6 +10,7 @@ import eu.eudat.security.validators.twitter.TwitterTokenValidator; import eu.eudat.services.AuthenticationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.social.oauth1.OAuthToken; import org.springframework.web.bind.annotation.*; @@ -38,48 +39,48 @@ public class Login { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/externallogin" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem googleLogin(@RequestBody LoginInfo credentials) { + public @ResponseBody ResponseEntity> googleLogin(@RequestBody LoginInfo credentials) { try { - return new ResponseItem().payload(customAuthenticationProvider.authenticate(credentials)).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(customAuthenticationProvider.authenticate(credentials)).status(HttpStatus.OK)); }catch (UnauthorisedException ex){ throw ex; } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.GET, value = { "/twitterRequestToken" }, produces="application/json") - public @ResponseBody ResponseItem twitterRequestToken() { + public @ResponseBody ResponseEntity> twitterRequestToken() { try { - return new ResponseItem().payload(this.twitterTokenValidator.getRequestToken()).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.twitterTokenValidator.getRequestToken()).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = { "/me" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem authMe(Principal principal) { + public @ResponseBody ResponseEntity> authMe(Principal principal) { try { - return new ResponseItem().payload(this.authenticationService.Touch(principal.getToken())).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.authenticationService.Touch(principal.getToken())).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = { "/logout" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem logout(Principal principal) { + public @ResponseBody ResponseEntity> logout(Principal principal) { try { this.authenticationService.Logout(principal.getToken()); - return new ResponseItem().status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java index b1d912e34..15ce1115c 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java @@ -50,90 +50,21 @@ public class Organisations extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/external/organisations" }, produces="application/json") - public @ResponseBody ResponseItem listExternalOrganisations(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity> listExternalOrganisations(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getOrganisations(query); OrganisationsExternalSourcesModel projectsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); - return new ResponseItem().payload(projectsExternalSourcesModel).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(projectsExternalSourcesModel).status(HttpStatus.OK)); } catch(NoURLFound ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found")); } catch(HugeResultSet ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set")); }catch (Exception ex){ - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - - // MANAGE ORGANISATIONS(S) - - @RequestMapping(method = RequestMethod.GET, value = { "/organisations" }) - public @ResponseBody ResponseEntity> listOrganisations(){ - try { - List allIDs = this.getApiContext().getDatabaseRepository().getOrganisationDao().listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(allIDs); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/organisations/{id}" }) - public @ResponseBody ResponseEntity getOrganisations(@PathVariable("id") String id) { - try { - Organisation organisation = this.getApiContext().getDatabaseRepository().getOrganisationDao().read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(organisation); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/organisation/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity getAllOrganisations(){ - try { - List allOrganisations = this.getApiContext().getDatabaseRepository().getOrganisationDao().getAll(); - return ResponseEntity.status(HttpStatus.OK).body(allOrganisations); - } - catch(Exception ex) { - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); - } - } - - - @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/organisation/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setOrganisation(@RequestBody Organisation organisation) { - try { - Organisation createdOrganisation = this.getApiContext().getDatabaseRepository().getOrganisationDao().update(organisation); - return ResponseEntity.status(HttpStatus.CREATED).body(createdOrganisation); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.POST, value = { "/organisation/delete" }, consumes = "application/json", produces="text/plain") - public @ResponseBody ResponseEntity delete(@RequestBody Organisation organisation) { - - Organisation org = new Organisation(); - org.setId(organisation.getId()); - try { - this.getApiContext().getDatabaseRepository().getOrganisationDao().delete(org); - return ResponseEntity.status(HttpStatus.CREATED).body(null); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - - } - - - - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java b/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java index 38806b27e..ef59ea17b 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java @@ -15,6 +15,7 @@ import eu.eudat.models.external.ProjectsExternalSourcesModel; import eu.eudat.models.external.RegistriesExternalSourcesModel; import eu.eudat.models.helpers.responses.*; import eu.eudat.models.project.ProjectCriteriaRequest; +import eu.eudat.models.project.ProjectListingModel; import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; import org.springframework.beans.factory.annotation.Autowired; @@ -66,326 +67,89 @@ public class Projects extends BaseController { } @RequestMapping(method = RequestMethod.POST, value = {"/projects/getPaged"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem> getPaged(@Valid @RequestBody ProjectTableRequest projectTableRequest, Principal principal) { + public @ResponseBody ResponseEntity>> getPaged(@Valid @RequestBody ProjectTableRequest projectTableRequest, Principal principal) { try { DataTableData dataTable = new ProjectManager().getPaged(this.getApiContext().getDatabaseRepository().getProjectDao(), projectTableRequest); - return new ResponseItem>().payload(dataTable).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.GET, value = {"/projects/getSingle/{id}"}, produces = "application/json") - public @ResponseBody - ResponseItem getSingle(@PathVariable String id, Principal principal) { + public @ResponseBody ResponseEntity> getSingle(@PathVariable String id, Principal principal) { try { eu.eudat.models.project.Project project = new ProjectManager().getSingle(this.getApiContext().getDatabaseRepository().getProjectDao(), id); - return new ResponseItem().payload(project).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(project).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = {"/projects/createOrUpdate"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem addProject(@Valid @RequestBody eu.eudat.models.project.Project project, Principal principal) { + public @ResponseBody ResponseEntity> addProject(@Valid @RequestBody eu.eudat.models.project.Project project, Principal principal) { try { ProjectManager.createOrUpdate(this.getApiContext().getDatabaseRepository().getProjectDao(), this.getApiContext().getDatabaseRepository().getUserInfoDao(), project, principal); - return new ResponseItem().status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK)); } catch (Exception ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.DELETE, value = {"/projects/inactivate/{id}"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem inactivate(@PathVariable String id, Principal principal) { + public @ResponseBody ResponseEntity> inactivate(@PathVariable String id, Principal principal) { try { Project project = new ProjectManager().inactivate(this.getApiContext().getDatabaseRepository().getProjectDao(), id); - return new ResponseItem().status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK)); } catch (Exception ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = {"/projects/getWithExternal"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem> getWithExternal(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) { + public @ResponseBody ResponseEntity>> getWithExternal(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) { try { List dataTable = new ProjectManager().getCriteriaWithExternal(this.getApiContext().getDatabaseRepository().getProjectDao(), projectCriteria, this.getApiContext().getRemoteFetcher()); - return new ResponseItem>().payload(dataTable).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = {"/projects/get"}, consumes = "application/json", produces = "application/json") - public @ResponseBody - ResponseItem> get(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) { + public @ResponseBody ResponseEntity>> get(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) { try { List dataTable = new ProjectManager().getCriteria(this.getApiContext().getDatabaseRepository().getProjectDao(), projectCriteria, this.getApiContext().getRemoteFetcher()); - return new ResponseItem>().payload(dataTable).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(HttpStatus.OK)); } catch (Exception ex) { ex.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - @RequestMapping(method = RequestMethod.GET, value = {"/external/projects"}, produces = "application/json") - public @ResponseBody - ResponseItem listExternalProjects(@RequestParam(value = "query", required = false) String query, Principal principal) { + public @ResponseBody ResponseEntity> listExternalProjects(@RequestParam(value = "query", required = false) String query, Principal principal) { try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getProjects(query); ProjectsExternalSourcesModel projectsExternalSourcesModel = new ProjectsExternalSourcesModel().fromExternalItem(remoteRepos); - return new ResponseItem().payload(projectsExternalSourcesModel).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(projectsExternalSourcesModel).status(HttpStatus.OK)); } catch (NoURLFound ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found")); } catch (HugeResultSet ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set")); } catch (Exception ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - // MANAGE PROJECT(S) - -// @RequestMapping(method = RequestMethod.GET, value = { "/projects" }, produces="application/json") -// public @ResponseBody ResponseEntity> listProjects(){ -// try { -// List allIDs = projectDao.listAllIDs(); -// return ResponseEntity.status(HttpStatus.OK).body(allIDs); -// } -// catch(Exception ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// } -// -// @RequestMapping(method = RequestMethod.GET, value = { "/projects/{id}" }, produces="application/json") -// public @ResponseBody ResponseEntity getProject(@PathVariable("id") String id) { -// try { -// Project project = projectDao.read(UUID.fromString(id)); -// -// System.out.println(project.getId().toString()); -// -// return ResponseEntity.status(HttpStatus.OK).body(project); -// } -// catch(Exception ex) { -// return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); -// } -// } -// -// -// @RequestMapping(method = RequestMethod.GET, value = { "/project/listAllLabelIDs" }, produces="application/json") -// public @ResponseBody ResponseEntity> listLabelIds(){ -// try { -// List allIDs = projectDao.listAllIDsLabels(); -// return ResponseEntity.status(HttpStatus.OK).body(allIDs); -// } -// catch(Exception ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// } -// -// -// @RequestMapping(method = RequestMethod.GET, value = { "/project/getAll" }, produces="application/json") -// public @ResponseBody ResponseEntity getAllProjects(){ -// try { -// List allProjects = projectDao.getAll(); -// return ResponseEntity.status(HttpStatus.OK).body(allProjects); -// } -// catch(Exception ex) { -// return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); -// } -// } -// -// -// -// @Transactional -// @RequestMapping(method = RequestMethod.POST, value = { "/project/create" }, consumes = "application/json", produces="application/json") -// public @ResponseBody ResponseEntity createProject(@RequestBody Project project) { -// Project createdProject = projectDao.update(project); -// return ResponseEntity.status(HttpStatus.CREATED).body(createdProject); -// } -// -// -// -// @RequestMapping(method = RequestMethod.POST, value = { "/project/update" }, consumes = "application/json", produces="application/json") -// public @ResponseBody ResponseEntity updateProject(@RequestBody Project project) { -// Project updatedProject = projectDao.update(project); -// return ResponseEntity.status(HttpStatus.CREATED).body(updatedProject); -// } -// -// -// @RequestMapping(method = RequestMethod.POST, value = { "/project/delete" }, consumes = "application/json", produces="application/json") -// public @ResponseBody ResponseEntity delete(@RequestBody Project project) { -// -// Project p = new Project(); -// p.setId(project.getId()); -// try { -// projectDao.delete(p); -// return ResponseEntity.status(HttpStatus.CREATED).body(null); -// } catch (Exception e) { -// e.printStackTrace(); -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// -// } -// -// -// -// @RequestMapping(method = RequestMethod.POST, value = { "/project/softdelete" }, consumes = "application/json", produces="application/json") -// public @ResponseBody ResponseEntity softDelete(@RequestBody Project project) { -// -// project.setStatus(new Short("-1")); -// -// try { -// projectDao.update(project); -// return ResponseEntity.status(HttpStatus.CREATED).body(null); -// } catch (Exception e) { -// e.printStackTrace(); -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// -// } -// -// -// @Transactional -// @RequestMapping(method = RequestMethod.POST, value = { "/project/getdmps" }, consumes = "application/json", produces="application/json") -// public @ResponseBody ResponseEntity getProjectDmps(@RequestBody Project project) { -// try { -// Set dmps = projectDao.read(project.getId()).getDmps(); -// return ResponseEntity.status(HttpStatus.CREATED).body(dmps); -// } catch (Exception e) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// } -// -// -// -// //////////////////////////////// -// //// USER - RELATED ACTIONS //// -// //////////////////////////////// -// -// -// @RequestMapping(method = RequestMethod.GET, value = { "/project/getofuser" }, produces="text/plain") -// public @ResponseBody ResponseEntity getProjectsOfUser(){ -// -// String userID = null; -// try { -// userID = SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString(); -// } catch(NullPointerException ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("You have not logged in. You shouldn't be here"); -// } -// -// UserInfo userInfo = userInfoDao.read(UUID.fromString(userID)); -// -// if(userInfo==null) //this should normally never happen -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("There's no such a user on the system. You shouldn't be here"); -// -// -// try { -// List userProjects = projectDao.getProjectsOfUser(userID); -// return ResponseEntity.status(HttpStatus.OK).body(userProjects); -// } -// catch(Exception ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// -// -// /* -// * OLD ONE -// Map userProjects = new HashMap(); -// -// userInfo.getDmps().forEach( dmp -> { -// Researcher proj = dmp.getProject(); -// userProjects.put(proj.getId(), proj); -// }); -// -// try { -// return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(userProjects.values())); -// } -// catch(Exception ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); -// } -// */ -// -// } -// -// @Transactional -// @RequestMapping(method = RequestMethod.POST, value = { "/project/createofuser" }, produces="text/plain", consumes = "application/json") -// public @ResponseBody ResponseEntity createProjectOfUser(@RequestBody Project project){ -// -// -// String userID = null; -// try { -// userID = SecurityContextHolder.getContext().getAuthentication().getPrincipal().toString(); -// } catch(NullPointerException ex) { -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// -// UserInfo userInfo = userInfoDao.read(UUID.fromString(userID)); -// -// -// if(userInfo==null) //this should normally never happer -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// -// try { -// -// project.setId(null); -// project.setStatus(new Short("0")); -// project.setCreationUser(userInfo); -// project.setCreated(new Date()); -// project.setModified(new Date()); -// -// Project newproj = projectDao.create(project); -// -//// DMP newdmp = new DMP(); -//// newdmp.setId(null); -//// newdmp.setLabel("Auto-Generated"); -//// newdmp.setCreated(new Date()); -//// newdmp.setVersion(1); -//// newdmp.setStatus(new Short("0")); -//// newdmp.setProject(newproj); -//// -//// Set users = new HashSet(); -//// users.add(userInfo); -//// newdmp.setUsers(users); -//// -//// newdmp = dMPDao.create(newdmp); -// -// return ResponseEntity.status(HttpStatus.OK).body(newproj); -// } -// catch(Exception ex) { -// ex.printStackTrace(); -// return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); -// } -// -// } -// -// @Transactional -// @RequestMapping(method = RequestMethod.POST, value = { "/project/updateofuser" }, produces="text/plain") -// public @ResponseBody ResponseEntity updateProjectOfUser(@RequestBody Researcher project){ -// -// if(project.getId()==null) -// return ResponseEntity.status(HttpStatus.NOT_MODIFIED).body("Cannot update, id was null"); -// return setProject(project); -// -// } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java index d7b97918e..2cdad50aa 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java @@ -51,108 +51,24 @@ public class Registries extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/external/registries" }, produces="application/json") - public @ResponseBody ResponseItem listExternalRegistries(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity> listExternalRegistries(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getRegistries(query); RegistriesExternalSourcesModel registriesExternalSourcesModel = new RegistriesExternalSourcesModel().fromExternalItem(remoteRepos); - return new ResponseItem().payload(registriesExternalSourcesModel).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(registriesExternalSourcesModel).status(HttpStatus.OK)); } catch(NoURLFound ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found")); } catch(HugeResultSet ex) { ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set")); }catch (Exception ex){ ex.printStackTrace(); - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - // MANAGE REGISTRY(IES) - - @RequestMapping(method = RequestMethod.GET, value = { "/registries" }) - public @ResponseBody ResponseEntity> listRegistries(){ - try { - List allIDs = this.getApiContext().getDatabaseRepository().getRegistryDao().listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(allIDs); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/registries/{id}" }) - public @ResponseBody ResponseEntity getRegistries(@PathVariable("id") String id) { - try { - Registry registry = this.getApiContext().getDatabaseRepository().getRegistryDao().read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(registry); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); - } - } - - - - @RequestMapping(method = RequestMethod.GET, value = { "/registries/listAllLabelIDs" }) - public @ResponseBody ResponseEntity> listLabelIds(){ - try { - List allIDs = this.getApiContext().getDatabaseRepository().getRegistryDao().listAllIDsLabels(); - return ResponseEntity.status(HttpStatus.OK).body(allIDs); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/registry/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity getAllRegistries(){ - try { - List allRegistries = this.getApiContext().getDatabaseRepository().getRegistryDao().getAll(); - - return ResponseEntity.status(HttpStatus.OK).body(allRegistries); - - } - catch(Exception ex) { - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); - } - } - - - @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/registry/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setRegistry(@RequestBody Registry registry) { - Registry createdRegistry = this.getApiContext().getDatabaseRepository().getRegistryDao().update(registry); - try { - return ResponseEntity.status(HttpStatus.CREATED).body(createdRegistry); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.POST, value = { "/registry/delete" }, consumes = "application/json", produces="text/plain") - public @ResponseBody ResponseEntity delete(@RequestBody Registry registry) { - - Registry r = new Registry(); - r.setId(registry.getId()); - try { - this.getApiContext().getDatabaseRepository().getRegistryDao().delete(r); - return ResponseEntity.status(HttpStatus.CREATED).body("{\"msg\":\"Deleted registry!\"}"); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not Delete registry!\"}"); - } - - } - - - - - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java index bdad7445a..99b1a7be2 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java @@ -50,103 +50,21 @@ public class Researchers extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/external/researchers" }, produces="application/json") - public @ResponseBody ResponseItem listExternalResearchers(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity> listExternalResearchers(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getResearchers(query); ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos); - return new ResponseItem().payload(researchersExternalSourcesModel).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(HttpStatus.OK)); } catch(NoURLFound ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found")); } catch(HugeResultSet ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set")); }catch (Exception ex){ - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - - // MANAGE RESEARCHER(S) - @RequestMapping(method = RequestMethod.GET, value = { "/researchers" }) - public @ResponseBody ResponseEntity> listResearchers(){ - try { - List allIDs = this.getApiContext().getDatabaseRepository().getResearcherDao().listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(allIDs); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/researchers/{id}" }) - public @ResponseBody ResponseEntity getResearchers(@PathVariable("id") String id) { - try { - Researcher researcher = this.getApiContext().getDatabaseRepository().getResearcherDao().read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(researcher); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); - } - } - - @RequestMapping(method = RequestMethod.GET, value = { "/researcher/getByEmail" }, produces="application/json") - public @ResponseBody ResponseEntity getResearcherByEmail(@RequestParam("email") String email){ - try { - Researcher researcher = this.getApiContext().getDatabaseRepository().getResearcherDao().getResearcherByEmail(email); - return ResponseEntity.status(HttpStatus.OK).body(researcher); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); - } - - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/researcher/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity> getAllResearchers(){ - try { - List allResearchers = this.getApiContext().getDatabaseRepository().getResearcherDao().getAll(); - - return ResponseEntity.status(HttpStatus.OK).body(allResearchers); - - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/researcher/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setResearcher(@RequestBody Researcher researcher) { - Researcher createdResearcher = this.getApiContext().getDatabaseRepository().getResearcherDao().update(researcher); - try { - return ResponseEntity.status(HttpStatus.CREATED).body(createdResearcher); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.POST, value = { "/researcher/delete" }, consumes = "application/json", produces="text/plain") - public @ResponseBody ResponseEntity delete(@RequestBody Researcher researcher) { - - Researcher res = new Researcher(); - res.setId(researcher.getId()); - try { - this.getApiContext().getDatabaseRepository().getResearcherDao().delete(res); - return ResponseEntity.status(HttpStatus.CREATED).body("{\"msg\":\"Deleted researcher!\"}"); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not delete researcher!\"}"); - } - - } - - - - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java index 4126ea670..f9a304bc7 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java @@ -49,95 +49,21 @@ public class Services extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = { "/external/services" }, produces="application/json") - public @ResponseBody ResponseItem listExternalServices(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity> listExternalServices(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = this.getApiContext().getRemoteFetcher().getServices(query); ServiceExternalSourcesModel serviceExternalSourcesModel = new ServiceExternalSourcesModel().fromExternalItem(remoteRepos); - return new ResponseItem().payload(serviceExternalSourcesModel).status(HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(serviceExternalSourcesModel).status(HttpStatus.OK)); } catch(NoURLFound ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("External Url Not Found")); } catch(HugeResultSet ex) { - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message("Huge Result Set")); }catch (Exception ex){ - return new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(HttpStatus.BAD_REQUEST).message(ex.getMessage())); } } - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - - - - - // MANAGE SERVICE(S) - - @RequestMapping(method = RequestMethod.GET, value = { "/services" }) - public @ResponseBody ResponseEntity> listServices(){ - try { - List allIDs = this.getApiContext().getDatabaseRepository().getServiceDao().listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(allIDs); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.GET, value = { "/services/{id}" }) - public @ResponseBody ResponseEntity getServices(@PathVariable("id") String id) { - try { - Service service = this.getApiContext().getDatabaseRepository().getServiceDao().read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(service); - } - catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); - } - } - - - - @RequestMapping(method = RequestMethod.GET, value = { "/service/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity getAllServices(){ - try { - List allServices = this.getApiContext().getDatabaseRepository().getServiceDao().getAll(); - - return ResponseEntity.status(HttpStatus.OK).body(allServices); - - } - catch(Exception ex) { - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); - } - } - - - @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/service/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setService(@RequestBody Service service) { - - Service createdService = this.getApiContext().getDatabaseRepository().getServiceDao().update(service); - try { - return ResponseEntity.status(HttpStatus.CREATED).body(createdService); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); - } - } - - - @RequestMapping(method = RequestMethod.POST, value = { "/service/delete" }, consumes = "application/json", produces="text/plain") - public @ResponseBody ResponseEntity delete(@RequestBody Service service) { - - System.out.println(service); - - try { - this.getApiContext().getDatabaseRepository().getServiceDao().delete(service); - return ResponseEntity.status(HttpStatus.CREATED).body("{\"msg\":\"Deleted Service entity!\"}"); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not Delete Service entity!\"}"); - } - - } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java index 165fcbc0b..aec7ce975 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java @@ -10,6 +10,7 @@ import eu.eudat.models.userinfo.UserInfoRequestItem; import eu.eudat.services.ApiContext; 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.*; @@ -31,40 +32,40 @@ public class UserInvitationController extends BaseController{ @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/users" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem users(@RequestBody Invitation invitation, Principal principal) { + public @ResponseBody ResponseEntity> users(@RequestBody Invitation invitation, Principal principal) { try { InvitationsManager.inviteUsers(this.getApiContext(),invitation,principal); - return new ResponseItem().status(HttpStatus.OK).message("Users have beeen invited"); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).message("Users have beeen invited")); } catch (Exception e) { e.printStackTrace(); - return new ResponseItem().message(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().message(e.getMessage())); } } @Transactional @RequestMapping(method = RequestMethod.GET, value = { "/exchange/{invitationID}" }, produces="application/json") - public @ResponseBody ResponseItem exchange(@PathVariable UUID invitationID, Principal principal) { + public @ResponseBody ResponseEntity> exchange(@PathVariable UUID invitationID, Principal principal) { try { UUID dmpId = InvitationsManager.assignUserAcceptedInvitation(this.getApiContext(),invitationID,principal); - return new ResponseItem().status(HttpStatus.OK).payload(dmpId); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(HttpStatus.OK).payload(dmpId)); }catch (UnauthorisedException e){ e.printStackTrace(); throw e; } catch (Exception e) { e.printStackTrace(); - return new ResponseItem().message(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().message(e.getMessage())); } } @RequestMapping(method = RequestMethod.POST, value = { "/getUsers" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseItem> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) { + public @ResponseBody ResponseEntity>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) { try { List users = InvitationsManager.getUsers(this.getApiContext(),userInfoRequestItem); - return new ResponseItem>().status(HttpStatus.OK).payload(users); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(HttpStatus.OK).payload(users)); } catch (Exception e) { e.printStackTrace(); - return new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>().status(HttpStatus.BAD_REQUEST).message(e.getMessage())); } } } diff --git a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java b/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java index 34129a6d0..1c0f18457 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java +++ b/dmp-backend/src/main/java/eu/eudat/models/helpers/responses/ResponseItem.java @@ -30,7 +30,7 @@ public class ResponseItem { return payload; } - public void setpayload(T payload) { + public void setPayload(T payload) { this.payload = payload; } diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java b/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java new file mode 100644 index 000000000..2174a8b98 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/models/properties/DatasetProfilePage.java @@ -0,0 +1,38 @@ +package eu.eudat.models.properties; + +import eu.eudat.models.user.components.datasetprofile.*; + +import java.util.List; + +/** + * Created by ikalyvas on 1/19/2018. + */ +public class DatasetProfilePage { + private Integer ordinal; + private String title; + private List
sections; + + public Integer getOrdinal() { + return ordinal; + } + + public void setOrdinal(Integer ordinal) { + this.ordinal = ordinal; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public List
getSections() { + return sections; + } + + public void setSections(List
sections) { + this.sections = sections; + } +} diff --git a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java b/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java index b34e2e88b..c0fa68bc2 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/properties/PropertiesModel.java @@ -1,19 +1,22 @@ package eu.eudat.models.properties; +import eu.eudat.models.user.composite.DatasetProfilePage; +import eu.eudat.models.user.composite.PagedDatasetProfile; + import java.util.HashMap; import java.util.List; import java.util.Map; public class PropertiesModel implements PropertiesGenerator{ private int status; - private List
sections; + private List pages; - public List
getSections() { - return sections; + public List getPages() { + return pages; } - public void setSections(List
sections) { - this.sections = sections; + public void setPages(List pages) { + this.pages = pages; } public int getStatus() { @@ -26,8 +29,7 @@ public class PropertiesModel implements PropertiesGenerator{ @Override public void toMap(Map fieldValues) { - this.sections.forEach(item->item.toMap(fieldValues)); - + this.pages.forEach(item->item.getSections().forEach(sectionItem->sectionItem.toMap(fieldValues))); } @Override