From 5f2f66bd71123777794abc24a2d38c933b832f22 Mon Sep 17 00:00:00 2001 From: ikalyvas Date: Fri, 15 Dec 2017 01:01:26 +0200 Subject: [PATCH] migrating to spring boot --- dmp-backend/dmp-backend.iml | 105 ----- dmp-backend/pom.xml | 331 ++++--------- .../main/java/checks/EnvironmentChecker.java | 31 -- .../main/java/configs/WebConfiguration.java | 37 -- .../main/java/controller/UIController.java | 23 - .../main/java/dao/entities/DMPProfileDao.java | 16 - .../java/dao/entities/DMPResearcherDao.java | 14 - .../entities/DatasetProfileRulesetDao.java | 10 - .../entities/DatasetProfileViewstyleDao.java | 10 - .../java/dao/entities/DatasetRegistryDao.java | 10 - .../java/dao/entities/DatasetServiceDao.java | 10 - .../java/entities/DatasetDataRepository.java | 86 ---- .../DatabaseModelDefinition.java | 7 - .../DatabaseViewStyleDefinition.java | 7 - .../xmlmodels/viewstyledefinition/Field.java | 145 ------ .../{ => eu/eudat}/cache/ResponsesCache.java | 2 +- .../eudat/controllers}/Admin.java | 46 +- .../eudat/controllers}/DMPs.java | 161 ++++--- .../eudat/controllers}/DataRepositories.java | 90 ++-- .../DatasetProfileController.java | 33 +- .../eudat/controllers}/DatasetProfiles.java | 82 ++-- .../eudat/controllers}/Datasets.java | 106 ++--- .../eudat/controllers}/DmpProfiles.java | 79 ++-- .../eudat/controllers}/Organisations.java | 88 ++-- .../eudat/controllers}/Registries.java | 91 ++-- .../eudat/controllers}/Researchers.java | 92 ++-- .../eudat/controllers}/Services.java | 83 ++-- .../src/main/java/{ => eu/eudat}/dao/Dao.java | 34 +- .../java/{ => eu/eudat}/dao/DaoFactory.java | 20 +- .../main/java/{ => eu/eudat}/dao/DaoI.java | 2 +- .../main/java/{ => eu/eudat}/dao/JpaDao.java | 6 +- .../{ => eu/eudat}/dao/JpaDaoFactory.java | 168 +++---- .../eudat}/dao/SpringJpaDaoFactory.java | 240 +++++----- .../{ => eu/eudat}/dao/entities/DMPDao.java | 14 +- .../eudat}/dao/entities/DMPDaoImpl.java | 17 +- .../eu/eudat/dao/entities/DMPProfileDao.java | 17 + .../dao/entities/DMPProfileDaoImpl.java | 10 +- .../eudat/dao/entities/DMPResearcherDao.java | 15 + .../dao/entities/DMPResearcherDaoImpl.java | 12 +- .../dao/entities/DataRepositoryDao.java | 11 +- .../dao/entities/DataRepositoryDaoImpl.java | 13 +- .../eudat}/dao/entities/DatasetDao.java | 9 +- .../eudat}/dao/entities/DatasetDaoImpl.java | 11 +- .../dao/entities/DatasetProfileDao.java | 9 +- .../dao/entities/DatasetProfileDaoImpl.java | 10 +- .../entities/DatasetProfileRulesetDao.java | 11 + .../DatasetProfileRulesetDaoImpl.java | 8 +- .../entities/DatasetProfileViewstyleDao.java | 11 + .../DatasetProfileViewstyleDaoImpl.java | 8 +- .../dao/entities/DatasetRegistryDao.java | 11 + .../dao/entities/DatasetRegistryDaoImpl.java | 8 +- .../eudat/dao/entities/DatasetServiceDao.java | 11 + .../dao/entities/DatasetServiceDaoImpl.java | 8 +- .../eudat}/dao/entities/OrganisationDao.java | 12 +- .../dao/entities/OrganisationDaoImpl.java | 13 +- .../eudat}/dao/entities/ProjectDao.java | 11 +- .../eudat}/dao/entities/ProjectDaoImpl.java | 16 +- .../eudat}/dao/entities/RegistryDao.java | 11 +- .../eudat}/dao/entities/RegistryDaoImpl.java | 12 +- .../eudat}/dao/entities/ResearcherDao.java | 12 +- .../dao/entities/ResearcherDaoImpl.java | 13 +- .../eudat}/dao/entities/ServiceDao.java | 10 +- .../eudat}/dao/entities/ServiceDaoImpl.java | 12 +- .../eudat}/dao/entities/UserInfoDao.java | 9 +- .../eudat}/dao/entities/UserInfoDaoImpl.java | 19 +- .../dao/entities/security/UserAuthDao.java | 6 +- .../entities/security/UserAuthDaoImpl.java | 8 +- .../java/{ => eu/eudat}/entities/DMP.java | 14 +- .../eudat}/entities/DMPOrganisation.java | 6 +- .../{ => eu/eudat}/entities/DMPProfile.java | 8 +- .../eudat}/entities/DMPResearcher.java | 5 +- .../{ => eu/eudat}/entities/DataEntity.java | 2 +- .../eudat}/entities/DataRepository.java | 7 +- .../java/{ => eu/eudat}/entities/Dataset.java | 12 +- .../eudat}/entities/DatasetProfile.java | 4 +- .../entities/DatasetProfileRuleset.java | 10 +- .../entities/DatasetProfileViewstyle.java | 9 +- .../eudat}/entities/DatasetRegistry.java | 5 +- .../eudat}/entities/DatasetService.java | 5 +- .../{ => eu/eudat}/entities/Organisation.java | 10 +- .../java/{ => eu/eudat}/entities/Project.java | 12 +- .../{ => eu/eudat}/entities/Registry.java | 8 +- .../{ => eu/eudat}/entities/Researcher.java | 10 +- .../java/{ => eu/eudat}/entities/Service.java | 10 +- .../java/{ => eu/eudat}/entities/UserDMP.java | 5 +- .../{ => eu/eudat}/entities/UserInfo.java | 11 +- .../entities/responses/IDLabelPair.java | 2 +- .../eudat}/entities/security/UserAuth.java | 5 +- .../DatabaseModelDefinition.java | 7 + .../xmlmodels/modeldefinition/Field.java | 12 +- .../xmlmodels/modeldefinition/FieldGroup.java | 6 +- .../xmlmodels/modeldefinition/FieldSet.java | 11 +- .../DatabaseViewStyleDefinition.java | 7 + .../viewstyledefinition/FieldGroup.java | 7 +- .../viewstyledefinition/FieldSet.java | 7 +- .../viewstyledefinition/Section.java | 7 +- .../viewstyledefinition/ViewStyleModel.java | 7 +- .../exceptions/NonValidTokenException.java | 2 +- .../{ => eu/eudat}/helpers/Transformers.java | 22 +- .../main/java/{ => eu/eudat}/login/Login.java | 14 +- .../{ => eu/eudat}/managers/AdminManager.java | 35 +- .../eudat}/managers/DashBoardManager.java | 12 +- .../managers/DataManagementPlanManager.java | 26 ++ .../eu/eudat/managers/ProjectManager.java | 27 ++ .../java/eu/eudat/managers/UserManager.java | 23 + .../java/{ => eu/eudat}/models/DataModel.java | 4 +- .../components/datasetprofile/Field.java | 31 +- .../components/datasetprofile/FieldSet.java | 26 +- .../components/datasetprofile/Group.java | 24 +- .../components/datasetprofile/Section.java | 17 +- .../admin/composite/DatasetProfile.java | 12 +- .../components/commons/DefaultValue.java | 2 +- .../components/commons/Multiplicity.java | 2 +- .../models/components/commons/Rule.java | 6 +- .../models/components/commons/ViewStyle.java | 2 +- .../models/components/commons/Visibility.java | 5 +- .../commons/datafield/AutoCompleteData.java | 4 +- .../datafield/BooleanDecisionData.java | 4 +- .../commons/datafield/CheckBoxData.java | 4 +- .../commons/datafield/ComboBoxData.java | 4 +- .../commons/datafield/FieldData.java | 4 +- .../commons/datafield/RadioBoxData.java | 5 +- .../commons/datafield/WordListData.java | 4 +- .../eudat}/models/criteria/Criteria.java | 4 +- .../criteria/DataManagementPlanCriteria.java | 4 +- .../criteria/DataRepositoryCriteria.java | 4 +- .../models/criteria/OrganisationCriteria.java | 6 + .../models/criteria/ProjectCriteria.java | 7 + .../models/criteria/RegistryCriteria.java | 7 + .../models/criteria/ResearcherCriteria.java | 6 + .../models/criteria/ServiceCriteria.java | 7 + .../models/dashboard/DashBoardStatistics.java | 2 +- .../eudat}/models/dataset/DataRepository.java | 12 +- .../eudat}/models/dataset/Dataset.java | 40 +- .../eu/eudat/models/dataset/Registry.java | 15 + .../java/eu/eudat/models/dataset/Service.java | 14 + .../eudat}/models/dmp/DataManagementPlan.java | 28 +- .../dmp/DataManagementPlanTableRequest.java | 4 +- .../eudat}/models/dmp/Organisation.java | 12 +- .../{ => eu/eudat}/models/dmp/Project.java | 12 +- .../{ => eu/eudat}/models/dmp/Researcher.java | 12 +- .../{ => eu/eudat}/models/dmp/UserInfo.java | 21 +- .../helpers/AutoCompleteLookupItem.java | 2 +- .../eudat}/models/helpers/DataTableData.java | 2 +- .../eudat}/models/project/Project.java | 28 +- .../models/project/ProjectTableRequest.java | 4 +- .../eu/eudat/models/properties/Field.java | 32 ++ .../eudat}/models/properties/FieldSet.java | 9 +- .../eudat}/models/properties/Group.java | 9 +- .../properties/PropertiesGenerator.java | 2 +- .../models/properties/PropertiesModel.java | 2 +- .../eudat}/models/properties/Section.java | 6 +- .../models/user/components/commons/Rule.java | 6 +- .../user/components/datasetprofile/Field.java | 27 +- .../components/datasetprofile/FieldSet.java | 29 +- .../user/components/datasetprofile/Group.java | 26 +- .../components/datasetprofile/Section.java | 19 +- .../models/user/composite/DatasetProfile.java | 14 +- .../composite/PropertiesModelBuilder.java | 2 +- .../main/java/{ => eu/eudat}/proxy/Proxy.java | 12 +- .../eudat}/proxy/config/ConfigLoader.java | 12 +- .../eudat}/proxy/config/ExternalUrls.java | 14 +- .../eudat}/proxy/config/FetchStrategy.java | 2 +- .../eudat}/proxy/config/UrlConfig.java | 2 +- .../config/entities/OrganisationUrls.java | 6 +- .../proxy/config/entities/ProjectUrls.java | 6 +- .../proxy/config/entities/RegistryUrls.java | 6 +- .../proxy/config/entities/RepositoryUrls.java | 6 +- .../proxy/config/entities/ResearcherUrls.java | 6 +- .../proxy/config/entities/ServiceUrls.java | 6 +- .../config/exceptions/HugeResultSet.java | 2 +- .../proxy/config/exceptions/NoURLFound.java | 2 +- .../eudat}/proxy/fetching/RemoteFetcher.java | 16 +- .../eudat}/responses/RestResponse.java | 2 +- .../CustomAuthenticationProvider.java | 14 +- .../security/TokenAuthenticationFilter.java | 2 +- .../eudat}/security/TokenSessionManager.java | 4 +- .../validators/GoogleTokenValidator.java | 11 +- .../validators/NativeTokenValidator.java | 14 +- .../security/validators/TokenValidator.java | 10 + .../eudat}/typedefinition/DataType.java | 26 +- .../typedefinition/DatabaseColumnType.java | 10 +- .../PostgreSQLDatabaseColumnType.java | 50 +- .../eudat}/typedefinition/UUIDType.java | 236 +++++----- .../eudat}/typedefinition/XMLType.java | 174 +++---- .../helpers/ModelBuilderCollector.java | 57 ++- .../main/java/helpers/SafeCleanAttribs.java | 19 - .../main/java/helpers/SerializerProvider.java | 83 ---- .../managers/DataManagementPlanManager.java | 29 -- .../main/java/managers/ProjectManager.java | 27 -- .../src/main/java/managers/UserManager.java | 24 - .../commons/datafield/FreeTextData.java | 34 -- .../models/criteria/OrganisationCriteria.java | 6 - .../java/models/criteria/ProjectCriteria.java | 7 - .../models/criteria/RegistryCriteria.java | 7 - .../models/criteria/ResearcherCriteria.java | 6 - .../java/models/criteria/ServiceCriteria.java | 7 - .../main/java/models/dataset/Registry.java | 15 - .../src/main/java/models/dataset/Service.java | 14 - .../main/java/models/properties/Field.java | 45 -- .../rest/entities/DashBoardController.java | 51 -- .../src/main/java/rest/entities/Projects.java | 376 --------------- .../src/main/java/rest/entities/Users.java | 115 ----- .../security/validators/TokenValidator.java | 10 - .../src/main/java/swagger/SwaggerConfig.java | 39 -- .../java/utilities/DatabaseDefinition.java | 5 - .../main/java/utilities/ModelDefinition.java | 8 - .../main/java/utilities/ModelSerializer.java | 9 - .../java/utilities/ViewStyleDefinition.java | 10 - .../main/java/utilities/XmlSerializable.java | 9 - .../builders/DomainModelConverter.java | 28 -- .../java/utilities/builders/ModelBuilder.java | 104 ----- .../java/utilities/builders/XmlBuilder.java | 84 ---- .../src/main/resources/application.properties | 48 ++ dmp-backend/src/main/resources/dmp.properties | 48 -- .../webapp/WEB-INF/applicationContext.xml | 133 ------ .../WEB-INF/dmp-backend-login-servlet.xml | 44 -- .../WEB-INF/dmp-backend-proxy-servlet.xml | 48 -- .../WEB-INF/dmp-backend-rest-servlet.xml | 54 --- .../main/webapp/WEB-INF/spring-security.xml | 41 -- .../webapp/WEB-INF/spring-web-servlet.xml | 27 -- .../main/webapp/WEB-INF/swagger-servlet.xml | 31 -- .../main/webapp/WEB-INF/views/jsp/home.jsp | 434 ------------------ dmp-backend/src/main/webapp/WEB-INF/web.xml | 135 ------ .../src/main/webapp/resources/css/home.css | 82 ---- .../resources/css/jquery.json-viewer.css | 47 -- .../resources/js/bootstrap-notify.min.js | 1 - .../src/main/webapp/resources/js/home.js | 81 ---- .../webapp/resources/js/jquery.json-viewer.js | 148 ------ .../webapp/resources/js/vkbeautify.0.99.00.js | 358 --------------- dmp-backend/src/test/java/TestRest.java | 307 ------------- 231 files changed, 1863 insertions(+), 5724 deletions(-) delete mode 100644 dmp-backend/dmp-backend.iml delete mode 100644 dmp-backend/src/main/java/checks/EnvironmentChecker.java delete mode 100644 dmp-backend/src/main/java/configs/WebConfiguration.java delete mode 100644 dmp-backend/src/main/java/controller/UIController.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DMPProfileDao.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java delete mode 100644 dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java delete mode 100644 dmp-backend/src/main/java/entities/DatasetDataRepository.java delete mode 100644 dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java delete mode 100644 dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java delete mode 100644 dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java rename dmp-backend/src/main/java/{ => eu/eudat}/cache/ResponsesCache.java (98%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Admin.java (60%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/DMPs.java (70%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/DataRepositories.java (55%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/DatasetProfileController.java (77%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/DatasetProfiles.java (64%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Datasets.java (75%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/DmpProfiles.java (58%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Organisations.java (55%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Registries.java (57%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Researchers.java (56%) rename dmp-backend/src/main/java/{rest/entities => eu/eudat/controllers}/Services.java (58%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/Dao.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/DaoFactory.java (89%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/DaoI.java (93%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/JpaDao.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/JpaDaoFactory.java (61%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/SpringJpaDaoFactory.java (73%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DMPDao.java (56%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DMPDaoImpl.java (85%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DMPProfileDaoImpl.java (81%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DMPResearcherDaoImpl.java (76%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DataRepositoryDao.java (52%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DataRepositoryDaoImpl.java (84%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetDao.java (55%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetDaoImpl.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetProfileDao.java (50%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetProfileDaoImpl.java (81%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetProfileRulesetDaoImpl.java (59%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetProfileViewstyleDaoImpl.java (59%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetRegistryDaoImpl.java (57%) create mode 100644 dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDao.java rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/DatasetServiceDaoImpl.java (57%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/OrganisationDao.java (52%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/OrganisationDaoImpl.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ProjectDao.java (58%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ProjectDaoImpl.java (85%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/RegistryDao.java (50%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/RegistryDaoImpl.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ResearcherDao.java (55%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ResearcherDaoImpl.java (88%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ServiceDao.java (55%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/ServiceDaoImpl.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/UserInfoDao.java (71%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/UserInfoDaoImpl.java (84%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/security/UserAuthDao.java (64%) rename dmp-backend/src/main/java/{ => eu/eudat}/dao/entities/security/UserAuthDaoImpl.java (84%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DMP.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DMPOrganisation.java (87%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DMPProfile.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DMPResearcher.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DataEntity.java (55%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DataRepository.java (93%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Dataset.java (93%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DatasetProfile.java (97%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DatasetProfileRuleset.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DatasetProfileViewstyle.java (87%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DatasetRegistry.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/DatasetService.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Organisation.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Project.java (92%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Registry.java (92%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Researcher.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/Service.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/UserDMP.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/UserInfo.java (92%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/responses/IDLabelPair.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/security/UserAuth.java (87%) create mode 100644 dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/modeldefinition/Field.java (89%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/modeldefinition/FieldGroup.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/modeldefinition/FieldSet.java (88%) create mode 100644 dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/viewstyledefinition/FieldGroup.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/viewstyledefinition/FieldSet.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/viewstyledefinition/Section.java (96%) rename dmp-backend/src/main/java/{ => eu/eudat}/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java (88%) rename dmp-backend/src/main/java/{ => eu/eudat}/exceptions/NonValidTokenException.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/helpers/Transformers.java (88%) rename dmp-backend/src/main/java/{ => eu/eudat}/login/Login.java (93%) rename dmp-backend/src/main/java/{ => eu/eudat}/managers/AdminManager.java (54%) rename dmp-backend/src/main/java/{ => eu/eudat}/managers/DashBoardManager.java (68%) create mode 100644 dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java create mode 100644 dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java create mode 100644 dmp-backend/src/main/java/eu/eudat/managers/UserManager.java rename dmp-backend/src/main/java/{ => eu/eudat}/models/DataModel.java (72%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/admin/components/datasetprofile/Field.java (76%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/admin/components/datasetprofile/FieldSet.java (55%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/admin/components/datasetprofile/Group.java (74%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/admin/components/datasetprofile/Section.java (78%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/admin/composite/DatasetProfile.java (52%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/DefaultValue.java (87%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/Multiplicity.java (85%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/Rule.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/ViewStyle.java (89%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/Visibility.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/AutoCompleteData.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/BooleanDecisionData.java (85%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/CheckBoxData.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/ComboBoxData.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/FieldData.java (77%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/RadioBoxData.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/components/commons/datafield/WordListData.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/criteria/Criteria.java (72%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/criteria/DataManagementPlanCriteria.java (51%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/criteria/DataRepositoryCriteria.java (50%) create mode 100644 dmp-backend/src/main/java/eu/eudat/models/criteria/OrganisationCriteria.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/criteria/RegistryCriteria.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/criteria/ServiceCriteria.java rename dmp-backend/src/main/java/{ => eu/eudat}/models/dashboard/DashBoardStatistics.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dataset/DataRepository.java (66%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dataset/Dataset.java (66%) create mode 100644 dmp-backend/src/main/java/eu/eudat/models/dataset/Registry.java create mode 100644 dmp-backend/src/main/java/eu/eudat/models/dataset/Service.java rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/DataManagementPlan.java (67%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/DataManagementPlanTableRequest.java (86%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/Organisation.java (71%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/Project.java (59%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/Researcher.java (74%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/dmp/UserInfo.java (75%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/helpers/AutoCompleteLookupItem.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/helpers/DataTableData.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/project/Project.java (81%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/project/ProjectTableRequest.java (85%) create mode 100644 dmp-backend/src/main/java/eu/eudat/models/properties/Field.java rename dmp-backend/src/main/java/{ => eu/eudat}/models/properties/FieldSet.java (81%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/properties/Group.java (67%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/properties/PropertiesGenerator.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/properties/PropertiesModel.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/properties/Section.java (84%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/components/commons/Rule.java (85%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/components/datasetprofile/Field.java (81%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/components/datasetprofile/FieldSet.java (70%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/components/datasetprofile/Group.java (75%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/components/datasetprofile/Section.java (78%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/composite/DatasetProfile.java (66%) rename dmp-backend/src/main/java/{ => eu/eudat}/models/user/composite/PropertiesModelBuilder.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/Proxy.java (89%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/ConfigLoader.java (91%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/ExternalUrls.java (83%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/FetchStrategy.java (60%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/UrlConfig.java (97%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/OrganisationUrls.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/ProjectUrls.java (81%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/RegistryUrls.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/RepositoryUrls.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/ResearcherUrls.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/entities/ServiceUrls.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/exceptions/HugeResultSet.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/config/exceptions/NoURLFound.java (82%) rename dmp-backend/src/main/java/{ => eu/eudat}/proxy/fetching/RemoteFetcher.java (94%) rename dmp-backend/src/main/java/{ => eu/eudat}/responses/RestResponse.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/security/CustomAuthenticationProvider.java (88%) rename dmp-backend/src/main/java/{ => eu/eudat}/security/TokenAuthenticationFilter.java (98%) rename dmp-backend/src/main/java/{ => eu/eudat}/security/TokenSessionManager.java (96%) rename dmp-backend/src/main/java/{ => eu/eudat}/security/validators/GoogleTokenValidator.java (90%) rename dmp-backend/src/main/java/{ => eu/eudat}/security/validators/NativeTokenValidator.java (64%) create mode 100644 dmp-backend/src/main/java/eu/eudat/security/validators/TokenValidator.java rename dmp-backend/src/main/java/{ => eu/eudat}/typedefinition/DataType.java (72%) rename dmp-backend/src/main/java/{ => eu/eudat}/typedefinition/DatabaseColumnType.java (70%) rename dmp-backend/src/main/java/{ => eu/eudat}/typedefinition/PostgreSQLDatabaseColumnType.java (89%) rename dmp-backend/src/main/java/{ => eu/eudat}/typedefinition/UUIDType.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/typedefinition/XMLType.java (95%) rename dmp-backend/src/main/java/{ => eu/eudat}/utilities/helpers/ModelBuilderCollector.java (52%) delete mode 100644 dmp-backend/src/main/java/helpers/SafeCleanAttribs.java delete mode 100644 dmp-backend/src/main/java/helpers/SerializerProvider.java delete mode 100644 dmp-backend/src/main/java/managers/DataManagementPlanManager.java delete mode 100644 dmp-backend/src/main/java/managers/ProjectManager.java delete mode 100644 dmp-backend/src/main/java/managers/UserManager.java delete mode 100644 dmp-backend/src/main/java/models/components/commons/datafield/FreeTextData.java delete mode 100644 dmp-backend/src/main/java/models/criteria/OrganisationCriteria.java delete mode 100644 dmp-backend/src/main/java/models/criteria/ProjectCriteria.java delete mode 100644 dmp-backend/src/main/java/models/criteria/RegistryCriteria.java delete mode 100644 dmp-backend/src/main/java/models/criteria/ResearcherCriteria.java delete mode 100644 dmp-backend/src/main/java/models/criteria/ServiceCriteria.java delete mode 100644 dmp-backend/src/main/java/models/dataset/Registry.java delete mode 100644 dmp-backend/src/main/java/models/dataset/Service.java delete mode 100644 dmp-backend/src/main/java/models/properties/Field.java delete mode 100644 dmp-backend/src/main/java/rest/entities/DashBoardController.java delete mode 100644 dmp-backend/src/main/java/rest/entities/Projects.java delete mode 100644 dmp-backend/src/main/java/rest/entities/Users.java delete mode 100644 dmp-backend/src/main/java/security/validators/TokenValidator.java delete mode 100644 dmp-backend/src/main/java/swagger/SwaggerConfig.java delete mode 100644 dmp-backend/src/main/java/utilities/DatabaseDefinition.java delete mode 100644 dmp-backend/src/main/java/utilities/ModelDefinition.java delete mode 100644 dmp-backend/src/main/java/utilities/ModelSerializer.java delete mode 100644 dmp-backend/src/main/java/utilities/ViewStyleDefinition.java delete mode 100644 dmp-backend/src/main/java/utilities/XmlSerializable.java delete mode 100644 dmp-backend/src/main/java/utilities/builders/DomainModelConverter.java delete mode 100644 dmp-backend/src/main/java/utilities/builders/ModelBuilder.java delete mode 100644 dmp-backend/src/main/java/utilities/builders/XmlBuilder.java create mode 100644 dmp-backend/src/main/resources/application.properties delete mode 100644 dmp-backend/src/main/resources/dmp.properties delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/applicationContext.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/dmp-backend-login-servlet.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/dmp-backend-proxy-servlet.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/dmp-backend-rest-servlet.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/spring-security.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/spring-web-servlet.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/swagger-servlet.xml delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/views/jsp/home.jsp delete mode 100644 dmp-backend/src/main/webapp/WEB-INF/web.xml delete mode 100644 dmp-backend/src/main/webapp/resources/css/home.css delete mode 100644 dmp-backend/src/main/webapp/resources/css/jquery.json-viewer.css delete mode 100644 dmp-backend/src/main/webapp/resources/js/bootstrap-notify.min.js delete mode 100644 dmp-backend/src/main/webapp/resources/js/home.js delete mode 100644 dmp-backend/src/main/webapp/resources/js/jquery.json-viewer.js delete mode 100644 dmp-backend/src/main/webapp/resources/js/vkbeautify.0.99.00.js delete mode 100644 dmp-backend/src/test/java/TestRest.java diff --git a/dmp-backend/dmp-backend.iml b/dmp-backend/dmp-backend.iml deleted file mode 100644 index c5ac1805e..000000000 --- a/dmp-backend/dmp-backend.iml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml index 3e400ccc2..7c979186d 100644 --- a/dmp-backend/pom.xml +++ b/dmp-backend/pom.xml @@ -5,16 +5,20 @@ dmp-backend dmp-backend 0.0.1-SNAPSHOT - war + + org.springframework.boot + spring-boot-starter-parent + 1.5.9.RELEASE + 1.19.0 1.19.0 0.0.1-SNAPSHOT 4.3.8.RELEASE - + 4.2.3.RELEASE 1.19.1 7.0.35 @@ -41,6 +45,16 @@ + + + + + + org.json + json + 20160810 + + org.hibernate @@ -53,266 +67,96 @@ hibernate-c3p0 ${hibernate.version} - - - - + + - javax.servlet - javax.servlet-api - ${javax.servlet.servlet-api.version} - provided + com.google.api-client + google-api-client + 1.23.0 - + - org.springframework - spring-core - ${org.springframework.version} + com.jayway.jsonpath + json-path + 2.4.0 - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-context-support - ${org.springframework.version} - - - - + - org.springframework - spring-orm - ${org.springframework.version} + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + 2.9.3 - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - - - org.springframework.security - spring-security-core - ${org.springframework.security.version} - - - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - org.springframework.security - spring-security-config - ${org.springframework.security.version} + spring-security-web + 4.2.3.RELEASE - - javax.servlet - jstl - 1.2 - - - - commons-fileupload - commons-fileupload - 1.2.1 - + + - - com.fasterxml.jackson.core - jackson-annotations - ${com.fasterxml.jackson} - - - com.fasterxml.jackson.core - jackson-core - ${com.fasterxml.jackson} + org.springframework.boot + spring-boot-starter-web + + com.fasterxml.jackson.core jackson-databind - ${com.fasterxml.jackson} - - - - com.fasterxml.jackson.datatype - jackson-datatype-hibernate5 - ${com.fasterxml.jackson} - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${com.fasterxml.jackson} - - - - - - org.json - json - 20160810 - - - - - - org.apache.tomcat - tomcat-jdbc - ${org.apache.tomcat.tomcat-jdbc.version} - provided - - - - - junit - junit - ${org.junit.version} - test - - - - com.google.code.gson - gson - 2.8.2 - test - - - - - - org.postgresql - postgresql - 9.4.1212 - - - - - - log4j - log4j - ${log4j.version} + + + com.fasterxml.jackson.core + jackson-annotations + + - commons-codec - commons-codec - ${commons-codec.version} + com.fasterxml.jackson.core + jackson-annotations + 2.9.0 - - + - org.slf4j - jcl-over-slf4j - ${slf4j.version} - runtime + org.springframework + spring-context + 4.3.10.RELEASE - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - runtime - - - log4j - log4j - ${log4j.version} - runtime - - - - com.jayway.jsonpath - json-path - 2.4.0 - - - - - - - - - - - com.google.apis - google-api-services-oauth2 - v2-rev75-1.19.0 - - - com.google.guava - guava-jdk5 - - - - - com.google.http-client - google-http-client-jackson2 - ${project.http.version} - - - com.google.oauth-client - google-oauth-client-jetty - ${project.oauth.version} - - - - - - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - - org.springframework - spring-tx - ${org.springframework.version} - - - - + com.google.guava guava 23.0 - - - - - io.springfox - springfox-swagger2 - 2.7.0 - - - - - - - + + + org.springframework + spring-context-support + 4.0.0.RELEASE + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + junit + junit + 4.12 + test + + + + postgresql + postgresql + 9.1-901.jdbc4 + io.springfox @@ -333,35 +177,20 @@ + + + org.springframework.boot + spring-boot-maven-plugin + org.apache.maven.plugins maven-compiler-plugin - 3.1 1.8 1.8 - UTF-8 - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - analyze - - analyze-only - - - false - - - - - ${project.artifactId} diff --git a/dmp-backend/src/main/java/checks/EnvironmentChecker.java b/dmp-backend/src/main/java/checks/EnvironmentChecker.java deleted file mode 100644 index fe70e6227..000000000 --- a/dmp-backend/src/main/java/checks/EnvironmentChecker.java +++ /dev/null @@ -1,31 +0,0 @@ -package checks; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; - -public class EnvironmentChecker implements ServletContextListener { - - @Override - public void contextDestroyed(ServletContextEvent arg0) { - - } - - @Override - public void contextInitialized(ServletContextEvent arg0) { - try{ - MessageDigest.getInstance("SHA-256"); - System.out.println("SHA-256 algorithm found, as expected!"); - } - catch(NoSuchAlgorithmException ex) { - System.out.println("\n\n\n\nSEVERE ERROR: COULD NOT FIND WITHIN JVM THE SHA-256 ALGORITHM. PLEASE UPDATE THE JRE TO A VERSION >= 1.7\n\n\n\n"); - //shutting down the webapp should also be considered - } - - - - } - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/configs/WebConfiguration.java b/dmp-backend/src/main/java/configs/WebConfiguration.java deleted file mode 100644 index 3f5245123..000000000 --- a/dmp-backend/src/main/java/configs/WebConfiguration.java +++ /dev/null @@ -1,37 +0,0 @@ -package configs; - -import java.util.List; - -import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module; -import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature; - -@Configuration -@EnableWebMvc -public class WebConfiguration extends WebMvcConfigurerAdapter { - - @Override - public void configureMessageConverters(List> converters) { - - Hibernate5Module module = new Hibernate5Module(); - module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS); - ObjectMapper objectMapper = new ObjectMapper() -// .setSerializationInclusion(Include.NON_NULL) -// .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .registerModule(new Hibernate5Module()) - ; - - converters.add(new MappingJackson2HttpMessageConverter(objectMapper)); - - System.out.println("Using custom json serializer loaded with module Hibernate5Module"); - - } -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/controller/UIController.java b/dmp-backend/src/main/java/controller/UIController.java deleted file mode 100644 index 2f1a2d66f..000000000 --- a/dmp-backend/src/main/java/controller/UIController.java +++ /dev/null @@ -1,23 +0,0 @@ -package controller; - - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -import dao.entities.DMPDao; - -@Controller -public class UIController { - - @Autowired private DMPDao dMPDao; - - @RequestMapping(value = "/home", method = RequestMethod.GET) - public String printWelcome(ModelMap model) { - model.addAttribute("DMPs", dMPDao.getAll()); - return "home"; - } - -} diff --git a/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java b/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java deleted file mode 100644 index 23ed9e85e..000000000 --- a/dmp-backend/src/main/java/dao/entities/DMPProfileDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package dao.entities; - -import java.util.List; -import java.util.UUID; - -import dao.Dao; -import entities.DMPProfile; -import entities.responses.IDLabelPair; - -public interface DMPProfileDao extends Dao { - - List listAllIDs(); - - List listAllIDsLabels(); - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java b/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java deleted file mode 100644 index c97e6c78d..000000000 --- a/dmp-backend/src/main/java/dao/entities/DMPResearcherDao.java +++ /dev/null @@ -1,14 +0,0 @@ -package dao.entities; - -import java.util.UUID; - -import dao.Dao; -import entities.DMPResearcher; -import entities.Researcher; - -public interface DMPResearcherDao extends Dao { - - - Researcher getResearcherByEmail(String email); - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java deleted file mode 100644 index 478579922..000000000 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package dao.entities; - -import java.util.UUID; - -import dao.Dao; -import entities.DatasetProfileRuleset; - -public interface DatasetProfileRulesetDao extends Dao { - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java b/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java deleted file mode 100644 index 6fee75767..000000000 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package dao.entities; - -import java.util.UUID; - -import dao.Dao; -import entities.DatasetProfileViewstyle; - -public interface DatasetProfileViewstyleDao extends Dao { - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java b/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java deleted file mode 100644 index 715048c7e..000000000 --- a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package dao.entities; - -import java.util.UUID; - -import dao.Dao; -import entities.DatasetRegistry; - -public interface DatasetRegistryDao extends Dao { - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java b/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java deleted file mode 100644 index fe1e7c5be..000000000 --- a/dmp-backend/src/main/java/dao/entities/DatasetServiceDao.java +++ /dev/null @@ -1,10 +0,0 @@ -package dao.entities; - -import java.util.UUID; - -import dao.Dao; -import entities.DatasetService; - -public interface DatasetServiceDao extends Dao { - -} \ No newline at end of file diff --git a/dmp-backend/src/main/java/entities/DatasetDataRepository.java b/dmp-backend/src/main/java/entities/DatasetDataRepository.java deleted file mode 100644 index a98ee5645..000000000 --- a/dmp-backend/src/main/java/entities/DatasetDataRepository.java +++ /dev/null @@ -1,86 +0,0 @@ -package entities; - - -import java.io.Serializable; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; - - -@Entity -@Table(name="\"DatasetDataRepository\"") -@JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id") -public class DatasetDataRepository implements Serializable { - - - private static final long serialVersionUID = 576327201656132811L; - - public DatasetDataRepository () {} - - - @Id - @GeneratedValue - @GenericGenerator(name = "uuid2", strategy = "uuid2") - @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL - @Column(name = "\"Dataset\"", nullable = false) - private UUID dataset; - - @Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL - @Column(name = "\"DataRepository\"", nullable = false) - private UUID dataRepository; - - @Column(name = "\"Role\"") - private Integer role; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public UUID getDataset() { - return dataset; - } - - public void setDataset(UUID dataset) { - this.dataset = dataset; - } - - public UUID getDataRepository() { - return dataRepository; - } - - public void setDataRepository(UUID dataRepository) { - this.dataRepository = dataRepository; - } - - public Integer getRole() { - return role; - } - - public void setRole(Integer role) { - this.role = role; - } - - - - -} diff --git a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java deleted file mode 100644 index 5523ecd3e..000000000 --- a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java +++ /dev/null @@ -1,7 +0,0 @@ -package entities.xmlmodels.modeldefinition; - -import utilities.DatabaseDefinition; - -public interface DatabaseModelDefinition extends DatabaseDefinition{ - -} diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java deleted file mode 100644 index d7998eaf7..000000000 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java +++ /dev/null @@ -1,7 +0,0 @@ -package entities.xmlmodels.viewstyledefinition; - -import utilities.DatabaseDefinition; - -public interface DatabaseViewStyleDefinition extends DatabaseDefinition{ - -} diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java b/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java deleted file mode 100644 index 251093a12..000000000 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Field.java +++ /dev/null @@ -1,145 +0,0 @@ -package entities.xmlmodels.viewstyledefinition; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import entities.xmlmodels.modeldefinition.DatabaseModelDefinition; -import models.components.commons.ViewStyle; -import models.components.commons.Visibility; -import models.components.commons.datafield.FieldData; -import utilities.XmlSerializable; -import utilities.builders.ModelBuilder; -import utilities.builders.XmlBuilder; - -public class Field implements DatabaseViewStyleDefinition,XmlSerializable{ - private String id; - private int ordinal; - private boolean defaultVisibility; - private String title; - private String description; - private String extendedDescription; - private ViewStyle viewStyle; - private Visibility visible; - private FieldData data; - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - public int getOrdinal() { - return ordinal; - } - public void setOrdinal(int ordinal) { - this.ordinal = ordinal; - } - public boolean getDefaultVisibility() { - return defaultVisibility; - } - public void setDefaultVisibility(boolean defaultVisibility) { - this.defaultVisibility = defaultVisibility; - } - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - public String getExtendedDescription() { - return extendedDescription; - } - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } - public ViewStyle getViewStyle() { - return viewStyle; - } - public void setViewStyle(ViewStyle viewStyle) { - this.viewStyle = viewStyle; - } - - public FieldData getData() { - return data; - } - public void setData(FieldData data) { - this.data = data; - } - - public Visibility getVisible() { - return visible; - } - public void setVisible(Visibility visible) { - this.visible = visible; - } - @Override - public Element toXml(Document doc) { - Element rootElement = doc.createElement("field"); - rootElement.setAttribute("id", this.id); - rootElement.setAttribute("ordinal", ""+this.ordinal); - rootElement.setAttribute("defaultVisibility",""+this.defaultVisibility); - - Element extendedDescription = doc.createElement("extendedDescription"); - extendedDescription.setTextContent(this.extendedDescription); - - Element description = doc.createElement("description"); - description.setTextContent(this.description); - - Element title = doc.createElement("title"); - title.setTextContent(this.title); - - Element viewStyle = doc.createElement("viewStyle"); - viewStyle.setAttribute("renderstyle", this.viewStyle.getRenderStyle()); - viewStyle.setAttribute("cssClass", this.viewStyle.getCssClass()); - - Element visibility = this.visible.toXml(doc); - - rootElement.appendChild(title); - rootElement.appendChild(visibility); - rootElement.appendChild(extendedDescription); - rootElement.appendChild(viewStyle); - rootElement.appendChild(description); - if(this.data!=null)rootElement.appendChild(this.data.toXml(doc)); - return rootElement; - } - @Override - public Field fromXml(Element element) { - this.id = element.getAttribute("id"); - this.ordinal = Integer.parseInt(element.getAttribute("ordinal")); - this.defaultVisibility = Boolean.valueOf(element.getAttribute("defaultVisibility")).booleanValue(); - - Element extendedDescription = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription"); - - this.extendedDescription = extendedDescription.getTextContent(); - - Element description = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description"); - - this.description = description.getTextContent(); - - Element title = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title"); - - this.title = title.getTextContent(); - - this.viewStyle = new ViewStyle(); - Element viewStyle = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle"); - - this.viewStyle.setRenderStyle(viewStyle.getAttribute("renderstyle")); - this.viewStyle.setCssClass(viewStyle.getAttribute("cssClass")); - - Element visibility = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible"); - - this.visible = new Visibility().fromXml(visibility); - - Element dataElement = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "data"); - - this.data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(),dataElement); - if(this.data!=null)this.data.fromXml(dataElement); - return this; - } - -} diff --git a/dmp-backend/src/main/java/cache/ResponsesCache.java b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java similarity index 98% rename from dmp-backend/src/main/java/cache/ResponsesCache.java rename to dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java index 4b4200a3a..4e2d4c3a7 100644 --- a/dmp-backend/src/main/java/cache/ResponsesCache.java +++ b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java @@ -1,4 +1,4 @@ -package cache; +package eu.eudat.cache; import java.util.ArrayList; diff --git a/dmp-backend/src/main/java/rest/entities/Admin.java b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java similarity index 60% rename from dmp-backend/src/main/java/rest/entities/Admin.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Admin.java index 8e8385ef0..0d67e9d55 100644 --- a/dmp-backend/src/main/java/rest/entities/Admin.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java @@ -1,39 +1,24 @@ -package rest.entities; +package eu.eudat.controllers; -import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; +import eu.eudat.dao.entities.*; +import eu.eudat.managers.DashBoardManager; +import eu.eudat.models.dashboard.DashBoardStatistics; 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.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import eu.eudat.managers.AdminManager; +import eu.eudat.models.admin.composite.DatasetProfile; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import entities.DatasetProfileViewstyle; -import entities.xmlmodels.modeldefinition.FieldGroup; -import entities.xmlmodels.viewstyledefinition.Section; -import managers.AdminManager; -import models.admin.components.datasetprofile.FieldSet; -import models.admin.composite.DatasetProfile; -import utilities.builders.ModelBuilder; -import utilities.builders.XmlBuilder; -import utilities.helpers.ModelBuilderCollector; +import javax.transaction.Transactional; @RestController @CrossOrigin @@ -47,8 +32,8 @@ public class Admin { @RequestMapping(method = RequestMethod.POST, value = { "/admin/addDmp" },consumes = "application/json", produces="application/json") public ResponseEntity addDmp(@RequestBody DatasetProfile profile){ try{ - entities.DatasetProfile modelDefinition = AdminManager.generateModelDefinition(profile); - entities.DatasetProfileViewstyle viewStyleDefinition = AdminManager.generateViewStyleDefinition(profile); + eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateModelDefinition(profile); + eu.eudat.entities.DatasetProfileViewstyle viewStyleDefinition = AdminManager.generateViewStyleDefinition(profile); viewStyleDefinition = datasetProfileViewstyleDao.create(viewStyleDefinition); modelDefinition.setViewstyle(viewStyleDefinition); @@ -65,13 +50,13 @@ public class Admin { @RequestMapping(method = RequestMethod.POST, value = { "/admin/addDmp/{id}" },consumes = "application/json", produces="application/json") public ResponseEntity updateDmp(@PathVariable String id,@RequestBody DatasetProfile profile){ try{ - entities.DatasetProfile modelDefinition = AdminManager.generateModelDefinition(profile); - entities.DatasetProfileViewstyle viewStyleDefinition = AdminManager.generateViewStyleDefinition(profile); + eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateModelDefinition(profile); + eu.eudat.entities.DatasetProfileViewstyle viewStyleDefinition = AdminManager.generateViewStyleDefinition(profile); - entities.DatasetProfile datasetprofile = datasetProfileDao.read(UUID.fromString(id)); + eu.eudat.entities.DatasetProfile datasetprofile = datasetProfileDao.read(UUID.fromString(id)); - entities.DatasetProfileViewstyle oldviewStyle = datasetProfileViewstyleDao.read((datasetprofile.getViewstyle().getId())); + eu.eudat.entities.DatasetProfileViewstyle oldviewStyle = datasetProfileViewstyleDao.read((datasetprofile.getViewstyle().getId())); oldviewStyle.setDefinition(viewStyleDefinition.getDefinition()); datasetProfileViewstyleDao.update(oldviewStyle); @@ -92,13 +77,12 @@ public class Admin { @RequestMapping(method = RequestMethod.GET, value = { "/admin/get/{id}" }, produces="application/json") public ResponseEntity get(@PathVariable String id){ try{ - entities.DatasetProfile profile = datasetProfileDao.read(UUID.fromString(id)); - models.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile); + eu.eudat.entities.DatasetProfile profile = datasetProfileDao.read(UUID.fromString(id)); + eu.eudat.models.admin.composite.DatasetProfile datasetprofile = AdminManager.generateDatasetProfileModel(profile); return ResponseEntity.status(HttpStatus.OK).body(datasetprofile); }catch(Exception ex){ ex.printStackTrace(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("{\"reason\":\""+ex.getMessage()+"\"}"); } } - } diff --git a/dmp-backend/src/main/java/rest/entities/DMPs.java b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java similarity index 70% rename from dmp-backend/src/main/java/rest/entities/DMPs.java rename to dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java index 70335e2ba..1b0665b31 100644 --- a/dmp-backend/src/main/java/rest/entities/DMPs.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java @@ -1,4 +1,4 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.*; @@ -6,14 +6,14 @@ import java.util.stream.Collectors; import javax.transaction.Transactional; -import models.criteria.DataRepositoryCriteria; -import models.criteria.OrganisationCriteria; -import models.criteria.ResearcherCriteria; -import models.criteria.ServiceCriteria; -import models.dmp.DataManagementPlan; -import models.dmp.DataManagementPlanTableRequest; -import models.helpers.DataTableData; -import models.project.ProjectTableRequest; +import eu.eudat.entities.DMP; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.UserInfo; +import eu.eudat.models.criteria.OrganisationCriteria; +import eu.eudat.models.criteria.ResearcherCriteria; +import eu.eudat.models.dmp.DataManagementPlan; +import eu.eudat.models.dmp.DataManagementPlanTableRequest; +import eu.eudat.models.helpers.DataTableData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -27,28 +27,21 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import dao.entities.UserInfoDao; -import entities.DMP; -import entities.Dataset; -import entities.Project; -import entities.UserInfo; -import entities.responses.IDLabelPair; -import helpers.SerializerProvider; -import managers.DataManagementPlanManager; -import managers.ProjectManager; -import utilities.builders.DomainModelConverter; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.dao.entities.UserInfoDao; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.managers.DataManagementPlanManager; @RestController @@ -75,9 +68,9 @@ public class DMPs { @RequestMapping(method = RequestMethod.POST, value = { "/dmps/getPaged" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity> getPaged(@RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest) { + public @ResponseBody ResponseEntity> getPaged(@RequestBody DataManagementPlanTableRequest dataManagementPlanTableRequest) { try { - DataTableData dataTable = new DataManagementPlanManager().getPaged(dMPDao, dataManagementPlanTableRequest); + DataTableData dataTable = new DataManagementPlanManager().getPaged(dMPDao, dataManagementPlanTableRequest); return ResponseEntity.status(HttpStatus.OK).body(dataTable); @@ -88,9 +81,9 @@ public class DMPs { } @RequestMapping(method = RequestMethod.GET, value = { "/dmps/getSingle/{id}" }, produces="application/json") - public @ResponseBody ResponseEntity getPaged(@PathVariable String id) { + public @ResponseBody ResponseEntity getPaged(@PathVariable String id) { try { - models.dmp.DataManagementPlan project = new DataManagementPlanManager().getSingle(dMPDao, id); + eu.eudat.models.dmp.DataManagementPlan project = new DataManagementPlanManager().getSingle(dMPDao, id); return ResponseEntity.status(HttpStatus.OK).body(project); } catch (Exception ex) { @@ -101,8 +94,8 @@ public class DMPs { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/dmps/add" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity addDmp(@RequestBody models.dmp.DataManagementPlan dataManagementPlan) { - entities.DMP createdProject = dMPDao.update(dataManagementPlan.toDataModel()); + public @ResponseBody ResponseEntity addDmp(@RequestBody eu.eudat.models.dmp.DataManagementPlan dataManagementPlan) { + eu.eudat.entities.DMP createdProject = dMPDao.update(dataManagementPlan.toDataModel()); return ResponseEntity.status(HttpStatus.CREATED).body(createdProject); } @@ -110,19 +103,19 @@ public class DMPs { //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @RequestMapping(method = RequestMethod.GET, value = { "/dmps" }, produces="text/plain") - public @ResponseBody ResponseEntity listDMPs(){ + public @ResponseBody ResponseEntity> listDMPs(){ try { List allIDs = dMPDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/dmps/{id}" }, produces="application/json") - public @ResponseBody ResponseEntity getDMP(@PathVariable("id") String id){ + public @ResponseBody ResponseEntity getDMP(@PathVariable("id") String id){ try { DMP dmp = dMPDao.read(UUID.fromString(id)); DataManagementPlan dataManagementPlan = new DataManagementPlan(); @@ -131,19 +124,19 @@ public class DMPs { } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/dmp/listDMPLabelID" }, produces="text/plain") - public @ResponseBody ResponseEntity listDmpLabelID(){ + public @ResponseBody ResponseEntity> listDmpLabelID(){ try { List allIDLabels = dMPDao.listAllIDsLabels(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDLabels)); + return ResponseEntity.status(HttpStatus.OK).body(allIDLabels); } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -156,48 +149,48 @@ public class DMPs { try { List allDMPs = dMPDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allDMPs), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allDMPs); } catch(Exception ex) { ex.printStackTrace(); - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null ); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/dmp/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity createDMP(@RequestBody DMP dmp) { + public @ResponseBody ResponseEntity createDMP(@RequestBody DMP dmp) { try { DMP createdDmp = dMPDao.update(dmp); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdDmp)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdDmp); } catch (Exception e) { e.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create DMP!\""); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/dmp/update" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity updateDMP(@RequestBody DataManagementPlan dataManagementPlan) { + public @ResponseBody ResponseEntity updateDMP(@RequestBody DataManagementPlan dataManagementPlan) { DMP newDmp = dataManagementPlan.toDataModel(); if(newDmp.getOrganisations()!=null&&!newDmp.getOrganisations().isEmpty()){ - for(entities.Organisation organisation: newDmp.getOrganisations()){ + for(eu.eudat.entities.Organisation organisation: newDmp.getOrganisations()){ OrganisationCriteria criteria = new OrganisationCriteria(); criteria.setLike(organisation.getReference()); - List entries = this.organisationDao.listBy(criteria); + List entries = this.organisationDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())organisation.setId(entries.get(0).getId()); else organisation = this.organisationDao.create(organisation); } } if(newDmp.getResearchers()!=null&&!newDmp.getResearchers().isEmpty()){ - for(entities.Researcher researcher : newDmp.getResearchers()){ + for(eu.eudat.entities.Researcher researcher : newDmp.getResearchers()){ ResearcherCriteria criteria = new ResearcherCriteria(); criteria.setLike(researcher.getReference()); - List entries = this.researcherDao.listBy(criteria); + List entries = this.researcherDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())researcher.setId(entries.get(0).getId()); else researcher = this.researcherDao.create(researcher); } @@ -213,10 +206,10 @@ public class DMPs { try { DMP updatedDMP = dMPDao.update(previousDmp); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(updatedDMP)); + return ResponseEntity.status(HttpStatus.CREATED).body(updatedDMP); } catch (Exception e) { e.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not update DMP!\""); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -226,12 +219,12 @@ public class DMPs { @RequestMapping(method = RequestMethod.POST, value = { "/dmp/getdatasets" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity getDatasetsOfDMP(@RequestBody DMP dmp) { + public @ResponseBody ResponseEntity> getDatasetsOfDMP(@RequestBody DMP dmp) { try { List datasets = datasetDao.getDatasetsOfDmp(dmp.getId()); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(datasets)); + return ResponseEntity.status(HttpStatus.OK).body(datasets); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not get datasets of DMP!\""); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -276,60 +269,60 @@ public class DMPs { //////////////////////////////// @RequestMapping(method = RequestMethod.GET, value = { "/dmp/getofuser" }, produces="text/plain") - public @ResponseBody ResponseEntity getDmpsOfUser(){ + public @ResponseBody ResponseEntity> getDmpsOfUser(){ 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"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } try { //List nonDeleted = userInfoDao.getDmpsOfUser(userID); List nonDeleted = dMPDao.getDMPsOfUser(userID); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(nonDeleted)); + return ResponseEntity.status(HttpStatus.OK).body(nonDeleted); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.POST, value = { "/dmp/createofuser" }, produces="text/plain", consumes = "application/json") - public @ResponseBody ResponseEntity createDmpOfUser(@RequestBody DataManagementPlan dataManagementPlan){ + public @ResponseBody ResponseEntity createDmpOfUser(@RequestBody DataManagementPlan dataManagementPlan){ 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"); + 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("There's no such a user on the system. You shouldn't be here"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); try { DMP dmp = dataManagementPlan.toDataModel(); if(dmp.getOrganisations()!=null&&!dmp.getOrganisations().isEmpty()){ - for(entities.Organisation organisation: dmp.getOrganisations()){ + for(eu.eudat.entities.Organisation organisation: dmp.getOrganisations()){ OrganisationCriteria criteria = new OrganisationCriteria(); criteria.setLike(organisation.getReference()); - List entries = this.organisationDao.listBy(criteria); + List entries = this.organisationDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())organisation.setId(entries.get(0).getId()); else organisation = this.organisationDao.create(organisation); } } if(dmp.getResearchers()!=null&&!dmp.getResearchers().isEmpty()){ - for(entities.Researcher researcher : dmp.getResearchers()){ + for(eu.eudat.entities.Researcher researcher : dmp.getResearchers()){ ResearcherCriteria criteria = new ResearcherCriteria(); criteria.setLike(researcher.getReference()); - List entries = this.researcherDao.listBy(criteria); + List entries = this.researcherDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())researcher.setId(entries.get(0).getId()); else researcher = this.researcherDao.create(researcher); } @@ -348,29 +341,29 @@ public class DMPs { DMP newdmp = dMPDao.create(dmp); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(newdmp)); + return ResponseEntity.status(HttpStatus.OK).body(newdmp); } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.POST, value = { "/dmp/cloneforuser" }, produces="text/plain", consumes = "application/json") - public @ResponseBody ResponseEntity cloneDmpOfUser(@RequestBody DMP dmp){ + public @ResponseBody ResponseEntity cloneDmpOfUser(@RequestBody DMP dmp){ 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"); + 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("There's no such a user on the system. You shouldn't be here"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); DMP clone = dMPDao.read(dmp.getId()); @@ -397,34 +390,34 @@ public class DMPs { clone = dMPDao.create(clone); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(clone)); + return ResponseEntity.status(HttpStatus.OK).body(clone); } catch(Exception ex) { ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.POST, value = { "/dmp/adduser" }, produces="text/plain") - public @ResponseBody ResponseEntity addUserToDmp(@RequestBody DMP dmp){ + public @ResponseBody ResponseEntity addUserToDmp(@RequestBody DMP dmp){ 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"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } final UserInfo userInfo = userInfoDao.read(UUID.fromString(userID)); if(userInfo==null) //this should normally never happer - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("There's no such a user on the system. You shouldn't be here"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); if(dmp==null || dmp.getId()==null) - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("DMP is null or dmp has null id"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); try { @@ -437,10 +430,10 @@ public class DMPs { DMP updateddmp = dMPDao.update(dmp); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(updateddmp)); + return ResponseEntity.status(HttpStatus.OK).body(updateddmp); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/DataRepositories.java b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java similarity index 55% rename from dmp-backend/src/main/java/rest/entities/DataRepositories.java rename to dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java index aeb790071..0446fe7df 100644 --- a/dmp-backend/src/main/java/rest/entities/DataRepositories.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -1,19 +1,15 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.DataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -23,39 +19,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import dao.entities.UserInfoDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import helpers.SerializerProvider; -import helpers.Transformers; -import proxy.config.exceptions.HugeResultSet; -import proxy.config.exceptions.NoURLFound; -import proxy.fetching.RemoteFetcher; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; @RestController @@ -80,16 +58,16 @@ public class DataRepositories { @RequestMapping(method = RequestMethod.GET, value = { "/external/datarepos" }, produces="application/json") - public @ResponseBody ResponseEntity listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>> listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = remoteFetcher.getRepositories(query); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(remoteRepos)); + return ResponseEntity.status(HttpStatus.OK).body(remoteRepos); } catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"reason\":\""+ex.getMessage()+"\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body("{\"reason\":\""+ex.getMessage()+"\"}"); //the ex.getMessage has the appropriate text description + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(null); //the ex.getMessage has the appropriate text description } } @@ -99,42 +77,42 @@ public class DataRepositories { // MANAGE DATAREPOSITORy(IES) @RequestMapping(method = RequestMethod.GET, value = { "/datarepos" }) - public @ResponseBody ResponseEntity listDataRepositories(){ + public @ResponseBody ResponseEntity> listDataRepositories(){ try { List allIDs = dataRepositoryDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/datarepos/{id}" }) - public @ResponseBody ResponseEntity getDataRepository(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getDataRepository(@PathVariable("id") String id) { try { DataRepository dataRepository = dataRepositoryDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(dataRepository)); + return ResponseEntity.status(HttpStatus.OK).body(dataRepository); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/datarepo/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity getAllDataRepositories(){ + public @ResponseBody ResponseEntity> getAllDataRepositories(){ try { List allDataRepositories = dataRepositoryDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allDataRepositories), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allDataRepositories); } catch(Exception ex) { ex.printStackTrace(); - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @@ -142,12 +120,12 @@ public class DataRepositories { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/datarepo/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setOrganisation(@RequestBody DataRepository dataRepository) { - DataRepository createdDataRepository = dataRepositoryDao.update(dataRepository); + public @ResponseBody ResponseEntity setOrganisation(@RequestBody DataRepository dataRepository) { try { - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdDataRepository)); + DataRepository createdDataRepository = dataRepositoryDao.update(dataRepository); + return ResponseEntity.status(HttpStatus.CREATED).body(createdDataRepository); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create data repository!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/DatasetProfileController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java similarity index 77% rename from dmp-backend/src/main/java/rest/entities/DatasetProfileController.java rename to dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java index 34c0bfc62..be1a65005 100644 --- a/dmp-backend/src/main/java/rest/entities/DatasetProfileController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -1,4 +1,4 @@ -package rest.entities; +package eu.eudat.controllers; import java.net.HttpURLConnection; import java.net.URL; @@ -7,8 +7,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import models.components.commons.datafield.AutoCompleteData; -import models.user.components.datasetprofile.Field; +import eu.eudat.models.components.commons.datafield.AutoCompleteData; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -22,16 +21,14 @@ import org.springframework.web.bind.annotation.RestController; import org.w3c.dom.Document; import org.w3c.dom.Element; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import helpers.SerializerProvider; -import managers.AdminManager; -import managers.UserManager; -import models.helpers.AutoCompleteLookupItem; -import models.properties.PropertiesModel; -import utilities.builders.XmlBuilder; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.managers.UserManager; +import eu.eudat.models.helpers.AutoCompleteLookupItem; +import eu.eudat.models.properties.PropertiesModel; +import eu.eudat.utilities.builders.XmlBuilder; @RestController @CrossOrigin @@ -45,8 +42,8 @@ public class DatasetProfileController { @RequestMapping(method = RequestMethod.GET, value = { "/datasetprofile/get/{id}" }, produces="application/json") public ResponseEntity getSingle(@PathVariable String id){ try { - entities.Dataset dataset = datasetDao.read(UUID.fromString(id)); - models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(dataset.getProfile()); + eu.eudat.entities.Dataset dataset = datasetDao.read(UUID.fromString(id)); + eu.eudat.models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(dataset.getProfile()); datasetprofile.setStatus(dataset.getStatus()); if(dataset.getProperties()!=null){ JSONObject jobject = new JSONObject(dataset.getProperties()); @@ -65,7 +62,7 @@ public class DatasetProfileController { @RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/save/{id}" }, consumes="application/json",produces="application/json") public ResponseEntity updateDataset(@PathVariable String id,@RequestBody PropertiesModel properties){ try { - entities.Dataset dataset = datasetDao.read(UUID.fromString(id)); + eu.eudat.entities.Dataset dataset = datasetDao.read(UUID.fromString(id)); Map values = new HashMap(); properties.toMap(values); JSONObject jobject = new JSONObject(values); @@ -83,10 +80,10 @@ public class DatasetProfileController { @RequestMapping(method = RequestMethod.POST, value = { "/search/autocomplete" }, consumes="application/json",produces="application/json") public ResponseEntity getDataForAutocomplete(@RequestBody AutoCompleteLookupItem lookupItem){ try { - entities.Dataset dataset = datasetDao.read(UUID.fromString(lookupItem.getProfileID())); + eu.eudat.entities.Dataset dataset = datasetDao.read(UUID.fromString(lookupItem.getProfileID())); Document viewStyleDoc = XmlBuilder.fromXml(dataset.getProfile().getViewstyle().getDefinition()); Element field = viewStyleDoc.getElementById(lookupItem.getFieldID()); - entities.xmlmodels.viewstyledefinition.Field modelfield = new entities.xmlmodels.viewstyledefinition.Field(); + eu.eudat.entities.xmlmodels.viewstyledefinition.Field modelfield = new eu.eudat.entities.xmlmodels.viewstyledefinition.Field(); modelfield.fromXml(field); AutoCompleteData data = new AutoCompleteData().fromData(modelfield.getData()); diff --git a/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java similarity index 64% rename from dmp-backend/src/main/java/rest/entities/DatasetProfiles.java rename to dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java index ec4b27265..18e71f508 100644 --- a/dmp-backend/src/main/java/rest/entities/DatasetProfiles.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java @@ -1,55 +1,37 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.Date; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.DatasetProfileRuleset; +import eu.eudat.entities.DatasetProfileViewstyle; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.DatasetProfileViewstyle; -import entities.Organisation; -import entities.Project; -import helpers.SerializerProvider; -import helpers.Transformers; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; @RestController @@ -73,39 +55,39 @@ public class DatasetProfiles { //FETCH BY DATASET PROFILE @RequestMapping(method = RequestMethod.GET, value = { "/datasetprofiles" }, produces="text/plain") - public @ResponseBody ResponseEntity listDMPs(){ + public @ResponseBody ResponseEntity> listDMPs(){ try { List allIDs = datasetProfileDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/datasetprofiles/{id}" }) - public @ResponseBody ResponseEntity getDatasetProfile(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getDatasetProfile(@PathVariable("id") String id) { try { DatasetProfile profile = datasetProfileDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(profile)); + return ResponseEntity.status(HttpStatus.OK).body(profile); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/datasetprofile/getAll" }) - public @ResponseBody ResponseEntity getAllDatasetProfiles(){ + public @ResponseBody ResponseEntity> getAllDatasetProfiles(){ try { List allDatasetProfiles = datasetProfileDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allDatasetProfiles), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body((allDatasetProfiles)); } catch(Exception ex) { ex.printStackTrace(); - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + return ResponseEntity.status(HttpStatus.OK).body(null); } } @@ -114,7 +96,7 @@ public class DatasetProfiles { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity createDatasetProfile(@RequestBody DatasetProfile datasetProfile) { + public @ResponseBody ResponseEntity createDatasetProfile(@RequestBody DatasetProfile datasetProfile) { datasetProfile.setCreated(new Date()); datasetProfile.setModified(new Date()); @@ -141,7 +123,7 @@ public class DatasetProfiles { datasetProfileDao.create(datasetProfile); else datasetProfileDao.update(datasetProfile); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(datasetProfile)); + return ResponseEntity.status(HttpStatus.CREATED).body(datasetProfile); } @@ -149,7 +131,7 @@ public class DatasetProfiles { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/update" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity updateDatasetProfile(@RequestBody DatasetProfile datasetProfile) { + public @ResponseBody ResponseEntity updateDatasetProfile(@RequestBody DatasetProfile datasetProfile) { DatasetProfileRuleset datasetprofileruleset = datasetProfile.getRuleset(); DatasetProfileViewstyle datasetprofileviewstyle = datasetProfile.getViewstyle(); @@ -171,14 +153,14 @@ public class DatasetProfiles { datasetProfile = datasetProfileDao.create(datasetProfile); else datasetProfile = datasetProfileDao.update(datasetProfile); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(datasetProfile)); + return ResponseEntity.status(HttpStatus.CREATED).body(datasetProfile); } @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/datasetprofile/delete" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity deleteDatasetProfile(@RequestBody DatasetProfile datasetProfile) { + public @ResponseBody ResponseEntity deleteDatasetProfile(@RequestBody DatasetProfile datasetProfile) { DatasetProfileRuleset datasetprofileruleset = datasetProfile.getRuleset(); DatasetProfileViewstyle datasetprofileviewstyle = datasetProfile.getViewstyle(); @@ -189,10 +171,10 @@ public class DatasetProfiles { if(datasetprofileviewstyle != null) datasetProfileViewstyleDao.delete(datasetprofileviewstyle); datasetProfileDao.delete(datasetProfile); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(datasetProfile)); + return ResponseEntity.status(HttpStatus.OK).body(datasetProfile); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not delete dataset profile!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/Datasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java similarity index 75% rename from dmp-backend/src/main/java/rest/entities/Datasets.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java index 423f96419..c3bb6508e 100644 --- a/dmp-backend/src/main/java/rest/entities/Datasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java @@ -1,10 +1,13 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.UUID; +import eu.eudat.entities.DMP; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.UserInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -18,30 +21,23 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import dao.entities.UserInfoDao; -import entities.DMP; -import entities.Dataset; -import entities.DatasetProfile; -import entities.UserInfo; -import helpers.SafeCleanAttribs; -import helpers.SerializerProvider; -import models.criteria.DataRepositoryCriteria; -import models.criteria.RegistryCriteria; -import models.criteria.ServiceCriteria; -import responses.RestResponse; -import utilities.builders.DomainModelConverter; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.dao.entities.UserInfoDao; +import eu.eudat.models.criteria.DataRepositoryCriteria; +import eu.eudat.models.criteria.RegistryCriteria; +import eu.eudat.models.criteria.ServiceCriteria; +import eu.eudat.responses.RestResponse; @RestController @@ -67,27 +63,27 @@ public class Datasets { @RequestMapping(method = RequestMethod.GET, value = { "/datasets" }) - public @ResponseBody ResponseEntity listDatasets(){ + public @ResponseBody ResponseEntity> listDatasets(){ try { List allIDs = datasetDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/datasets/{id}" }) - public @ResponseBody ResponseEntity getDataset(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getDataset(@PathVariable("id") String id) { try { Dataset ds = datasetDao.read(UUID.fromString(id)); - models.dataset.Dataset dataset = new models.dataset.Dataset(); + eu.eudat.models.dataset.Dataset dataset = new eu.eudat.models.dataset.Dataset(); dataset.fromDataModel(ds); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(dataset)); + return ResponseEntity.status(HttpStatus.OK).body(dataset); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @@ -96,62 +92,62 @@ public class Datasets { * This should be called on extreme cases. It's computationally intensive */ @RequestMapping(method = RequestMethod.GET, value = { "/dataset/getAll" }) - public @ResponseBody ResponseEntity getAllDatasets(){ + public @ResponseBody ResponseEntity> getAllDatasets(){ try { List allDatasets = datasetDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allDatasets), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allDatasets); } catch(Exception ex) { ex.printStackTrace(); - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.POST, value = { "/dataset/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity createDataset(@RequestBody models.dataset.Dataset modeldataset) { + public @ResponseBody ResponseEntity createDataset(@RequestBody eu.eudat.models.dataset.Dataset modeldataset) { 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"); + 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("There's no such a user on the system. You shouldn't be here"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); Dataset dataset = modeldataset.toDataModel(); if(dataset.getDataRepositories()!=null&&!dataset.getDataRepositories().isEmpty()){ - for(entities.DataRepository dataRepo : dataset.getDataRepositories()){ + for(eu.eudat.entities.DataRepository dataRepo : dataset.getDataRepositories()){ DataRepositoryCriteria criteria = new DataRepositoryCriteria(); criteria.setLike(dataRepo.getReference()); - List entries = this.dataRepositoryDao.listBy(criteria); + List entries = this.dataRepositoryDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())dataRepo.setId(entries.get(0).getId()); else dataRepo = this.dataRepositoryDao.create(dataRepo); } } if(dataset.getServices()!=null&&!dataset.getServices().isEmpty()){ - for(entities.Service service : dataset.getServices()){ + for(eu.eudat.entities.Service service : dataset.getServices()){ ServiceCriteria criteria = new ServiceCriteria(); criteria.setLike(service.getReference()); - List entries = this.serviceDao.listBy(criteria); + List entries = this.serviceDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())service.setId(entries.get(0).getId()); else service = this.serviceDao.create(service); } } if(dataset.getRegistries()!=null&&!dataset.getRegistries().isEmpty()){ - for(entities.Registry registry : dataset.getRegistries()){ + for(eu.eudat.entities.Registry registry : dataset.getRegistries()){ RegistryCriteria criteria = new RegistryCriteria(); criteria.setLike(registry.getReference()); - List entries = this.registryDao.listBy(criteria); + List entries = this.registryDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())registry.setId( entries.get(0).getId()); else registry = this.registryDao.create(registry); } @@ -167,46 +163,46 @@ public class Datasets { try { dataset = datasetDao.create(dataset); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(dataset)); + return ResponseEntity.status(HttpStatus.CREATED).body(dataset); } catch(Exception e) { e.printStackTrace(); - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Could not create or update Dataset! Reason: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.POST, value = { "/dataset/update" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity updateDataset(@RequestBody models.dataset.Dataset modeldataset) { + public @ResponseBody ResponseEntity updateDataset(@RequestBody eu.eudat.models.dataset.Dataset modeldataset) { Dataset dataset = modeldataset.toDataModel(); if(dataset.getDataRepositories()!=null&&!dataset.getDataRepositories().isEmpty()){ - for(entities.DataRepository dataRepo : dataset.getDataRepositories()){ + for(eu.eudat.entities.DataRepository dataRepo : dataset.getDataRepositories()){ DataRepositoryCriteria criteria = new DataRepositoryCriteria(); criteria.setLike(dataRepo.getReference()); - List entries = this.dataRepositoryDao.listBy(criteria); + List entries = this.dataRepositoryDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())dataRepo.setId(entries.get(0).getId()); else dataRepo = this.dataRepositoryDao.create(dataRepo); } } if(dataset.getServices()!=null&&!dataset.getServices().isEmpty()){ - for(entities.Service service : dataset.getServices()){ + for(eu.eudat.entities.Service service : dataset.getServices()){ ServiceCriteria criteria = new ServiceCriteria(); criteria.setLike(service.getReference()); - List entries = this.serviceDao.listBy(criteria); + List entries = this.serviceDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())service.setId(entries.get(0).getId()); else service = this.serviceDao.create(service); } } if(dataset.getRegistries()!=null&&!dataset.getRegistries().isEmpty()){ - for(entities.Registry registry : dataset.getRegistries()){ + for(eu.eudat.entities.Registry registry : dataset.getRegistries()){ RegistryCriteria criteria = new RegistryCriteria(); criteria.setLike(registry.getReference()); - List entries = this.registryDao.listBy(criteria); + List entries = this.registryDao.listBy(criteria); if(entries!=null&&!entries.isEmpty())registry.setId( entries.get(0).getId()); else registry = this.registryDao.create(registry); } @@ -231,7 +227,7 @@ public class Datasets { try { dataset = datasetDao.update(olddataset); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(dataset)); + return ResponseEntity.status(HttpStatus.CREATED).body(dataset); } catch(Exception ex) { ex.printStackTrace(); diff --git a/dmp-backend/src/main/java/rest/entities/DmpProfiles.java b/dmp-backend/src/main/java/eu/eudat/controllers/DmpProfiles.java similarity index 58% rename from dmp-backend/src/main/java/rest/entities/DmpProfiles.java rename to dmp-backend/src/main/java/eu/eudat/controllers/DmpProfiles.java index d9df89a27..c0b9912c3 100644 --- a/dmp-backend/src/main/java/rest/entities/DmpProfiles.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DmpProfiles.java @@ -1,56 +1,35 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.DMPProfile; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import entities.responses.IDLabelPair; -import helpers.SerializerProvider; -import helpers.Transformers; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.entities.responses.IDLabelPair; @RestController @@ -74,13 +53,13 @@ public class DmpProfiles { // MANAGE DMPPROFILE(S) @RequestMapping(method = RequestMethod.GET, value = { "/dmpprofiles" }) - public @ResponseBody ResponseEntity listDmpProfiles(){ + public @ResponseBody ResponseEntity> listDmpProfiles(){ try { List allIDs = dMPProfileDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -88,26 +67,26 @@ public class DmpProfiles { @RequestMapping(method = RequestMethod.GET, value = { "/dmpprofiles/{id}" }) - public @ResponseBody ResponseEntity getDmpProfile(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getDmpProfile(@PathVariable("id") String id) { try { DMPProfile dmpProfile = dMPProfileDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(dmpProfile)); + return ResponseEntity.status(HttpStatus.OK).body(dmpProfile); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/dmpprofile/listAllLabelIDs" }) - public @ResponseBody ResponseEntity listLabelIds(){ + public @ResponseBody ResponseEntity> listLabelIds(){ try { List allIDs = dMPProfileDao.listAllIDsLabels(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -116,22 +95,22 @@ public class DmpProfiles { public @ResponseBody ResponseEntity getAllDmpProfiles(){ try { List allDmpProfiles = dMPProfileDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allDmpProfiles), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allDmpProfiles); } catch(Exception ex) { - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/dmpprofile/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setDmpProfile(@RequestBody DMPProfile dmpprofile) { + public @ResponseBody ResponseEntity setDmpProfile(@RequestBody DMPProfile dmpprofile) { try { DMPProfile createdDMPProfile = dMPProfileDao.update(dmpprofile); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdDMPProfile)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdDMPProfile); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create DMP Profile!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/Organisations.java b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java similarity index 55% rename from dmp-backend/src/main/java/rest/entities/Organisations.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java index 0aaf847a8..baa942ab7 100644 --- a/dmp-backend/src/main/java/rest/entities/Organisations.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java @@ -1,18 +1,15 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.Organisation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -22,38 +19,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import helpers.SerializerProvider; -import helpers.Transformers; -import proxy.config.exceptions.HugeResultSet; -import proxy.config.exceptions.NoURLFound; -import proxy.fetching.RemoteFetcher; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; @RestController @@ -78,16 +58,16 @@ public class Organisations { @RequestMapping(method = RequestMethod.GET, value = { "/external/organisations" }, produces="application/json") - public @ResponseBody ResponseEntity listExternalOrganisations(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>> listExternalOrganisations(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = remoteFetcher.getOrganisations(query); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(remoteRepos)); + return ResponseEntity.status(HttpStatus.OK).body(remoteRepos); } catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"reason\":\""+ex.getMessage()+"\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body("{\"reason\":\""+ex.getMessage()+"\"}"); //the ex.getMessage has the appropriate text description + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(null); //the ex.getMessage has the appropriate text description } } @@ -95,25 +75,25 @@ public class Organisations { // MANAGE ORGANISATIONS(S) @RequestMapping(method = RequestMethod.GET, value = { "/organisations" }) - public @ResponseBody ResponseEntity listOrganisations(){ + public @ResponseBody ResponseEntity> listOrganisations(){ try { List allIDs = organisationDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/organisations/{id}" }) - public @ResponseBody ResponseEntity getOrganisations(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getOrganisations(@PathVariable("id") String id) { try { Organisation organisation = organisationDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(organisation)); + return ResponseEntity.status(HttpStatus.OK).body(organisation); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @@ -122,7 +102,7 @@ public class Organisations { public @ResponseBody ResponseEntity getAllOrganisations(){ try { List allOrganisations = organisationDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allOrganisations), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allOrganisations); } catch(Exception ex) { return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); @@ -132,26 +112,26 @@ public class Organisations { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/organisation/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setOrganisation(@RequestBody Organisation organisation) { + public @ResponseBody ResponseEntity setOrganisation(@RequestBody Organisation organisation) { try { Organisation createdOrganisation = organisationDao.update(organisation); - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdOrganisation)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdOrganisation); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create organisation!\"}"); + 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) { + public @ResponseBody ResponseEntity delete(@RequestBody Organisation organisation) { Organisation org = new Organisation(); org.setId(organisation.getId()); try { organisationDao.delete(org); - return ResponseEntity.status(HttpStatus.CREATED).body("{\"msg\":\"Deleted organisation!\"}"); + return ResponseEntity.status(HttpStatus.CREATED).body(null); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not delete organisation!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/Registries.java b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java similarity index 57% rename from dmp-backend/src/main/java/rest/entities/Registries.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Registries.java index f9033fe97..fec0231a8 100644 --- a/dmp-backend/src/main/java/rest/entities/Registries.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java @@ -1,17 +1,13 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.Registry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -21,39 +17,24 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import entities.responses.IDLabelPair; -import helpers.SerializerProvider; -import helpers.Transformers; -import proxy.config.exceptions.HugeResultSet; -import proxy.config.exceptions.NoURLFound; -import proxy.fetching.RemoteFetcher; -import responses.RestResponse; +import javax.transaction.Transactional; @RestController @@ -77,16 +58,16 @@ public class Registries { @RequestMapping(method = RequestMethod.GET, value = { "/external/registries" }, produces="application/json") - public @ResponseBody ResponseEntity listExternalRegistries(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>> listExternalRegistries(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = remoteFetcher.getRegistries(query); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(remoteRepos)); + return ResponseEntity.status(HttpStatus.OK).body(remoteRepos); } catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"reason\":\""+ex.getMessage()+"\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body("{\"reason\":\""+ex.getMessage()+"\"}"); //the ex.getMessage has the appropriate text description + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(null); //the ex.getMessage has the appropriate text description } } @@ -94,38 +75,38 @@ public class Registries { // MANAGE REGISTRY(IES) @RequestMapping(method = RequestMethod.GET, value = { "/registries" }) - public @ResponseBody ResponseEntity listRegistries(){ + public @ResponseBody ResponseEntity> listRegistries(){ try { List allIDs = registryDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/registries/{id}" }) - public @ResponseBody ResponseEntity getRegistries(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getRegistries(@PathVariable("id") String id) { try { Registry registry = registryDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(registry)); + return ResponseEntity.status(HttpStatus.OK).body(registry); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/registries/listAllLabelIDs" }) - public @ResponseBody ResponseEntity listLabelIds(){ + public @ResponseBody ResponseEntity> listLabelIds(){ try { List allIDs = registryDao.listAllIDsLabels(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @@ -135,7 +116,7 @@ public class Registries { try { List allRegistries = registryDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allRegistries), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allRegistries); } catch(Exception ex) { @@ -146,12 +127,12 @@ public class Registries { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/registry/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setRegistry(@RequestBody Registry registry) { + public @ResponseBody ResponseEntity setRegistry(@RequestBody Registry registry) { Registry createdRegistry = registryDao.update(registry); try { - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdRegistry)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdRegistry); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create registry!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/Researchers.java b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java similarity index 56% rename from dmp-backend/src/main/java/rest/entities/Researchers.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java index 5da78e842..432a8ef49 100644 --- a/dmp-backend/src/main/java/rest/entities/Researchers.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java @@ -1,18 +1,15 @@ -package rest.entities; +package eu.eudat.controllers; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.Researcher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -22,38 +19,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import helpers.SerializerProvider; -import helpers.Transformers; -import proxy.config.exceptions.HugeResultSet; -import proxy.config.exceptions.NoURLFound; -import proxy.fetching.RemoteFetcher; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; @RestController @@ -77,16 +57,16 @@ public class Researchers { @RequestMapping(method = RequestMethod.GET, value = { "/external/researchers" }, produces="application/json") - public @ResponseBody ResponseEntity listExternalResearchers(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>> listExternalResearchers(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = remoteFetcher.getResearchers(query); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(remoteRepos)); + return ResponseEntity.status(HttpStatus.OK).body(remoteRepos); } catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"reason\":\""+ex.getMessage()+"\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body("{\"reason\":\""+ex.getMessage()+"\"}"); //the ex.getMessage has the appropriate text description + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(null); //the ex.getMessage has the appropriate text description } } @@ -94,63 +74,63 @@ public class Researchers { // MANAGE RESEARCHER(S) @RequestMapping(method = RequestMethod.GET, value = { "/researchers" }) - public @ResponseBody ResponseEntity listResearchers(){ + public @ResponseBody ResponseEntity> listResearchers(){ try { List allIDs = researcherDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/researchers/{id}" }) - public @ResponseBody ResponseEntity getResearchers(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getResearchers(@PathVariable("id") String id) { try { Researcher researcher = researcherDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(researcher)); + return ResponseEntity.status(HttpStatus.OK).body(researcher); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + 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){ + public @ResponseBody ResponseEntity getResearcherByEmail(@RequestParam("email") String email){ try { Researcher researcher = researcherDao.getResearcherByEmail(email); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(researcher)); + return ResponseEntity.status(HttpStatus.OK).body(researcher); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/researcher/getAll" }, produces="application/json") - public @ResponseBody ResponseEntity getAllResearchers(){ + public @ResponseBody ResponseEntity> getAllResearchers(){ try { List allResearchers = researcherDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allResearchers), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allResearchers); } catch(Exception ex) { - return new ResponseEntity<>(null, HttpStatus.INTERNAL_SERVER_ERROR); + 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) { + public @ResponseBody ResponseEntity setResearcher(@RequestBody Researcher researcher) { Researcher createdResearcher = researcherDao.update(researcher); try { - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdResearcher)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdResearcher); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create researcher!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/rest/entities/Services.java b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java similarity index 58% rename from dmp-backend/src/main/java/rest/entities/Services.java rename to dmp-backend/src/main/java/eu/eudat/controllers/Services.java index f9538e1ea..1c868f00e 100644 --- a/dmp-backend/src/main/java/rest/entities/Services.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java @@ -1,19 +1,15 @@ -package rest.entities; +package eu.eudat.controllers; -import java.io.IOException; import java.util.List; import java.util.Map; import java.util.UUID; -import java.util.stream.Collectors; import javax.transaction.Transactional; -import org.apache.commons.lang3.SerializationUtils; +import eu.eudat.entities.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -23,38 +19,21 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import dao.entities.DMPDao; -import dao.entities.DMPProfileDao; -import dao.entities.DataRepositoryDao; -import dao.entities.DatasetDao; -import dao.entities.DatasetProfileDao; -import dao.entities.DatasetProfileRulesetDao; -import dao.entities.DatasetProfileViewstyleDao; -import dao.entities.OrganisationDao; -import dao.entities.ProjectDao; -import dao.entities.RegistryDao; -import dao.entities.ResearcherDao; -import dao.entities.ServiceDao; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; -import helpers.SerializerProvider; -import helpers.Transformers; -import proxy.config.exceptions.HugeResultSet; -import proxy.config.exceptions.NoURLFound; -import proxy.fetching.RemoteFetcher; -import responses.RestResponse; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DMPProfileDao; +import eu.eudat.dao.entities.DataRepositoryDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.DatasetProfileDao; +import eu.eudat.dao.entities.DatasetProfileRulesetDao; +import eu.eudat.dao.entities.DatasetProfileViewstyleDao; +import eu.eudat.dao.entities.OrganisationDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.dao.entities.RegistryDao; +import eu.eudat.dao.entities.ResearcherDao; +import eu.eudat.dao.entities.ServiceDao; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; +import eu.eudat.proxy.fetching.RemoteFetcher; @RestController @@ -78,16 +57,16 @@ public class Services { @RequestMapping(method = RequestMethod.GET, value = { "/external/services" }, produces="application/json") - public @ResponseBody ResponseEntity listExternalServices(@RequestParam(value="query", required=false) String query ){ + public @ResponseBody ResponseEntity>> listExternalServices(@RequestParam(value="query", required=false) String query ){ try { List> remoteRepos = remoteFetcher.getServices(query); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(remoteRepos)); + return ResponseEntity.status(HttpStatus.OK).body(remoteRepos); } catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"reason\":\""+ex.getMessage()+"\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body("{\"reason\":\""+ex.getMessage()+"\"}"); //the ex.getMessage has the appropriate text description + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY).body(null); //the ex.getMessage has the appropriate text description } } @@ -95,25 +74,25 @@ public class Services { // MANAGE SERVICE(S) @RequestMapping(method = RequestMethod.GET, value = { "/services" }) - public @ResponseBody ResponseEntity listServices(){ + public @ResponseBody ResponseEntity> listServices(){ try { List allIDs = serviceDao.listAllIDs(); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(allIDs)); + return ResponseEntity.status(HttpStatus.OK).body(allIDs); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Serialization issue: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } @RequestMapping(method = RequestMethod.GET, value = { "/services/{id}" }) - public @ResponseBody ResponseEntity getServices(@PathVariable("id") String id) { + public @ResponseBody ResponseEntity getServices(@PathVariable("id") String id) { try { Service service = serviceDao.read(UUID.fromString(id)); - return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(service)); + return ResponseEntity.status(HttpStatus.OK).body(service); } catch(Exception ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Erroneous input: "+ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); } } @@ -124,7 +103,7 @@ public class Services { try { List allServices = serviceDao.getAll(); - return new ResponseEntity(SerializerProvider.toJson(allServices), HttpStatus.OK); + return ResponseEntity.status(HttpStatus.OK).body(allServices); } catch(Exception ex) { @@ -135,13 +114,13 @@ public class Services { @Transactional @RequestMapping(method = RequestMethod.POST, value = { "/service/create" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity setService(@RequestBody Service service) { + public @ResponseBody ResponseEntity setService(@RequestBody Service service) { Service createdService = serviceDao.update(service); try { - return ResponseEntity.status(HttpStatus.CREATED).body(SerializerProvider.toJson(createdService)); + return ResponseEntity.status(HttpStatus.CREATED).body(createdService); } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("{\"msg\":\"Could not create service entity!\"}"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null); } } diff --git a/dmp-backend/src/main/java/dao/Dao.java b/dmp-backend/src/main/java/eu/eudat/dao/Dao.java similarity index 91% rename from dmp-backend/src/main/java/dao/Dao.java rename to dmp-backend/src/main/java/eu/eudat/dao/Dao.java index d497d52ab..45ab9e751 100644 --- a/dmp-backend/src/main/java/dao/Dao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/Dao.java @@ -1,17 +1,17 @@ -package dao; - -import java.io.Serializable; -import java.util.List; - -public interface Dao { - public T create(T t); - public T read(PK id); - public T update(T t); - public void delete(T t); - - public List getAll(); - public long count(); - - public T loadDetails(T t); - public boolean isLoaded(T t); -} +package eu.eudat.dao; + +import java.io.Serializable; +import java.util.List; + +public interface Dao { + public T create(T t); + public T read(PK id); + public T update(T t); + public void delete(T t); + + public List getAll(); + public long count(); + + public T loadDetails(T t); + public boolean isLoaded(T t); +} diff --git a/dmp-backend/src/main/java/dao/DaoFactory.java b/dmp-backend/src/main/java/eu/eudat/dao/DaoFactory.java similarity index 89% rename from dmp-backend/src/main/java/dao/DaoFactory.java rename to dmp-backend/src/main/java/eu/eudat/dao/DaoFactory.java index 90818044f..056dde755 100644 --- a/dmp-backend/src/main/java/dao/DaoFactory.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/DaoFactory.java @@ -1,10 +1,10 @@ -package dao; - -import java.util.Map; - - -public interface DaoFactory -{ - public Dao getDao(Class type) throws Exception; - public void overrideMappings(Map mappings) throws Exception; -} +package eu.eudat.dao; + +import java.util.Map; + + +public interface DaoFactory +{ + public Dao getDao(Class type) throws Exception; + public void overrideMappings(Map mappings) throws Exception; +} diff --git a/dmp-backend/src/main/java/dao/DaoI.java b/dmp-backend/src/main/java/eu/eudat/dao/DaoI.java similarity index 93% rename from dmp-backend/src/main/java/dao/DaoI.java rename to dmp-backend/src/main/java/eu/eudat/dao/DaoI.java index d47fbf547..a73023e79 100644 --- a/dmp-backend/src/main/java/dao/DaoI.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/DaoI.java @@ -1,4 +1,4 @@ -package dao; +package eu.eudat.dao; import java.io.Serializable; import java.util.List; diff --git a/dmp-backend/src/main/java/dao/JpaDao.java b/dmp-backend/src/main/java/eu/eudat/dao/JpaDao.java similarity index 91% rename from dmp-backend/src/main/java/dao/JpaDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/JpaDao.java index 38ac604e3..5e8f81dab 100644 --- a/dmp-backend/src/main/java/dao/JpaDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/JpaDao.java @@ -1,4 +1,4 @@ -package dao; +package eu.eudat.dao; import java.io.Serializable; @@ -10,8 +10,8 @@ import javax.annotation.PostConstruct; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.PersistenceUnitUtil; +import javax.transaction.Transactional; -import org.springframework.transaction.annotation.Transactional; public abstract class JpaDao implements Dao { protected Class entityClass; @@ -45,7 +45,7 @@ public abstract class JpaDao implements Dao { return t; } - @Transactional(readOnly = true) + @Transactional() public T read(PK id) { return entityManager.find(entityClass, id); } diff --git a/dmp-backend/src/main/java/dao/JpaDaoFactory.java b/dmp-backend/src/main/java/eu/eudat/dao/JpaDaoFactory.java similarity index 61% rename from dmp-backend/src/main/java/dao/JpaDaoFactory.java rename to dmp-backend/src/main/java/eu/eudat/dao/JpaDaoFactory.java index 053ed84c1..ec7cc24b2 100644 --- a/dmp-backend/src/main/java/dao/JpaDaoFactory.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/JpaDaoFactory.java @@ -1,84 +1,84 @@ -package dao; - -import java.util.HashMap; -import java.util.Map; - -import dao.entities.DMPDaoImpl; -import dao.entities.DMPProfileDaoImpl; -import dao.entities.DMPResearcherDaoImpl; -import dao.entities.DataRepositoryDaoImpl; -import dao.entities.DatasetDaoImpl; -import dao.entities.DatasetProfileDaoImpl; -import dao.entities.DatasetProfileRulesetDaoImpl; -import dao.entities.DatasetProfileViewstyleDaoImpl; -import dao.entities.DatasetRegistryDaoImpl; -import dao.entities.DatasetServiceDaoImpl; -import dao.entities.OrganisationDaoImpl; -import dao.entities.ProjectDaoImpl; -import dao.entities.RegistryDaoImpl; -import dao.entities.ResearcherDaoImpl; -import dao.entities.ServiceDaoImpl; -import entities.DMP; -import entities.DMPProfile; -import entities.DMPResearcher; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.DatasetProfileViewstyle; -import entities.DatasetRegistry; -import entities.DatasetService; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; - - -/** - * A DAO factory for non-managed environments - */ -public class JpaDaoFactory implements DaoFactory -{ - private static String persistenceUnit = null; - private static Map daoImpls = null; - - public static void setPersistenceContext(String persistenceUnit) - { - JpaDaoFactory.persistenceUnit = persistenceUnit; - } - - private static void populateMappings() - { - daoImpls = new HashMap(); - daoImpls.put(Organisation.class.getName(), OrganisationDaoImpl.class.getName()); - daoImpls.put(DataRepository.class.getName(), (DataRepositoryDaoImpl.class.getName())); - daoImpls.put(Dataset.class.getName(), (DatasetDaoImpl.class.getName())); - daoImpls.put(DatasetProfile.class.getName(), (DatasetProfileDaoImpl.class.getName())); - daoImpls.put(DatasetProfileRuleset.class.getName(), (DatasetProfileRulesetDaoImpl.class.getName())); - daoImpls.put(DatasetProfileViewstyle.class.getName(), (DatasetProfileViewstyleDaoImpl.class.getName())); - daoImpls.put(DatasetRegistry.class.getName(), (DatasetRegistryDaoImpl.class.getName())); - daoImpls.put(DatasetService.class.getName(), (DatasetServiceDaoImpl.class.getName())); - daoImpls.put(DMP.class.getName(), (DMPDaoImpl.class.getName())); - daoImpls.put(DMPProfile.class.getName(), (DMPProfileDaoImpl.class.getName())); - daoImpls.put(DMPResearcher.class.getName(), (DMPResearcherDaoImpl.class.getName())); - daoImpls.put(Organisation.class.getName(), (OrganisationDaoImpl.class.getName())); - daoImpls.put(Project.class.getName(), (ProjectDaoImpl.class.getName())); - daoImpls.put(Registry.class.getName(), (RegistryDaoImpl.class.getName())); - daoImpls.put(Researcher.class.getName(), (ResearcherDaoImpl.class.getName())); - daoImpls.put(Service.class.getName(), (ServiceDaoImpl.class.getName())); - } - - @SuppressWarnings("rawtypes") - public Dao getDao(Class type) throws Exception - { - if(daoImpls == null) populateMappings(); - return (Dao)Class.forName(daoImpls.get(type.getName())).newInstance(); - } - - public void overrideMappings(Map mappings) - { - populateMappings(); - daoImpls.putAll(mappings); - } -} +package eu.eudat.dao; + +import java.util.HashMap; +import java.util.Map; + +import eu.eudat.dao.entities.DMPDaoImpl; +import eu.eudat.dao.entities.DMPProfileDaoImpl; +import eu.eudat.dao.entities.DMPResearcherDaoImpl; +import eu.eudat.dao.entities.DataRepositoryDaoImpl; +import eu.eudat.dao.entities.DatasetDaoImpl; +import eu.eudat.dao.entities.DatasetProfileDaoImpl; +import eu.eudat.dao.entities.DatasetProfileRulesetDaoImpl; +import eu.eudat.dao.entities.DatasetProfileViewstyleDaoImpl; +import eu.eudat.dao.entities.DatasetRegistryDaoImpl; +import eu.eudat.dao.entities.DatasetServiceDaoImpl; +import eu.eudat.dao.entities.OrganisationDaoImpl; +import eu.eudat.dao.entities.ProjectDaoImpl; +import eu.eudat.dao.entities.RegistryDaoImpl; +import eu.eudat.dao.entities.ResearcherDaoImpl; +import eu.eudat.dao.entities.ServiceDaoImpl; +import eu.eudat.entities.DMP; +import eu.eudat.entities.DMPProfile; +import eu.eudat.entities.DMPResearcher; +import eu.eudat.entities.DataRepository; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.DatasetProfileRuleset; +import eu.eudat.entities.DatasetProfileViewstyle; +import eu.eudat.entities.DatasetRegistry; +import eu.eudat.entities.DatasetService; +import eu.eudat.entities.Organisation; +import eu.eudat.entities.Project; +import eu.eudat.entities.Registry; +import eu.eudat.entities.Researcher; +import eu.eudat.entities.Service; + + +/** + * A DAO factory for non-managed environments + */ +public class JpaDaoFactory implements DaoFactory +{ + private static String persistenceUnit = null; + private static Map daoImpls = null; + + public static void setPersistenceContext(String persistenceUnit) + { + JpaDaoFactory.persistenceUnit = persistenceUnit; + } + + private static void populateMappings() + { + daoImpls = new HashMap(); + daoImpls.put(Organisation.class.getName(), OrganisationDaoImpl.class.getName()); + daoImpls.put(DataRepository.class.getName(), (DataRepositoryDaoImpl.class.getName())); + daoImpls.put(Dataset.class.getName(), (DatasetDaoImpl.class.getName())); + daoImpls.put(DatasetProfile.class.getName(), (DatasetProfileDaoImpl.class.getName())); + daoImpls.put(DatasetProfileRuleset.class.getName(), (DatasetProfileRulesetDaoImpl.class.getName())); + daoImpls.put(DatasetProfileViewstyle.class.getName(), (DatasetProfileViewstyleDaoImpl.class.getName())); + daoImpls.put(DatasetRegistry.class.getName(), (DatasetRegistryDaoImpl.class.getName())); + daoImpls.put(DatasetService.class.getName(), (DatasetServiceDaoImpl.class.getName())); + daoImpls.put(DMP.class.getName(), (DMPDaoImpl.class.getName())); + daoImpls.put(DMPProfile.class.getName(), (DMPProfileDaoImpl.class.getName())); + daoImpls.put(DMPResearcher.class.getName(), (DMPResearcherDaoImpl.class.getName())); + daoImpls.put(Organisation.class.getName(), (OrganisationDaoImpl.class.getName())); + daoImpls.put(Project.class.getName(), (ProjectDaoImpl.class.getName())); + daoImpls.put(Registry.class.getName(), (RegistryDaoImpl.class.getName())); + daoImpls.put(Researcher.class.getName(), (ResearcherDaoImpl.class.getName())); + daoImpls.put(Service.class.getName(), (ServiceDaoImpl.class.getName())); + } + + @SuppressWarnings("rawtypes") + public Dao getDao(Class type) throws Exception + { + if(daoImpls == null) populateMappings(); + return (Dao)Class.forName(daoImpls.get(type.getName())).newInstance(); + } + + public void overrideMappings(Map mappings) + { + populateMappings(); + daoImpls.putAll(mappings); + } +} diff --git a/dmp-backend/src/main/java/dao/SpringJpaDaoFactory.java b/dmp-backend/src/main/java/eu/eudat/dao/SpringJpaDaoFactory.java similarity index 73% rename from dmp-backend/src/main/java/dao/SpringJpaDaoFactory.java rename to dmp-backend/src/main/java/eu/eudat/dao/SpringJpaDaoFactory.java index 52465141e..9e7aad7ba 100644 --- a/dmp-backend/src/main/java/dao/SpringJpaDaoFactory.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/SpringJpaDaoFactory.java @@ -1,120 +1,120 @@ -package dao; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; - -import dao.entities.DMPDaoImpl; -import dao.entities.DMPProfileDaoImpl; -import dao.entities.DMPResearcherDaoImpl; -import dao.entities.DataRepositoryDaoImpl; -import dao.entities.DatasetDaoImpl; -import dao.entities.DatasetProfileDaoImpl; -import dao.entities.DatasetProfileRulesetDaoImpl; -import dao.entities.DatasetProfileViewstyleDaoImpl; -import dao.entities.DatasetRegistryDaoImpl; -import dao.entities.DatasetServiceDaoImpl; -import dao.entities.OrganisationDaoImpl; -import dao.entities.ProjectDaoImpl; -import dao.entities.RegistryDaoImpl; -import dao.entities.ResearcherDaoImpl; -import dao.entities.ServiceDaoImpl; -import entities.DMP; -import entities.DMPProfile; -import entities.DMPResearcher; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.DatasetProfileViewstyle; -import entities.DatasetRegistry; -import entities.DatasetService; -import entities.Organisation; -import entities.Project; -import entities.Registry; -import entities.Researcher; -import entities.Service; - - -/** - * A DAO factory for Spring managed environment - */ -public class SpringJpaDaoFactory implements DaoFactory -{ - public static class SpringApplicationContext implements ApplicationContextAware { - - private static ApplicationContext CONTEXT; - - /** - * This method is called from within the ApplicationContext once it is - * done starting up, it will stick a reference to itself into this bean. - * @param context a reference to the ApplicationContext. - */ - public void setApplicationContext(ApplicationContext context) throws BeansException { - CONTEXT = context; - } - - /** - * This is about the same as context.getBean("beanName"), except it has its - * own static handle to the Spring context, so calling this method statically - * will give access to the beans by name in the Spring application context. - * As in the context.getBean("beanName") call, the caller must cast to the - * appropriate target class. If the bean does not exist, then a Runtime error - * will be thrown. - * @param beanName the name of the bean to get. - * @return an Object reference to the named bean. - */ - public static Object getBean(String beanName) { - return CONTEXT.getBean(beanName); - } - } - - private static String persistenceUnit = null; - private static Map daoImpls = null; - - public static void setPersistenceContext(String persistenceUnit) - { - SpringJpaDaoFactory.persistenceUnit = persistenceUnit; - } - - private static String getBeanName(String className) - { - return Character.toLowerCase(className.charAt(0)) + - (className.length() > 1 ? className.substring(1) : ""); - } - private static void populateMappings() - { - daoImpls = new HashMap(); - daoImpls.put(DataRepository.class.getName(), getBeanName(DataRepositoryDaoImpl.class.getSimpleName())); - daoImpls.put(Dataset.class.getName(), getBeanName(DatasetDaoImpl.class.getSimpleName())); - daoImpls.put(DatasetProfile.class.getName(), getBeanName(DatasetProfileDaoImpl.class.getSimpleName())); - daoImpls.put(DatasetProfileRuleset.class.getName(), getBeanName(DatasetProfileRulesetDaoImpl.class.getSimpleName())); - daoImpls.put(DatasetProfileViewstyle.class.getName(), getBeanName(DatasetProfileViewstyleDaoImpl.class.getSimpleName())); - daoImpls.put(DatasetRegistry.class.getName(), getBeanName(DatasetRegistryDaoImpl.class.getSimpleName())); - daoImpls.put(DatasetService.class.getName(), getBeanName(DatasetServiceDaoImpl.class.getSimpleName())); - daoImpls.put(DMP.class.getName(), getBeanName(DMPDaoImpl.class.getSimpleName())); - daoImpls.put(DMPProfile.class.getName(), getBeanName(DMPProfileDaoImpl.class.getSimpleName())); - daoImpls.put(DMPResearcher.class.getName(), getBeanName(DMPResearcherDaoImpl.class.getSimpleName())); - daoImpls.put(Organisation.class.getName(), getBeanName(OrganisationDaoImpl.class.getSimpleName())); - daoImpls.put(Project.class.getName(), getBeanName(ProjectDaoImpl.class.getSimpleName())); - daoImpls.put(Registry.class.getName(), getBeanName(RegistryDaoImpl.class.getSimpleName())); - daoImpls.put(Researcher.class.getName(), getBeanName(ResearcherDaoImpl.class.getSimpleName())); - daoImpls.put(Service.class.getName(), getBeanName(ServiceDaoImpl.class.getSimpleName())); - } - - @SuppressWarnings("rawtypes") - public Dao getDao(Class type) throws Exception - { - if(daoImpls == null) populateMappings(); - return (Dao)SpringApplicationContext.getBean(daoImpls.get(type.getName())); - } - - public void overrideMappings(Map mappings) - { - populateMappings(); - daoImpls.putAll(mappings); - } -} +package eu.eudat.dao; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; + +import eu.eudat.dao.entities.DMPDaoImpl; +import eu.eudat.dao.entities.DMPProfileDaoImpl; +import eu.eudat.dao.entities.DMPResearcherDaoImpl; +import eu.eudat.dao.entities.DataRepositoryDaoImpl; +import eu.eudat.dao.entities.DatasetDaoImpl; +import eu.eudat.dao.entities.DatasetProfileDaoImpl; +import eu.eudat.dao.entities.DatasetProfileRulesetDaoImpl; +import eu.eudat.dao.entities.DatasetProfileViewstyleDaoImpl; +import eu.eudat.dao.entities.DatasetRegistryDaoImpl; +import eu.eudat.dao.entities.DatasetServiceDaoImpl; +import eu.eudat.dao.entities.OrganisationDaoImpl; +import eu.eudat.dao.entities.ProjectDaoImpl; +import eu.eudat.dao.entities.RegistryDaoImpl; +import eu.eudat.dao.entities.ResearcherDaoImpl; +import eu.eudat.dao.entities.ServiceDaoImpl; +import eu.eudat.entities.DMP; +import eu.eudat.entities.DMPProfile; +import eu.eudat.entities.DMPResearcher; +import eu.eudat.entities.DataRepository; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.DatasetProfileRuleset; +import eu.eudat.entities.DatasetProfileViewstyle; +import eu.eudat.entities.DatasetRegistry; +import eu.eudat.entities.DatasetService; +import eu.eudat.entities.Organisation; +import eu.eudat.entities.Project; +import eu.eudat.entities.Registry; +import eu.eudat.entities.Researcher; +import eu.eudat.entities.Service; + + +/** + * A DAO factory for Spring managed environment + */ +public class SpringJpaDaoFactory implements DaoFactory +{ + public static class SpringApplicationContext implements ApplicationContextAware { + + private static ApplicationContext CONTEXT; + + /** + * This method is called from within the ApplicationContext once it is + * done starting up, it will stick a reference to itself into this bean. + * @param context a reference to the ApplicationContext. + */ + public void setApplicationContext(ApplicationContext context) throws BeansException { + CONTEXT = context; + } + + /** + * This is about the same as context.getBean("beanName"), except it has its + * own static handle to the Spring context, so calling this method statically + * will give access to the beans by name in the Spring application context. + * As in the context.getBean("beanName") call, the caller must cast to the + * appropriate target class. If the bean does not exist, then a Runtime error + * will be thrown. + * @param beanName the name of the bean to get. + * @return an Object reference to the named bean. + */ + public static Object getBean(String beanName) { + return CONTEXT.getBean(beanName); + } + } + + private static String persistenceUnit = null; + private static Map daoImpls = null; + + public static void setPersistenceContext(String persistenceUnit) + { + SpringJpaDaoFactory.persistenceUnit = persistenceUnit; + } + + private static String getBeanName(String className) + { + return Character.toLowerCase(className.charAt(0)) + + (className.length() > 1 ? className.substring(1) : ""); + } + private static void populateMappings() + { + daoImpls = new HashMap(); + daoImpls.put(DataRepository.class.getName(), getBeanName(DataRepositoryDaoImpl.class.getSimpleName())); + daoImpls.put(Dataset.class.getName(), getBeanName(DatasetDaoImpl.class.getSimpleName())); + daoImpls.put(DatasetProfile.class.getName(), getBeanName(DatasetProfileDaoImpl.class.getSimpleName())); + daoImpls.put(DatasetProfileRuleset.class.getName(), getBeanName(DatasetProfileRulesetDaoImpl.class.getSimpleName())); + daoImpls.put(DatasetProfileViewstyle.class.getName(), getBeanName(DatasetProfileViewstyleDaoImpl.class.getSimpleName())); + daoImpls.put(DatasetRegistry.class.getName(), getBeanName(DatasetRegistryDaoImpl.class.getSimpleName())); + daoImpls.put(DatasetService.class.getName(), getBeanName(DatasetServiceDaoImpl.class.getSimpleName())); + daoImpls.put(DMP.class.getName(), getBeanName(DMPDaoImpl.class.getSimpleName())); + daoImpls.put(DMPProfile.class.getName(), getBeanName(DMPProfileDaoImpl.class.getSimpleName())); + daoImpls.put(DMPResearcher.class.getName(), getBeanName(DMPResearcherDaoImpl.class.getSimpleName())); + daoImpls.put(Organisation.class.getName(), getBeanName(OrganisationDaoImpl.class.getSimpleName())); + daoImpls.put(Project.class.getName(), getBeanName(ProjectDaoImpl.class.getSimpleName())); + daoImpls.put(Registry.class.getName(), getBeanName(RegistryDaoImpl.class.getSimpleName())); + daoImpls.put(Researcher.class.getName(), getBeanName(ResearcherDaoImpl.class.getSimpleName())); + daoImpls.put(Service.class.getName(), getBeanName(ServiceDaoImpl.class.getSimpleName())); + } + + @SuppressWarnings("rawtypes") + public Dao getDao(Class type) throws Exception + { + if(daoImpls == null) populateMappings(); + return (Dao)SpringApplicationContext.getBean(daoImpls.get(type.getName())); + } + + public void overrideMappings(Map mappings) + { + populateMappings(); + daoImpls.putAll(mappings); + } +} diff --git a/dmp-backend/src/main/java/dao/entities/DMPDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java similarity index 56% rename from dmp-backend/src/main/java/dao/entities/DMPDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java index af96ac8e1..da009b8e0 100644 --- a/dmp-backend/src/main/java/dao/entities/DMPDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java @@ -1,15 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.DMP; -import entities.Organisation; -import entities.Project; -import entities.responses.IDLabelPair; -import models.dmp.DataManagementPlanTableRequest; -import models.project.ProjectTableRequest; +import eu.eudat.dao.Dao; +import eu.eudat.entities.DMP; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.dmp.DataManagementPlanTableRequest; +import org.springframework.stereotype.Service; public interface DMPDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java similarity index 85% rename from dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java index 8be6522b4..54041aede 100644 --- a/dmp-backend/src/main/java/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.Map; @@ -12,14 +12,13 @@ import javax.persistence.criteria.Root; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.DMP; -import entities.Project; -import entities.UserInfo; -import entities.responses.IDLabelPair; -import models.dmp.DataManagementPlanTableRequest; -import models.project.ProjectTableRequest; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DMP; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.dmp.DataManagementPlanTableRequest; +import org.springframework.stereotype.Component; +@Component("dMPDao") public class DMPDaoImpl extends JpaDao implements DMPDao { public DMP loadDetails(DMP t) { @@ -55,7 +54,7 @@ public class DMPDaoImpl extends JpaDao implements DMPDao { try { return typedQuery.getResultList(); } - catch(Exception ex) { //no need to distinguish between exceptions for the moment + catch(Exception ex) { //no need to distinguish between eu.eudat.exceptions for the moment ex.printStackTrace(); return null; } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDao.java new file mode 100644 index 000000000..78e6c8fe0 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDao.java @@ -0,0 +1,17 @@ +package eu.eudat.dao.entities; + +import java.util.List; +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DMPProfile; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Service; + +public interface DMPProfileDao extends Dao { + + List listAllIDs(); + + List listAllIDsLabels(); + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DMPProfileDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDaoImpl.java similarity index 81% rename from dmp-backend/src/main/java/dao/entities/DMPProfileDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDaoImpl.java index 0ef29231b..0a1c861df 100644 --- a/dmp-backend/src/main/java/dao/entities/DMPProfileDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPProfileDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -8,10 +8,12 @@ import javax.persistence.TypedQuery; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.DMPProfile; -import entities.responses.IDLabelPair; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DMPProfile; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Component; +@Component("dMPProfileDao") public class DMPProfileDaoImpl extends JpaDao implements DMPProfileDao { public DMPProfile loadDetails(DMPProfile t) { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDao.java new file mode 100644 index 000000000..f48b50b1a --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDao.java @@ -0,0 +1,15 @@ +package eu.eudat.dao.entities; + +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DMPResearcher; +import eu.eudat.entities.Researcher; +import org.springframework.stereotype.Service; + +public interface DMPResearcherDao extends Dao { + + + Researcher getResearcherByEmail(String email); + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDaoImpl.java similarity index 76% rename from dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDaoImpl.java index 1c420680b..787af8654 100644 --- a/dmp-backend/src/main/java/dao/entities/DMPResearcherDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPResearcherDaoImpl.java @@ -1,15 +1,15 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.UUID; import javax.persistence.TypedQuery; -import org.hibernate.NonUniqueResultException; - -import dao.JpaDao; -import entities.DMPResearcher; -import entities.Researcher; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DMPResearcher; +import eu.eudat.entities.Researcher; +import org.springframework.stereotype.Component; +@Component("dMPResearcherDao") public class DMPResearcherDaoImpl extends JpaDao implements DMPResearcherDao { public DMPResearcher loadDetails(DMPResearcher t) { diff --git a/dmp-backend/src/main/java/dao/entities/DataRepositoryDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java similarity index 52% rename from dmp-backend/src/main/java/dao/entities/DataRepositoryDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java index 39be39779..84b2289a9 100644 --- a/dmp-backend/src/main/java/dao/entities/DataRepositoryDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java @@ -1,12 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.DataRepository; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.Dao; +import eu.eudat.entities.DataRepository; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Service; public interface DataRepositoryDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java similarity index 84% rename from dmp-backend/src/main/java/dao/entities/DataRepositoryDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java index d79997436..2e8ecbd8e 100644 --- a/dmp-backend/src/main/java/dao/entities/DataRepositoryDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -11,11 +11,14 @@ import javax.persistence.criteria.Root; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.DataRepository; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DataRepository; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; +@Component("dataRepositoryDao") public class DataRepositoryDaoImpl extends JpaDao implements DataRepositoryDao { public DataRepository loadDetails(DataRepository t) { diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java similarity index 55% rename from dmp-backend/src/main/java/dao/entities/DatasetDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java index 93830f791..3abc2e9f1 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java @@ -1,11 +1,12 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Dataset; -import entities.responses.IDLabelPair; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Service; public interface DatasetDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java similarity index 86% rename from dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java index b4a04cb99..667c189d7 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.Set; @@ -7,12 +7,13 @@ import java.util.stream.Collectors; import javax.persistence.Query; import javax.persistence.TypedQuery; -import javax.transaction.Transactional; -import dao.JpaDao; -import entities.Dataset; -import entities.responses.IDLabelPair; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Component; +@Component("datasetDao") public class DatasetDaoImpl extends JpaDao implements DatasetDao { public Dataset loadDetails(Dataset t) { diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java similarity index 50% rename from dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java index 10e5c6e6e..b8e0b1fe3 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java @@ -1,11 +1,12 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.DatasetProfile; -import entities.responses.IDLabelPair; +import eu.eudat.dao.Dao; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Service; public interface DatasetProfileDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java similarity index 81% rename from dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java index 303a8db91..15c923360 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -7,10 +7,12 @@ import java.util.stream.Collectors; import javax.persistence.Query; import javax.persistence.TypedQuery; -import dao.JpaDao; -import entities.DatasetProfile; -import entities.responses.IDLabelPair; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Component; +@Component("datasetProfileDao") public class DatasetProfileDaoImpl extends JpaDao implements DatasetProfileDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDao.java new file mode 100644 index 000000000..2f0695ae0 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDao.java @@ -0,0 +1,11 @@ +package eu.eudat.dao.entities; + +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DatasetProfileRuleset; +import org.springframework.stereotype.Service; + +public interface DatasetProfileRulesetDao extends Dao { + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDaoImpl.java similarity index 59% rename from dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDaoImpl.java index 59c4ebeb0..b0f8c7600 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileRulesetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileRulesetDaoImpl.java @@ -1,11 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.UUID; -import dao.JpaDao; -import entities.DatasetProfileRuleset; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DatasetProfileRuleset; +import org.springframework.stereotype.Component; +@Component("datasetProfileRulesetDao") public class DatasetProfileRulesetDaoImpl extends JpaDao implements DatasetProfileRulesetDao { public DatasetProfileRuleset loadDetails(DatasetProfileRuleset t) { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDao.java new file mode 100644 index 000000000..40617e09e --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDao.java @@ -0,0 +1,11 @@ +package eu.eudat.dao.entities; + +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DatasetProfileViewstyle; +import org.springframework.stereotype.Service; + +public interface DatasetProfileViewstyleDao extends Dao { + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDaoImpl.java similarity index 59% rename from dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDaoImpl.java index 3467ae403..f2fab2efc 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetProfileViewstyleDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileViewstyleDaoImpl.java @@ -1,11 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.UUID; -import dao.JpaDao; -import entities.DatasetProfileViewstyle; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DatasetProfileViewstyle; +import org.springframework.stereotype.Component; +@Component("datasetProfileViewstyleDao") public class DatasetProfileViewstyleDaoImpl extends JpaDao implements DatasetProfileViewstyleDao { public DatasetProfileViewstyle loadDetails(DatasetProfileViewstyle t) { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDao.java new file mode 100644 index 000000000..b9099c414 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDao.java @@ -0,0 +1,11 @@ +package eu.eudat.dao.entities; + +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DatasetRegistry; +import org.springframework.stereotype.Service; + +public interface DatasetRegistryDao extends Dao { + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDaoImpl.java similarity index 57% rename from dmp-backend/src/main/java/dao/entities/DatasetRegistryDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDaoImpl.java index b35e02eb7..29337fa45 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetRegistryDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetRegistryDaoImpl.java @@ -1,11 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.UUID; -import dao.JpaDao; -import entities.DatasetRegistry; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DatasetRegistry; +import org.springframework.stereotype.Component; +@Component("datasetRegistryDao") public class DatasetRegistryDaoImpl extends JpaDao implements DatasetRegistryDao { public DatasetRegistry loadDetails(DatasetRegistry t) { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDao.java new file mode 100644 index 000000000..fac40ee7e --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDao.java @@ -0,0 +1,11 @@ +package eu.eudat.dao.entities; + +import java.util.UUID; + +import eu.eudat.dao.Dao; +import eu.eudat.entities.DatasetService; +import org.springframework.stereotype.Service; + +public interface DatasetServiceDao extends Dao { + +} \ No newline at end of file diff --git a/dmp-backend/src/main/java/dao/entities/DatasetServiceDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDaoImpl.java similarity index 57% rename from dmp-backend/src/main/java/dao/entities/DatasetServiceDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDaoImpl.java index 9c70a737c..33cdec30f 100644 --- a/dmp-backend/src/main/java/dao/entities/DatasetServiceDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetServiceDaoImpl.java @@ -1,11 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.UUID; -import dao.JpaDao; -import entities.DatasetService; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DatasetService; +import org.springframework.stereotype.Component; +@Component("datasetServiceDao") public class DatasetServiceDaoImpl extends JpaDao implements DatasetServiceDao { public DatasetService loadDetails(DatasetService t) { diff --git a/dmp-backend/src/main/java/dao/entities/OrganisationDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java similarity index 52% rename from dmp-backend/src/main/java/dao/entities/OrganisationDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java index 4092bdd51..3ff8c04d7 100644 --- a/dmp-backend/src/main/java/dao/entities/OrganisationDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java @@ -1,13 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Organisation; -import entities.Registry; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Organisation; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Service; public interface OrganisationDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/OrganisationDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java similarity index 86% rename from dmp-backend/src/main/java/dao/entities/OrganisationDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java index 2b2e8438b..271f40210 100644 --- a/dmp-backend/src/main/java/dao/entities/OrganisationDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -9,14 +9,15 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import entities.Registry; -import models.criteria.Criteria; +import eu.eudat.models.criteria.Criteria; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.Organisation; -import entities.responses.IDLabelPair; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Organisation; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Component; +@Component("organisationDao") public class OrganisationDaoImpl extends JpaDao implements OrganisationDao { public Organisation loadDetails(Organisation t) { diff --git a/dmp-backend/src/main/java/dao/entities/ProjectDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java similarity index 58% rename from dmp-backend/src/main/java/dao/entities/ProjectDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java index 846ee5e2b..23143beb4 100644 --- a/dmp-backend/src/main/java/dao/entities/ProjectDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java @@ -1,12 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Project; -import entities.responses.IDLabelPair; -import models.project.ProjectTableRequest; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Project; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.project.ProjectTableRequest; +import org.springframework.stereotype.Service; public interface ProjectDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/ProjectDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java similarity index 85% rename from dmp-backend/src/main/java/dao/entities/ProjectDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java index 321425e0f..7f2ebf436 100644 --- a/dmp-backend/src/main/java/dao/entities/ProjectDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -11,13 +11,13 @@ import javax.persistence.criteria.Root; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.DMP; -import entities.Project; -import entities.Registry; -import entities.responses.IDLabelPair; -import models.project.ProjectTableRequest; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Project; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.project.ProjectTableRequest; +import org.springframework.stereotype.Component; +@Component("projectDao") public class ProjectDaoImpl extends JpaDao implements ProjectDao { public Project loadDetails(Project t) { @@ -53,7 +53,7 @@ public class ProjectDaoImpl extends JpaDao implements ProjectDao try { return typedQuery.getResultList(); } - catch(Exception ex) { //no need to distinguish between exceptions for the moment + catch(Exception ex) { //no need to distinguish between eu.eudat.exceptions for the moment ex.printStackTrace(); return null; } diff --git a/dmp-backend/src/main/java/dao/entities/RegistryDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java similarity index 50% rename from dmp-backend/src/main/java/dao/entities/RegistryDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java index a62862544..e8c5cb6ca 100644 --- a/dmp-backend/src/main/java/dao/entities/RegistryDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java @@ -1,12 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Registry; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Registry; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Service; public interface RegistryDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java similarity index 86% rename from dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java index c97f82cc9..f548cee5d 100644 --- a/dmp-backend/src/main/java/dao/entities/RegistryDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -11,11 +11,13 @@ import javax.persistence.criteria.Root; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.Registry; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Registry; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Component; +@Component("registryDao") public class RegistryDaoImpl extends JpaDao implements RegistryDao { public Registry loadDetails(Registry t) { diff --git a/dmp-backend/src/main/java/dao/entities/ResearcherDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java similarity index 55% rename from dmp-backend/src/main/java/dao/entities/ResearcherDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java index 78617c79d..f9f1926e6 100644 --- a/dmp-backend/src/main/java/dao/entities/ResearcherDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java @@ -1,13 +1,13 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Registry; -import entities.Researcher; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Researcher; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Service; public interface ResearcherDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java similarity index 88% rename from dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java index 0c33c9867..0e36b2141 100644 --- a/dmp-backend/src/main/java/dao/entities/ResearcherDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -9,14 +9,15 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import entities.Registry; -import models.criteria.Criteria; +import eu.eudat.models.criteria.Criteria; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.Researcher; -import entities.responses.IDLabelPair; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Researcher; +import eu.eudat.entities.responses.IDLabelPair; +import org.springframework.stereotype.Component; +@Component("researcherDao") public class ResearcherDaoImpl extends JpaDao implements ResearcherDao { public Researcher loadDetails(Researcher t) { diff --git a/dmp-backend/src/main/java/dao/entities/ServiceDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java similarity index 55% rename from dmp-backend/src/main/java/dao/entities/ServiceDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java index 2001a949b..4e792024a 100644 --- a/dmp-backend/src/main/java/dao/entities/ServiceDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java @@ -1,12 +1,12 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.Service; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.Dao; +import eu.eudat.entities.Service; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; public interface ServiceDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/ServiceDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java similarity index 86% rename from dmp-backend/src/main/java/dao/entities/ServiceDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java index d0460b77b..f1225f0f4 100644 --- a/dmp-backend/src/main/java/dao/entities/ServiceDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; @@ -11,11 +11,13 @@ import javax.persistence.criteria.Root; import org.hibernate.query.Query; -import dao.JpaDao; -import entities.Service; -import entities.responses.IDLabelPair; -import models.criteria.Criteria; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.Service; +import eu.eudat.entities.responses.IDLabelPair; +import eu.eudat.models.criteria.Criteria; +import org.springframework.stereotype.Component; +@Component("serviceDao") public class ServiceDaoImpl extends JpaDao implements ServiceDao { public Service loadDetails(Service t) { diff --git a/dmp-backend/src/main/java/dao/entities/UserInfoDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java similarity index 71% rename from dmp-backend/src/main/java/dao/entities/UserInfoDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java index 29ee3d138..2f6db17cf 100644 --- a/dmp-backend/src/main/java/dao/entities/UserInfoDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java @@ -1,11 +1,12 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.UUID; -import dao.Dao; -import entities.DMP; -import entities.UserInfo; +import eu.eudat.dao.Dao; +import eu.eudat.entities.DMP; +import eu.eudat.entities.UserInfo; +import org.springframework.stereotype.Service; public interface UserInfoDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java similarity index 84% rename from dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java index 305bbde6c..00153e50c 100644 --- a/dmp-backend/src/main/java/dao/entities/UserInfoDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java @@ -1,4 +1,4 @@ -package dao.entities; +package eu.eudat.dao.entities; import java.util.List; import java.util.Set; @@ -7,12 +7,13 @@ import java.util.UUID; import javax.persistence.NoResultException; import javax.persistence.TypedQuery; -import dao.JpaDao; -import entities.DMP; -import entities.UserInfo; -import entities.security.UserAuth; - +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.DMP; +import eu.eudat.entities.UserInfo; +import eu.eudat.entities.security.UserAuth; +import org.springframework.stereotype.Component; +@Component("userInfoDao") public class UserInfoDaoImpl extends JpaDao implements UserInfoDao { public UserInfo loadDetails(UserInfo t) { @@ -76,7 +77,7 @@ public class UserInfoDaoImpl extends JpaDao implements UserInfoD try { return typedQuery.getSingleResult(); } - catch(Exception ex) { //no need to distinguish between exceptions for the moment + catch(Exception ex) { //no need to distinguish between eu.eudat.exceptions for the moment return null; } } @@ -92,7 +93,7 @@ public class UserInfoDaoImpl extends JpaDao implements UserInfoD try { return typedQuery.getSingleResult(); } - catch(Exception ex) { //no need to distinguish between exceptions for the moment + catch(Exception ex) { //no need to distinguish between eu.eudat.exceptions for the moment return null; } } @@ -106,7 +107,7 @@ public class UserInfoDaoImpl extends JpaDao implements UserInfoD try { return typedQuery.getResultList(); } - catch(Exception ex) { //no need to distinguish between exceptions for the moment + catch(Exception ex) { //no need to distinguish between eu.eudat.exceptions for the moment ex.printStackTrace(); return null; } diff --git a/dmp-backend/src/main/java/dao/entities/security/UserAuthDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDao.java similarity index 64% rename from dmp-backend/src/main/java/dao/entities/security/UserAuthDao.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDao.java index d64266420..e1e3c1669 100644 --- a/dmp-backend/src/main/java/dao/entities/security/UserAuthDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDao.java @@ -1,9 +1,9 @@ -package dao.entities.security; +package eu.eudat.dao.entities.security; import java.util.UUID; -import dao.Dao; -import entities.security.UserAuth; +import eu.eudat.dao.Dao; +import eu.eudat.entities.security.UserAuth; public interface UserAuthDao extends Dao { diff --git a/dmp-backend/src/main/java/dao/entities/security/UserAuthDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDaoImpl.java similarity index 84% rename from dmp-backend/src/main/java/dao/entities/security/UserAuthDaoImpl.java rename to dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDaoImpl.java index 33f315421..0c1abb399 100644 --- a/dmp-backend/src/main/java/dao/entities/security/UserAuthDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserAuthDaoImpl.java @@ -1,12 +1,14 @@ -package dao.entities.security; +package eu.eudat.dao.entities.security; import java.util.UUID; import javax.persistence.TypedQuery; -import dao.JpaDao; -import entities.security.UserAuth; +import eu.eudat.dao.JpaDao; +import eu.eudat.entities.security.UserAuth; +import org.springframework.stereotype.Component; +@Component("userAuthDaoImpl") public class UserAuthDaoImpl extends JpaDao implements UserAuthDao { @Override diff --git a/dmp-backend/src/main/java/entities/DMP.java b/dmp-backend/src/main/java/eu/eudat/entities/DMP.java similarity index 90% rename from dmp-backend/src/main/java/entities/DMP.java rename to dmp-backend/src/main/java/eu/eudat/entities/DMP.java index 6dbebdcfb..247fbc9c5 100644 --- a/dmp-backend/src/main/java/entities/DMP.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMP.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,7 +6,6 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -16,22 +15,13 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; -import org.hibernate.annotations.Cascade; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; @Entity @@ -68,7 +58,7 @@ public class DMP implements Serializable,DataEntity { private Project project; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"ProfileData\"", columnDefinition = "xml", nullable = true) private String profileData; diff --git a/dmp-backend/src/main/java/entities/DMPOrganisation.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java similarity index 87% rename from dmp-backend/src/main/java/entities/DMPOrganisation.java rename to dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java index 7f4c9a899..566e74215 100644 --- a/dmp-backend/src/main/java/entities/DMPOrganisation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -11,13 +11,9 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; -import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity diff --git a/dmp-backend/src/main/java/entities/DMPProfile.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java similarity index 90% rename from dmp-backend/src/main/java/entities/DMPProfile.java rename to dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java index 86fb2c7af..3b63a5be9 100644 --- a/dmp-backend/src/main/java/entities/DMPProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -12,17 +12,13 @@ import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -49,7 +45,7 @@ public class DMPProfile implements Serializable { @Column(name = "\"Label\"") private String label; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; diff --git a/dmp-backend/src/main/java/entities/DMPResearcher.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java similarity index 90% rename from dmp-backend/src/main/java/entities/DMPResearcher.java rename to dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java index 55b1fdd3c..159fc6317 100644 --- a/dmp-backend/src/main/java/entities/DMPResearcher.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -11,13 +11,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity diff --git a/dmp-backend/src/main/java/entities/DataEntity.java b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java similarity index 55% rename from dmp-backend/src/main/java/entities/DataEntity.java rename to dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java index e5f4b0295..da0055444 100644 --- a/dmp-backend/src/main/java/entities/DataEntity.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; public interface DataEntity { } diff --git a/dmp-backend/src/main/java/entities/DataRepository.java b/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java similarity index 93% rename from dmp-backend/src/main/java/entities/DataRepository.java rename to dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java index fa804f07e..e5cd2d932 100644 --- a/dmp-backend/src/main/java/entities/DataRepository.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -17,13 +17,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @Table(name="\"DataRepository\"") @@ -54,7 +51,7 @@ public class DataRepository implements Serializable,DataEntity { @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; diff --git a/dmp-backend/src/main/java/entities/Dataset.java b/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java similarity index 93% rename from dmp-backend/src/main/java/entities/Dataset.java rename to dmp-backend/src/main/java/eu/eudat/entities/Dataset.java index 876e8385a..160987fdc 100644 --- a/dmp-backend/src/main/java/entities/Dataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,7 +6,6 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -16,18 +15,13 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; -import org.hibernate.annotations.Cascade; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @Table(name="\"Dataset\"") @@ -58,7 +52,7 @@ public class Dataset implements Serializable,DataEntity { @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Properties\"", columnDefinition = "xml", nullable = true) private String properties; @@ -68,7 +62,7 @@ public class Dataset implements Serializable,DataEntity { @JoinColumn(name = "\"Profile\"", nullable = true) private DatasetProfile profile; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) private String reference; diff --git a/dmp-backend/src/main/java/entities/DatasetProfile.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java similarity index 97% rename from dmp-backend/src/main/java/entities/DatasetProfile.java rename to dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java index 9f466e308..f82c6494f 100644 --- a/dmp-backend/src/main/java/entities/DatasetProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -59,7 +59,7 @@ public class DatasetProfile implements Serializable { private DatasetProfileViewstyle viewstyle; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; diff --git a/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java similarity index 86% rename from dmp-backend/src/main/java/entities/DatasetProfileRuleset.java rename to dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java index ce239854c..df2761f51 100644 --- a/dmp-backend/src/main/java/entities/DatasetProfileRuleset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java @@ -1,10 +1,9 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -14,15 +13,10 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; -import org.json.JSONObject; -import org.json.XML; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -49,7 +43,7 @@ public class DatasetProfileRuleset implements Serializable { @Column(name = "\"Label\"") private String label; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; diff --git a/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java similarity index 87% rename from dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java rename to dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java index feaf65d42..18c9657bc 100644 --- a/dmp-backend/src/main/java/entities/DatasetProfileViewstyle.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java @@ -1,10 +1,9 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -14,14 +13,10 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; -import org.json.XML; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -47,7 +42,7 @@ public class DatasetProfileViewstyle implements Serializable { @Column(name = "\"Label\"") private String label; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; diff --git a/dmp-backend/src/main/java/entities/DatasetRegistry.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java similarity index 91% rename from dmp-backend/src/main/java/entities/DatasetRegistry.java rename to dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java index 3574ae8f5..ba0d48d75 100644 --- a/dmp-backend/src/main/java/entities/DatasetRegistry.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -11,13 +11,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity diff --git a/dmp-backend/src/main/java/entities/DatasetService.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java similarity index 91% rename from dmp-backend/src/main/java/entities/DatasetService.java rename to dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java index e8267048c..f89588813 100644 --- a/dmp-backend/src/main/java/entities/DatasetService.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -11,13 +11,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity diff --git a/dmp-backend/src/main/java/entities/Organisation.java b/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java similarity index 91% rename from dmp-backend/src/main/java/entities/Organisation.java rename to dmp-backend/src/main/java/eu/eudat/entities/Organisation.java index c0582f178..483b30da0 100644 --- a/dmp-backend/src/main/java/entities/Organisation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,7 +6,6 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -18,13 +17,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -50,14 +46,14 @@ public class Organisation implements Serializable,DataEntity { @Column(name = "\"Abbreviation\"") private String abbreviation; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) private String reference; @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; diff --git a/dmp-backend/src/main/java/entities/Project.java b/dmp-backend/src/main/java/eu/eudat/entities/Project.java similarity index 92% rename from dmp-backend/src/main/java/entities/Project.java rename to dmp-backend/src/main/java/eu/eudat/entities/Project.java index a1b9c3f4a..c330e6a22 100644 --- a/dmp-backend/src/main/java/entities/Project.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Project.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,27 +6,21 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -59,14 +53,14 @@ public class Project implements Serializable,DataEntity { @Column(name = "\"Abbreviation\"") private String abbreviation; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) private String reference; @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; diff --git a/dmp-backend/src/main/java/entities/Registry.java b/dmp-backend/src/main/java/eu/eudat/entities/Registry.java similarity index 92% rename from dmp-backend/src/main/java/entities/Registry.java rename to dmp-backend/src/main/java/eu/eudat/entities/Registry.java index d68922d4c..b5954f030 100644 --- a/dmp-backend/src/main/java/entities/Registry.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Registry.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,7 +6,6 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -18,13 +17,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -55,7 +51,7 @@ public class Registry implements Serializable,DataEntity { @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; diff --git a/dmp-backend/src/main/java/entities/Researcher.java b/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java similarity index 91% rename from dmp-backend/src/main/java/entities/Researcher.java rename to dmp-backend/src/main/java/eu/eudat/entities/Researcher.java index d4a5287ff..c530d3f99 100644 --- a/dmp-backend/src/main/java/entities/Researcher.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,7 +6,6 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -18,13 +17,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -53,11 +49,11 @@ public class Researcher implements Serializable,DataEntity { @Column(name = "\"PrimaryEmail\"") private String primaryEmail; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) private String definition; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) private String reference; diff --git a/dmp-backend/src/main/java/entities/Service.java b/dmp-backend/src/main/java/eu/eudat/entities/Service.java similarity index 90% rename from dmp-backend/src/main/java/entities/Service.java rename to dmp-backend/src/main/java/eu/eudat/entities/Service.java index ad0907ba9..27ba8490b 100644 --- a/dmp-backend/src/main/java/entities/Service.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Service.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; @@ -6,13 +6,10 @@ import java.util.Date; import java.util.Set; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; @@ -20,13 +17,10 @@ import javax.persistence.OneToMany; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @@ -56,7 +50,7 @@ public class Service implements Serializable,DataEntity { @Column(name = "\"Uri\"") private String uri; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) private String definition; diff --git a/dmp-backend/src/main/java/entities/UserDMP.java b/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java similarity index 90% rename from dmp-backend/src/main/java/entities/UserDMP.java rename to dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java index 070bd3ee9..528a119f9 100644 --- a/dmp-backend/src/main/java/entities/UserDMP.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; import java.util.UUID; @@ -10,13 +10,10 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @Table(name="\"UserDMP\"") diff --git a/dmp-backend/src/main/java/entities/UserInfo.java b/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java similarity index 92% rename from dmp-backend/src/main/java/entities/UserInfo.java rename to dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java index 7e4215dd8..471e50253 100644 --- a/dmp-backend/src/main/java/entities/UserInfo.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java @@ -1,4 +1,4 @@ -package entities; +package eu.eudat.entities; import java.io.Serializable; import java.util.Date; @@ -16,19 +16,14 @@ import javax.persistence.JoinTable; import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import org.hibernate.annotations.Type; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import entities.security.UserAuth; +import eu.eudat.entities.security.UserAuth; @Entity @@ -73,7 +68,7 @@ public class UserInfo implements Serializable,DataEntity{ private Date lastloggedin = null; - @Type(type="typedefinition.XMLType") + @Type(type="eu.eudat.typedefinition.XMLType") @Column(name = "additionalinfo", columnDefinition = "xml", nullable = true) private String additionalinfo; diff --git a/dmp-backend/src/main/java/entities/responses/IDLabelPair.java b/dmp-backend/src/main/java/eu/eudat/entities/responses/IDLabelPair.java similarity index 94% rename from dmp-backend/src/main/java/entities/responses/IDLabelPair.java rename to dmp-backend/src/main/java/eu/eudat/entities/responses/IDLabelPair.java index 877cada04..86bf4904a 100644 --- a/dmp-backend/src/main/java/entities/responses/IDLabelPair.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/responses/IDLabelPair.java @@ -1,4 +1,4 @@ -package entities.responses; +package eu.eudat.entities.responses; import java.io.Serializable; diff --git a/dmp-backend/src/main/java/entities/security/UserAuth.java b/dmp-backend/src/main/java/eu/eudat/entities/security/UserAuth.java similarity index 87% rename from dmp-backend/src/main/java/entities/security/UserAuth.java rename to dmp-backend/src/main/java/eu/eudat/entities/security/UserAuth.java index 6051d9995..8aa51577c 100644 --- a/dmp-backend/src/main/java/entities/security/UserAuth.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/security/UserAuth.java @@ -1,4 +1,4 @@ -package entities.security; +package eu.eudat.entities.security; import java.util.UUID; @@ -9,12 +9,9 @@ import javax.persistence.Id; import javax.persistence.Table; import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Proxy; import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.annotation.JsonInclude.Include; @Entity @Table(name="\"UserAuth\"") diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java new file mode 100644 index 000000000..0903b81a1 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/DatabaseModelDefinition.java @@ -0,0 +1,7 @@ +package eu.eudat.entities.xmlmodels.modeldefinition; + +import eu.eudat.utilities.DatabaseDefinition; + +public interface DatabaseModelDefinition extends DatabaseDefinition{ + +} diff --git a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/Field.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/Field.java similarity index 89% rename from dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/Field.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/Field.java index 2f48ee0c6..97ebdda30 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/Field.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/Field.java @@ -1,14 +1,12 @@ -package entities.xmlmodels.modeldefinition; +package eu.eudat.entities.xmlmodels.modeldefinition; import org.w3c.dom.Document; import org.w3c.dom.Element; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; - -import models.components.commons.DefaultValue; -import models.components.commons.Multiplicity; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.models.components.commons.DefaultValue; +import eu.eudat.models.components.commons.Multiplicity; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class Field implements DatabaseModelDefinition,XmlSerializable{ diff --git a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldGroup.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldGroup.java similarity index 90% rename from dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldGroup.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldGroup.java index 8aaef5e3d..70559e789 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldGroup.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldGroup.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.modeldefinition; +package eu.eudat.entities.xmlmodels.modeldefinition; import java.util.LinkedList; import java.util.List; @@ -8,8 +8,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class FieldGroup implements DatabaseModelDefinition,XmlSerializable{ private List
fieldSets; diff --git a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldSet.java similarity index 88% rename from dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldSet.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldSet.java index 01d946e8c..1cde26bab 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/modeldefinition/FieldSet.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/modeldefinition/FieldSet.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.modeldefinition; +package eu.eudat.entities.xmlmodels.modeldefinition; import java.util.LinkedList; import java.util.List; @@ -8,12 +8,9 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; - -import models.components.commons.Multiplicity; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.models.components.commons.Multiplicity; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class FieldSet implements DatabaseModelDefinition,XmlSerializable
{ diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java new file mode 100644 index 000000000..c3b51be23 --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/DatabaseViewStyleDefinition.java @@ -0,0 +1,7 @@ +package eu.eudat.entities.xmlmodels.viewstyledefinition; + +import eu.eudat.utilities.DatabaseDefinition; + +public interface DatabaseViewStyleDefinition extends DatabaseDefinition{ + +} diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldGroup.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldGroup.java similarity index 95% rename from dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldGroup.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldGroup.java index df6f5d527..fc621317f 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldGroup.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldGroup.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.viewstyledefinition; +package eu.eudat.entities.xmlmodels.viewstyledefinition; import java.util.LinkedList; import java.util.List; @@ -8,9 +8,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import entities.xmlmodels.modeldefinition.DatabaseModelDefinition; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class FieldGroup implements DatabaseViewStyleDefinition,XmlSerializable{ private String id; diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldSet.java similarity index 90% rename from dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldSet.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldSet.java index cef4b5cab..19f11da9b 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/FieldSet.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/FieldSet.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.viewstyledefinition; +package eu.eudat.entities.xmlmodels.viewstyledefinition; import java.util.LinkedList; import java.util.List; @@ -8,9 +8,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import entities.xmlmodels.modeldefinition.DatabaseModelDefinition; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class FieldSet implements DatabaseViewStyleDefinition,XmlSerializable
{ private String id; diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Section.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/Section.java similarity index 96% rename from dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Section.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/Section.java index 2e955025c..b6fbe28c6 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/Section.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/Section.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.viewstyledefinition; +package eu.eudat.entities.xmlmodels.viewstyledefinition; import java.util.LinkedList; import java.util.List; @@ -8,9 +8,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import entities.xmlmodels.modeldefinition.DatabaseModelDefinition; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class Section implements DatabaseViewStyleDefinition,XmlSerializable
{ private String id; diff --git a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java similarity index 88% rename from dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java rename to dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java index 632419acc..dc336e832 100644 --- a/dmp-backend/src/main/java/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/viewstyledefinition/ViewStyleModel.java @@ -1,4 +1,4 @@ -package entities.xmlmodels.viewstyledefinition; +package eu.eudat.entities.xmlmodels.viewstyledefinition; import java.util.LinkedList; import java.util.List; @@ -8,9 +8,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import entities.xmlmodels.modeldefinition.FieldSet; -import utilities.XmlSerializable; -import utilities.builders.XmlBuilder; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; public class ViewStyleModel implements XmlSerializable{ private List
sections; diff --git a/dmp-backend/src/main/java/exceptions/NonValidTokenException.java b/dmp-backend/src/main/java/eu/eudat/exceptions/NonValidTokenException.java similarity index 86% rename from dmp-backend/src/main/java/exceptions/NonValidTokenException.java rename to dmp-backend/src/main/java/eu/eudat/exceptions/NonValidTokenException.java index 0d5273f5c..15ddd803d 100644 --- a/dmp-backend/src/main/java/exceptions/NonValidTokenException.java +++ b/dmp-backend/src/main/java/eu/eudat/exceptions/NonValidTokenException.java @@ -1,4 +1,4 @@ -package exceptions; +package eu.eudat.exceptions; public class NonValidTokenException extends Exception { diff --git a/dmp-backend/src/main/java/helpers/Transformers.java b/dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java similarity index 88% rename from dmp-backend/src/main/java/helpers/Transformers.java rename to dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java index 679af3f5a..18e288dfb 100644 --- a/dmp-backend/src/main/java/helpers/Transformers.java +++ b/dmp-backend/src/main/java/eu/eudat/helpers/Transformers.java @@ -1,4 +1,4 @@ -package helpers; +package eu.eudat.helpers; import java.util.Arrays; import java.util.HashSet; @@ -7,16 +7,16 @@ import java.util.UUID; import org.springframework.util.MultiValueMap; -import entities.DMP; -import entities.DMPProfile; -import entities.DataRepository; -import entities.Dataset; -import entities.DatasetProfile; -import entities.DatasetProfileRuleset; -import entities.DatasetProfileViewstyle; -import entities.Project; -import entities.Registry; -import entities.Service; +import eu.eudat.entities.DMP; +import eu.eudat.entities.DMPProfile; +import eu.eudat.entities.DataRepository; +import eu.eudat.entities.Dataset; +import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.DatasetProfileRuleset; +import eu.eudat.entities.DatasetProfileViewstyle; +import eu.eudat.entities.Project; +import eu.eudat.entities.Registry; +import eu.eudat.entities.Service; public class Transformers { diff --git a/dmp-backend/src/main/java/login/Login.java b/dmp-backend/src/main/java/eu/eudat/login/Login.java similarity index 93% rename from dmp-backend/src/main/java/login/Login.java rename to dmp-backend/src/main/java/eu/eudat/login/Login.java index 617a890a3..574a63f11 100644 --- a/dmp-backend/src/main/java/login/Login.java +++ b/dmp-backend/src/main/java/eu/eudat/login/Login.java @@ -1,4 +1,4 @@ -package login; +package eu.eudat.login; import java.io.Serializable; import java.security.MessageDigest; @@ -21,11 +21,11 @@ import org.springframework.web.bind.annotation.RestController; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import dao.entities.UserInfoDao; -import dao.entities.security.UserAuthDao; -import entities.UserInfo; -import entities.security.UserAuth; -import security.TokenSessionManager; +import eu.eudat.dao.entities.UserInfoDao; +import eu.eudat.dao.entities.security.UserAuthDao; +import eu.eudat.entities.UserInfo; +import eu.eudat.entities.security.UserAuth; +import eu.eudat.security.TokenSessionManager; @RestController @@ -70,7 +70,7 @@ public class Login { else if(userHash.equals(providedHash)) { // create a token token = tokenSessionManager.generateRandomAlphanumeric(512); - // add it to the cache + // add it to the eu.eudat.cache tokenSessionManager.set(token, credentials.getUsername()); } diff --git a/dmp-backend/src/main/java/managers/AdminManager.java b/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java similarity index 54% rename from dmp-backend/src/main/java/managers/AdminManager.java rename to dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java index 998bceca6..115b0e2ea 100644 --- a/dmp-backend/src/main/java/managers/AdminManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java @@ -1,4 +1,4 @@ -package managers; +package eu.eudat.managers; import java.util.Date; import java.util.List; @@ -9,28 +9,27 @@ import org.w3c.dom.Element; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import entities.DatasetProfileViewstyle; -import entities.xmlmodels.modeldefinition.FieldGroup; -import entities.xmlmodels.viewstyledefinition.Section; -import entities.xmlmodels.viewstyledefinition.ViewStyleModel; -import models.admin.components.datasetprofile.FieldSet; -import models.admin.composite.DatasetProfile; -import utilities.builders.ModelBuilder; -import utilities.builders.XmlBuilder; -import utilities.helpers.ModelBuilderCollector; +import eu.eudat.entities.DatasetProfileViewstyle; +import eu.eudat.entities.xmlmodels.modeldefinition.FieldGroup; +import eu.eudat.entities.xmlmodels.viewstyledefinition.ViewStyleModel; +import eu.eudat.models.admin.components.datasetprofile.FieldSet; +import eu.eudat.models.admin.composite.DatasetProfile; +import eu.eudat.utilities.builders.ModelBuilder; +import eu.eudat.utilities.builders.XmlBuilder; +import eu.eudat.utilities.helpers.ModelBuilderCollector; public class AdminManager { - public static entities.DatasetProfile generateModelDefinition(DatasetProfile profile){ + public static eu.eudat.entities.DatasetProfile generateModelDefinition(DatasetProfile profile){ ObjectMapper xmlMapper = new XmlMapper(); List
fieldSets = ModelBuilderCollector.collectCompositeFields(profile.getSections()); FieldGroup fieldGroup = new FieldGroup(); - List fieldset = new ModelBuilder().toModelDefinition(fieldSets, entities.xmlmodels.modeldefinition.FieldSet.class); + List fieldset = new ModelBuilder().toModelDefinition(fieldSets, eu.eudat.entities.xmlmodels.modeldefinition.FieldSet.class); fieldGroup.setFieldSets(fieldset); Document modelDoc = XmlBuilder.getDocument(); fieldGroup.toXml(modelDoc); String xml = XmlBuilder.generateXml(modelDoc); - entities.DatasetProfile datasetProfile = new entities.DatasetProfile(); + eu.eudat.entities.DatasetProfile datasetProfile = new eu.eudat.entities.DatasetProfile(); datasetProfile.setDefinition(xml); datasetProfile.setStatus((short)1); datasetProfile.setLabel(profile.getLabel()); @@ -40,7 +39,7 @@ public class AdminManager { public static DatasetProfileViewstyle generateViewStyleDefinition(DatasetProfile profile){ ViewStyleModel viewStyleModel = new ViewStyleModel(); - viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), entities.xmlmodels.viewstyledefinition.Section.class)); + viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), eu.eudat.entities.xmlmodels.viewstyledefinition.Section.class)); Document viewStyleDoc = XmlBuilder.getDocument(); Element elementViewStyle = viewStyleModel.toXml(viewStyleDoc); viewStyleDoc.appendChild(elementViewStyle); @@ -52,16 +51,16 @@ public class AdminManager { return datasetProfileViewstyle; } - public static models.admin.composite.DatasetProfile generateDatasetProfileModel(entities.DatasetProfile profile){ + public static eu.eudat.models.admin.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.entities.DatasetProfile profile){ Document viewStyleDoc = XmlBuilder.fromXml(profile.getViewstyle().getDefinition()); Element root = (Element)viewStyleDoc.getDocumentElement(); - entities.xmlmodels.viewstyledefinition.ViewStyleModel viewstyle= new entities.xmlmodels.viewstyledefinition.ViewStyleModel().fromXml(root); + eu.eudat.entities.xmlmodels.viewstyledefinition.ViewStyleModel viewstyle= new eu.eudat.entities.xmlmodels.viewstyledefinition.ViewStyleModel().fromXml(root); Document profileDoc = XmlBuilder.fromXml(profile.getDefinition()); root = (Element)profileDoc.getDocumentElement(); - entities.xmlmodels.modeldefinition.FieldGroup fieldGroup = new entities.xmlmodels.modeldefinition.FieldGroup().fromXml(root); + eu.eudat.entities.xmlmodels.modeldefinition.FieldGroup fieldGroup = new eu.eudat.entities.xmlmodels.modeldefinition.FieldGroup().fromXml(root); - models.admin.composite.DatasetProfile datasetprofile = new models.admin.composite.DatasetProfile(); + eu.eudat.models.admin.composite.DatasetProfile datasetprofile = new eu.eudat.models.admin.composite.DatasetProfile(); datasetprofile.buildProfile(fieldGroup, viewstyle); return datasetprofile; diff --git a/dmp-backend/src/main/java/managers/DashBoardManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java similarity index 68% rename from dmp-backend/src/main/java/managers/DashBoardManager.java rename to dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java index 061b29fff..df9c0c644 100644 --- a/dmp-backend/src/main/java/managers/DashBoardManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java @@ -1,11 +1,9 @@ -package managers; +package eu.eudat.managers; -import org.springframework.beans.factory.annotation.Autowired; - -import dao.entities.DMPDao; -import dao.entities.DatasetDao; -import dao.entities.ProjectDao; -import models.dashboard.DashBoardStatistics; +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.dao.entities.DatasetDao; +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.models.dashboard.DashBoardStatistics; public class DashBoardManager { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java new file mode 100644 index 000000000..3d29ddb1e --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java @@ -0,0 +1,26 @@ +package eu.eudat.managers; + +import java.util.List; +import java.util.UUID; + +import eu.eudat.dao.entities.DMPDao; +import eu.eudat.models.dmp.DataManagementPlanTableRequest; +import eu.eudat.models.helpers.DataTableData; +import eu.eudat.utilities.builders.DomainModelConverter; + +public class DataManagementPlanManager { + + public DataTableData getPaged(DMPDao dmpsRepository, DataManagementPlanTableRequest dataManagementPlanTableRequest) throws IllegalAccessException, InstantiationException{ + List datamanagementPlans = new DomainModelConverter().fromDataModel( dmpsRepository.getWithCriteria(dataManagementPlanTableRequest), eu.eudat.models.dmp.DataManagementPlan.class); + DataTableData dataTable = new DataTableData(); + dataTable.setData(datamanagementPlans); + dataTable.setTotalCount(dmpsRepository.count()); + return dataTable; + } + + public eu.eudat.models.dmp.DataManagementPlan getSingle(DMPDao dmpsRepository, String id) throws InstantiationException, IllegalAccessException{ + eu.eudat.models.dmp.DataManagementPlan datamanagementPlan = new eu.eudat.models.dmp.DataManagementPlan(); + datamanagementPlan.fromDataModel(dmpsRepository.read(UUID.fromString(id))); + return datamanagementPlan; + } +} diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java new file mode 100644 index 000000000..7d393d76c --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java @@ -0,0 +1,27 @@ +package eu.eudat.managers; + +import java.util.List; +import java.util.UUID; + +import eu.eudat.dao.entities.ProjectDao; +import eu.eudat.models.helpers.DataTableData; +import eu.eudat.models.project.Project; +import eu.eudat.models.project.ProjectTableRequest; +import eu.eudat.utilities.builders.DomainModelConverter; + +public class ProjectManager { + + public DataTableData getPaged(ProjectDao projectRepository, ProjectTableRequest projectTableRequest) throws IllegalAccessException, InstantiationException{ + List projects = new DomainModelConverter().fromDataModel( projectRepository.getWithCriteria(projectTableRequest), eu.eudat.models.project.Project.class); + DataTableData dataTable = new DataTableData(); + dataTable.setData(projects); + dataTable.setTotalCount(projectRepository.count()); + return dataTable; + } + + public eu.eudat.models.project.Project getSingle(ProjectDao projectRepository, String id) throws InstantiationException, IllegalAccessException{ + eu.eudat.models.project.Project project = new eu.eudat.models.project.Project(); + project.fromDataModel(projectRepository.read(UUID.fromString(id))); + return project; + } +} diff --git a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java new file mode 100644 index 000000000..4d398285c --- /dev/null +++ b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java @@ -0,0 +1,23 @@ +package eu.eudat.managers; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import eu.eudat.utilities.builders.XmlBuilder; + +public class UserManager { + public static eu.eudat.models.user.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.entities.DatasetProfile profile){ + Document viewStyleDoc = XmlBuilder.fromXml(profile.getViewstyle().getDefinition()); + Element root = (Element)viewStyleDoc.getDocumentElement(); + eu.eudat.entities.xmlmodels.viewstyledefinition.ViewStyleModel viewstyle= new eu.eudat.entities.xmlmodels.viewstyledefinition.ViewStyleModel().fromXml(root); + + Document profileDoc = XmlBuilder.fromXml(profile.getDefinition()); + root = (Element)profileDoc.getDocumentElement(); + eu.eudat.entities.xmlmodels.modeldefinition.FieldGroup fieldGroup = new eu.eudat.entities.xmlmodels.modeldefinition.FieldGroup().fromXml(root); + + eu.eudat.models.user.composite.DatasetProfile datasetprofile = new eu.eudat.models.user.composite.DatasetProfile(); + datasetprofile.buildProfile(fieldGroup, viewstyle); + + return datasetprofile; + } +} diff --git a/dmp-backend/src/main/java/models/DataModel.java b/dmp-backend/src/main/java/eu/eudat/models/DataModel.java similarity index 72% rename from dmp-backend/src/main/java/models/DataModel.java rename to dmp-backend/src/main/java/eu/eudat/models/DataModel.java index 12a0925cd..154d523ff 100644 --- a/dmp-backend/src/main/java/models/DataModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/DataModel.java @@ -1,6 +1,6 @@ -package models; +package eu.eudat.models; -import entities.DataEntity; +import eu.eudat.entities.DataEntity; public interface DataModel { void fromDataModel(T entity) throws InstantiationException, IllegalAccessException; diff --git a/dmp-backend/src/main/java/models/admin/components/datasetprofile/Field.java b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java similarity index 76% rename from dmp-backend/src/main/java/models/admin/components/datasetprofile/Field.java rename to dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java index f3ab4e576..896d80e6f 100644 --- a/dmp-backend/src/main/java/models/admin/components/datasetprofile/Field.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java @@ -1,21 +1,16 @@ -package models.admin.components.datasetprofile; +package eu.eudat.models.admin.components.datasetprofile; import org.apache.commons.lang3.RandomStringUtils; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import eu.eudat.models.components.commons.DefaultValue; +import eu.eudat.models.components.commons.Multiplicity; +import eu.eudat.models.components.commons.ViewStyle; +import eu.eudat.models.components.commons.Visibility; +import eu.eudat.utilities.ModelDefinition; +import eu.eudat.utilities.ViewStyleDefinition; +import eu.eudat.utilities.builders.ModelBuilder; -import models.components.commons.DefaultValue; -import models.components.commons.Multiplicity; -import models.components.commons.ViewStyle; -import models.components.commons.Visibility; -import utilities.ModelDefinition; -import utilities.ViewStyleDefinition; -import utilities.builders.ModelBuilder; - -public class Field implements ModelDefinition,ViewStyleDefinition,Comparable{ +public class Field implements ModelDefinition,ViewStyleDefinition,Comparable{ private String id; private Integer ordinal; private String title; @@ -123,7 +118,7 @@ public class Field implements ModelDefinition,ViewStyleDefinition{ +public class FieldSet implements Comparable,ModelDefinition,ViewStyleDefinition{ private String id; private Integer ordinal; private Multiplicity multiplicity; @@ -51,29 +49,29 @@ public class FieldSet implements Comparable,ModelDefinition modelfields = new ModelBuilder().toModelDefinition(this.fields, entities.xmlmodels.modeldefinition.Field.class); + List modelfields = new ModelBuilder().toModelDefinition(this.fields, eu.eudat.entities.xmlmodels.modeldefinition.Field.class); fieldSet.setFields(modelfields); fieldSet.setMultiplicity(this.multiplicity); return fieldSet; } @Override - public void fromDatabaseDefinition(entities.xmlmodels.modeldefinition.FieldSet item) { + public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.modeldefinition.FieldSet item) { this.id = item.getId(); this.ordinal = item.getOrdinal(); this.multiplicity = item.getMultiplicity(); } @Override - public entities.xmlmodels.viewstyledefinition.FieldSet toDatabaseDefinition(entities.xmlmodels.viewstyledefinition.FieldSet item) { + public eu.eudat.entities.xmlmodels.viewstyledefinition.FieldSet toDatabaseDefinition(eu.eudat.entities.xmlmodels.viewstyledefinition.FieldSet item) { if(this.id == null||this.id.isEmpty())this.id = "fieldSet_"+RandomStringUtils.random(5, true, true); - List viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, entities.xmlmodels.viewstyledefinition.Field.class); + List viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.entities.xmlmodels.viewstyledefinition.Field.class); item.setFields(viewStylefields); item.setId(this.id); item.setOrdinal(this.ordinal); @@ -81,7 +79,7 @@ public class FieldSet implements Comparable,ModelDefinition,ViewStyleDefinition{ +public class Group implements ModelDefinition,ViewStyleDefinition{ private String id; private String title; private String section; @@ -85,13 +83,13 @@ public class Group implements ModelDefinition{ +public class Section implements Comparable,ViewStyleDefinition{ private List
sections; private List fieldGroups; private Boolean defaultVisibility; @@ -67,20 +66,20 @@ public class Section implements Comparable,ViewStyleDefinition,DatabaseModelDefinition{ private String ruleType; diff --git a/dmp-backend/src/main/java/models/components/commons/ViewStyle.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java similarity index 89% rename from dmp-backend/src/main/java/models/components/commons/ViewStyle.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java index 1e1d72d09..87794f2cc 100644 --- a/dmp-backend/src/main/java/models/components/commons/ViewStyle.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java @@ -1,4 +1,4 @@ -package models.components.commons; +package eu.eudat.models.components.commons; public class ViewStyle { private String renderStyle; diff --git a/dmp-backend/src/main/java/models/components/commons/Visibility.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java similarity index 90% rename from dmp-backend/src/main/java/models/components/commons/Visibility.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java index 6e8914344..d423412db 100644 --- a/dmp-backend/src/main/java/models/components/commons/Visibility.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java @@ -1,4 +1,4 @@ -package models.components.commons; +package eu.eudat.models.components.commons; import java.util.LinkedList; import java.util.List; @@ -8,8 +8,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import entities.xmlmodels.viewstyledefinition.Field; -import utilities.XmlSerializable; +import eu.eudat.utilities.XmlSerializable; public class Visibility implements XmlSerializable{ private List rules; diff --git a/dmp-backend/src/main/java/models/components/commons/datafield/AutoCompleteData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java similarity index 94% rename from dmp-backend/src/main/java/models/components/commons/datafield/AutoCompleteData.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java index 64b9dbbb8..cdf85e939 100644 --- a/dmp-backend/src/main/java/models/components/commons/datafield/AutoCompleteData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java @@ -1,4 +1,4 @@ -package models.components.commons.datafield; +package eu.eudat.models.components.commons.datafield; import java.util.LinkedList; import java.util.List; @@ -9,8 +9,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import models.components.commons.datafield.ComboBoxData.Option; - public class AutoCompleteData extends ComboBoxData{ private String url; private Option autoCompleteOptions; diff --git a/dmp-backend/src/main/java/models/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java similarity index 85% rename from dmp-backend/src/main/java/models/components/commons/datafield/BooleanDecisionData.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java index add064234..84274e42a 100644 --- a/dmp-backend/src/main/java/models/components/commons/datafield/BooleanDecisionData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java @@ -1,10 +1,8 @@ -package models.components.commons.datafield; +package eu.eudat.models.components.commons.datafield; import org.w3c.dom.Document; import org.w3c.dom.Element; -import utilities.XmlSerializable; - public class BooleanDecisionData extends FieldData{ @Override diff --git a/dmp-backend/src/main/java/models/components/commons/datafield/CheckBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java similarity index 91% rename from dmp-backend/src/main/java/models/components/commons/datafield/CheckBoxData.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java index 8f37abb4d..81a98340d 100644 --- a/dmp-backend/src/main/java/models/components/commons/datafield/CheckBoxData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java @@ -1,12 +1,10 @@ -package models.components.commons.datafield; +package eu.eudat.models.components.commons.datafield; import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Element; -import utilities.XmlSerializable; - public class CheckBoxData extends FieldData{ private String label; diff --git a/dmp-backend/src/main/java/models/components/commons/datafield/ComboBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java similarity index 94% rename from dmp-backend/src/main/java/models/components/commons/datafield/ComboBoxData.java rename to dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java index 263b4f7c1..578a84e1a 100644 --- a/dmp-backend/src/main/java/models/components/commons/datafield/ComboBoxData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java @@ -1,4 +1,4 @@ -package models.components.commons.datafield; +package eu.eudat.models.components.commons.datafield; import java.util.LinkedList; import java.util.List; @@ -9,7 +9,7 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import utilities.XmlSerializable; +import eu.eudat.utilities.XmlSerializable; public abstract class ComboBoxData extends FieldData{ public class Option implements XmlSerializable