diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile new file mode 100644 index 000000000..1c2d5cb72 --- /dev/null +++ b/dmp-backend/Dockerfile @@ -0,0 +1,5 @@ +FROM openjdk:8-jdk-alpine +VOLUME /tmp +ARG JAR_FILE +ADD ${JAR_FILE} app.jar +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java index 88c680313..7a674710f 100644 --- a/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java +++ b/dmp-backend/src/main/java/eu/eudat/EuDatApplication.java @@ -1,16 +1,11 @@ package eu.eudat; -import eu.eudat.handlers.PrincipalArgumentResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.support.SpringBootServletInitializer; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.web.method.support.HandlerMethodArgumentResolver; - -import java.util.List; @SpringBootApplication public class EuDatApplication extends SpringBootServletInitializer { diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java index 1f65d07fa..28f83d454 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java @@ -4,9 +4,6 @@ import eu.eudat.builders.Builder; import eu.eudat.entities.Credential; import eu.eudat.entities.UserInfo; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; import java.util.Date; import java.util.UUID; @@ -71,7 +68,7 @@ public class CredentialBuilder extends Builder { return this; } - public Credential build(){ + public Credential build() { Credential credential = new Credential(); credential.setStatus(status); credential.setLastUpdateTime(lastUpdateTime); diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java index d9d675349..3fe0f089b 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java @@ -3,11 +3,7 @@ package eu.eudat.builders.entity; import eu.eudat.builders.Builder; import eu.eudat.entities.Dataset; import eu.eudat.entities.DatasetProfile; -import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; import java.util.Date; import java.util.Set; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java index a25c3836b..b202be682 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java @@ -5,9 +5,7 @@ import eu.eudat.entities.Credential; import eu.eudat.entities.DMP; import eu.eudat.entities.UserInfo; import eu.eudat.entities.UserRole; -import org.hibernate.annotations.Type; -import javax.persistence.*; import java.util.Date; import java.util.HashSet; import java.util.Set; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java index a67ad386b..15f0ca1de 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java @@ -4,10 +4,6 @@ import eu.eudat.builders.Builder; import eu.eudat.entities.UserInfo; import eu.eudat.entities.UserRole; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; import java.util.UUID; /** diff --git a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java index 921719464..24d9f4130 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java @@ -4,10 +4,6 @@ import eu.eudat.builders.Builder; import eu.eudat.entities.UserInfo; import eu.eudat.entities.UserToken; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java b/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java index 5cfd9e3c5..94a0e4061 100644 --- a/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java +++ b/dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java @@ -1,7 +1,6 @@ package eu.eudat.builders.model.criteria; import eu.eudat.builders.Builder; -import eu.eudat.entities.Registry; import eu.eudat.models.criteria.RegistryCriteria; /** diff --git a/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java index 4e2d4c3a7..09a73cb87 100644 --- a/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java +++ b/dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java @@ -1,43 +1,41 @@ package eu.eudat.cache; +import com.google.common.cache.CacheBuilder; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.guava.GuavaCache; +import org.springframework.cache.support.SimpleCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import org.springframework.cache.CacheManager; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cache.support.SimpleCacheManager; -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Component; -import org.springframework.cache.guava.GuavaCache; - -import com.google.common.cache.CacheBuilder; - - @Component @EnableCaching public class ResponsesCache { - public static long HOW_MANY = 30; - public static TimeUnit TIME_UNIT = TimeUnit.MINUTES; - - - @Bean - public CacheManager cacheManager() { - System.out.print("Loading ResponsesCache..."); - SimpleCacheManager simpleCacheManager = new SimpleCacheManager(); - List caches = new ArrayList(); - caches.add(new GuavaCache("repositories", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - caches.add(new GuavaCache("projects", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - caches.add(new GuavaCache("organisations", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - caches.add(new GuavaCache("registries", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - caches.add(new GuavaCache("services", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - caches.add(new GuavaCache("researchers", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); - simpleCacheManager.setCaches(caches); - System.out.println("OK"); - return simpleCacheManager; - } - + public static long HOW_MANY = 30; + public static TimeUnit TIME_UNIT = TimeUnit.MINUTES; + + + @Bean + public CacheManager cacheManager() { + System.out.print("Loading ResponsesCache..."); + SimpleCacheManager simpleCacheManager = new SimpleCacheManager(); + List caches = new ArrayList(); + caches.add(new GuavaCache("repositories", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("projects", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("organisations", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("registries", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("services", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + caches.add(new GuavaCache("researchers", CacheBuilder.newBuilder().expireAfterAccess(HOW_MANY, TIME_UNIT).build())); + simpleCacheManager.setCaches(caches); + System.out.println("OK"); + return simpleCacheManager; + } + } diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java index e1f5bcbb8..9b2731c9a 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java +++ b/dmp-backend/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java @@ -15,6 +15,7 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; + import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; import java.util.Properties; @@ -67,7 +68,7 @@ public class DevelDatabaseConfiguration { Properties properties = new Properties(); properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect"); properties.setProperty("hibernate.show_sql", "true"); - properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults","false"); + properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false"); return properties; } } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java index 82e29745a..e504e1c2f 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java +++ b/dmp-backend/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java @@ -70,7 +70,7 @@ public class ProductionDatabaseConfiguration { Properties properties = new Properties(); properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect"); properties.setProperty("hibernate.show_sql", "true"); - properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults","false"); + properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false"); return properties; } } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java b/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java index fba687b82..3965c777e 100644 --- a/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java +++ b/dmp-backend/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java @@ -3,14 +3,9 @@ package eu.eudat.configurations; import eu.eudat.handlers.PrincipalArgumentResolver; import eu.eudat.services.AuthenticationService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.boot.web.servlet.ErrorPage; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpStatus; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import java.util.List; @@ -21,6 +16,7 @@ public class WebMVCConfiguration extends WebMvcConfigurerAdapter { @Autowired AuthenticationService authenticationService; + @Override public void addArgumentResolvers(List argumentResolvers) { argumentResolvers.add(new PrincipalArgumentResolver(this.authenticationService)); diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java index 8e36ab524..e5d87c94d 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Admin.java @@ -1,32 +1,20 @@ package eu.eudat.controllers; -import java.util.UUID; - -import eu.eudat.dao.entities.*; -import eu.eudat.managers.DashBoardManager; -import eu.eudat.models.dashboard.DashBoardStatistics; +import eu.eudat.managers.AdminManager; +import eu.eudat.models.admin.composite.DatasetProfile; import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.security.Principal; import eu.eudat.security.claims.ClaimedAuthorities; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; -import eu.eudat.types.Authorities; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.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.RestController; - -import eu.eudat.managers.AdminManager; -import eu.eudat.models.admin.composite.DatasetProfile; +import org.springframework.web.bind.annotation.*; import javax.transaction.Transactional; import javax.validation.Valid; +import java.util.UUID; import static eu.eudat.types.Authorities.ADMIN; @@ -44,7 +32,7 @@ public class Admin extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/admin/addDmp"}, consumes = "application/json", produces = "application/json") public ResponseEntity addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) { try { - eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile,getApiContext()); + eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext()); this.getApiContext().getDatabaseRepository().getDatasetProfileDao().createOrUpdate(modelDefinition); return ResponseEntity.status(HttpStatus.OK).body(modelDefinition.getId()); } catch (Exception ex) { @@ -57,7 +45,7 @@ public class Admin extends BaseController { @RequestMapping(method = RequestMethod.POST, value = {"/admin/addDmp/{id}"}, consumes = "application/json", produces = "application/json") public ResponseEntity> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) { try { - eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile,getApiContext()); + eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile, getApiContext()); eu.eudat.entities.DatasetProfile datasetprofile = this.getApiContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id)); datasetprofile.setDefinition(modelDefinition.getDefinition()); diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java b/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java index aabe12b12..b0c963bc5 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/BaseController.java @@ -5,8 +5,6 @@ import eu.eudat.validators.DataManagementPlanTableRequestValidator; import eu.eudat.validators.DatasetProfileValidator; import eu.eudat.validators.ProjectModelValidator; import eu.eudat.validators.ProjectTableRequestValidator; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; @@ -19,16 +17,20 @@ public abstract class BaseController { return apiContext; } - public BaseController(ApiContext apiContext){ + public BaseController(ApiContext apiContext) { this.apiContext = apiContext; } @InitBinder() protected void initBinder(WebDataBinder binder) { - if (binder.getTarget() != null && DataManagementPlanTableRequestValidator.supportsType((binder.getTarget().getClass()))) binder.addValidators(this.apiContext.getApplicationContext().getBean("dataManagementPlanTableRequestValidator",DataManagementPlanTableRequestValidator.class)); - if (binder.getTarget() != null && ProjectTableRequestValidator.supportsType((binder.getTarget().getClass()))) binder.addValidators(this.apiContext.getApplicationContext().getBean("projectTableRequestValidator",ProjectTableRequestValidator.class)); - if (binder.getTarget() != null && DatasetProfileValidator.supportsType((binder.getTarget().getClass()))) binder.addValidators(this.apiContext.getApplicationContext().getBean("datasetProfileValidator",DatasetProfileValidator.class)); - if (binder.getTarget() != null && ProjectModelValidator.supportsType((binder.getTarget().getClass()))) binder.addValidators(this.apiContext.getApplicationContext().getBean("projectModelValidator",ProjectModelValidator.class)); + if (binder.getTarget() != null && DataManagementPlanTableRequestValidator.supportsType((binder.getTarget().getClass()))) + binder.addValidators(this.apiContext.getApplicationContext().getBean("dataManagementPlanTableRequestValidator", DataManagementPlanTableRequestValidator.class)); + if (binder.getTarget() != null && ProjectTableRequestValidator.supportsType((binder.getTarget().getClass()))) + binder.addValidators(this.apiContext.getApplicationContext().getBean("projectTableRequestValidator", ProjectTableRequestValidator.class)); + if (binder.getTarget() != null && DatasetProfileValidator.supportsType((binder.getTarget().getClass()))) + binder.addValidators(this.apiContext.getApplicationContext().getBean("datasetProfileValidator", DatasetProfileValidator.class)); + if (binder.getTarget() != null && ProjectModelValidator.supportsType((binder.getTarget().getClass()))) + binder.addValidators(this.apiContext.getApplicationContext().getBean("projectModelValidator", ProjectModelValidator.class)); } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java index 5ed5a1ad0..23722989c 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DMPs.java @@ -1,17 +1,14 @@ package eu.eudat.controllers; -import java.util.*; - -import javax.validation.Valid; - import eu.eudat.entities.DMP; import eu.eudat.exceptions.datamanagementplan.DMPWithDatasetsException; +import eu.eudat.managers.DataManagementPlanManager; import eu.eudat.models.dmp.DataManagementPlan; import eu.eudat.models.dmp.DataManagementPlanCriteriaRequest; import eu.eudat.models.dmp.DataManagementPlanTableRequest; import eu.eudat.models.helpers.common.DataTableData; -import eu.eudat.models.helpers.responses.*; +import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.listingmodels.DataManagementPlanListingModel; import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; @@ -19,11 +16,12 @@ import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.scheduling.annotation.Async; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import eu.eudat.managers.DataManagementPlanManager; +import javax.validation.Valid; +import java.util.List; +import java.util.UUID; @RestController @@ -119,9 +117,9 @@ public class DMPs extends BaseController { try { DataManagementPlanManager.delete(this.getApiContext(), id); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Successfully Deleted Dataset")); - } catch (DMPWithDatasetsException ex){ + } catch (DMPWithDatasetsException ex) { return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); - }catch (Exception ex) { + } catch (Exception ex) { ex.printStackTrace(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage())); } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java index f56cdb957..caeb33cfb 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DashBoardController.java @@ -1,5 +1,7 @@ package eu.eudat.controllers; +import eu.eudat.managers.DashBoardManager; +import eu.eudat.models.dashboard.DashBoardStatistics; import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; @@ -12,45 +14,37 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import eu.eudat.dao.entities.DMPDao; -import eu.eudat.dao.entities.DatasetDao; -import eu.eudat.dao.entities.ProjectDao; -import eu.eudat.managers.DashBoardManager; -import eu.eudat.models.dashboard.DashBoardStatistics; - @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class DashBoardController extends BaseController{ +public class DashBoardController extends BaseController { - @Autowired - public DashBoardController(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public DashBoardController(ApiContext apiContext) { + super(apiContext); + } - @RequestMapping(method = RequestMethod.GET, value = { "/dashboard/getStatistics" }, produces="application/json") - public ResponseEntity> getStatistics(){ - try { - DashBoardStatistics statistics = new DashBoardManager().getStatistics(this.getApiContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getDatabaseRepository().getDmpDao() - , this.getApiContext().getDatabaseRepository().getProjectDao()); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(statistics)); - } - catch(Exception ex) { - ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage())); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/dashboard/getStatistics"}, produces = "application/json") + public ResponseEntity> getStatistics() { + try { + DashBoardStatistics statistics = new DashBoardManager().getStatistics(this.getApiContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getDatabaseRepository().getDmpDao() + , this.getApiContext().getDatabaseRepository().getProjectDao()); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(statistics)); + } catch (Exception ex) { + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage())); + } + } - @RequestMapping(method = RequestMethod.GET, value = { "/dashboard/me/getStatistics" }, produces="application/json") - public ResponseEntity> getStatistics(Principal principal){ - try { - DashBoardStatistics statistics = new DashBoardManager().getMeStatistics(this.getApiContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getDatabaseRepository().getDmpDao() - , this.getApiContext().getDatabaseRepository().getProjectDao(),principal); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(statistics)); - } - catch(Exception ex) { - ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage())); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/dashboard/me/getStatistics"}, produces = "application/json") + public ResponseEntity> getStatistics(Principal principal) { + try { + DashBoardStatistics statistics = new DashBoardManager().getMeStatistics(this.getApiContext().getDatabaseRepository().getDatasetDao(), this.getApiContext().getDatabaseRepository().getDmpDao() + , this.getApiContext().getDatabaseRepository().getProjectDao(), principal); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE).payload(statistics)); + } catch (Exception ex) { + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage())); + } + } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java index f545ef855..4dd26d6e4 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java @@ -1,48 +1,41 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class DataRepositories extends BaseController{ +public class DataRepositories extends BaseController { - @Autowired - public DataRepositories(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public DataRepositories(ApiContext apiContext) { + super(apiContext); + } + + @RequestMapping(method = RequestMethod.GET, value = {"/external/datarepos"}, produces = "application/json") + public @ResponseBody + ResponseEntity>>> listExternalDataRepositories(@RequestParam(value = "query", required = false) String query) { + try { + List> remoteRepos = this.getApiContext().getRemoteFetcher().getRepositories(query); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().status(ApiMessageCode.NO_MESSAGE).payload(remoteRepos)); + } catch (NoURLFound ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null)); + } catch (HugeResultSet ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null)); + } + } - @RequestMapping(method = RequestMethod.GET, value = { "/external/datarepos" }, produces="application/json") - public @ResponseBody ResponseEntity>>> listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){ - try { - List> remoteRepos = this.getApiContext().getRemoteFetcher().getRepositories(query); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>>().status(ApiMessageCode.NO_MESSAGE).payload(remoteRepos)); - } - catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null)); - } - catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null)); - } - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java index 5450245ec..f70a760df 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java @@ -1,14 +1,10 @@ package eu.eudat.controllers; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - +import eu.eudat.managers.UserManager; import eu.eudat.models.components.commons.datafield.AutoCompleteData; +import eu.eudat.models.helpers.common.AutoCompleteLookupItem; import eu.eudat.models.helpers.responses.ResponseItem; -import eu.eudat.models.user.composite.DatasetProfile; +import eu.eudat.models.properties.PropertiesModel; import eu.eudat.models.user.composite.PagedDatasetProfile; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; @@ -17,16 +13,13 @@ 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.RestController; +import org.springframework.web.bind.annotation.*; -import eu.eudat.managers.UserManager; -import eu.eudat.models.helpers.common.AutoCompleteLookupItem; -import eu.eudat.models.properties.PropertiesModel; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; @RestController @CrossOrigin diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java index 3c1543b7e..12a604293 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfiles.java @@ -1,7 +1,5 @@ package eu.eudat.controllers; -import java.util.List; - import eu.eudat.managers.DatasetProfileManager; import eu.eudat.models.datasetprofile.DatasetProfileAutocompleteItem; import eu.eudat.models.datasetprofile.DatasetProfileAutocompleteRequest; @@ -14,12 +12,9 @@ import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java index 76650fb9e..44ce6a18a 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Datasets.java @@ -1,13 +1,10 @@ package eu.eudat.controllers; -import java.util.Locale; -import java.util.UUID; - import eu.eudat.entities.Dataset; import eu.eudat.managers.DatasetManager; import eu.eudat.models.dataset.DatasetTableRequest; import eu.eudat.models.helpers.common.DataTableData; -import eu.eudat.models.helpers.responses.*; +import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.listingmodels.DatasetListingModel; import eu.eudat.models.security.Principal; import eu.eudat.services.ApiContext; @@ -16,13 +13,10 @@ 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.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.Locale; +import java.util.UUID; @RestController diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java index 9a8d57daa..a8fc8afff 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -20,7 +20,7 @@ import java.util.UUID; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class ExternalDatasets extends BaseController{ +public class ExternalDatasets extends BaseController { @Autowired public ExternalDatasets(ApiContext apiContext) { @@ -28,7 +28,8 @@ public class ExternalDatasets extends BaseController{ } @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getPaged"}, consumes = "application/json", produces = "application/json") - public @ResponseBody ResponseEntity>> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) { + public @ResponseBody + ResponseEntity>> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) { try { DataTableData dataTable = new ExternalDatasetManager().getPaged(this.getApiContext(), datasetTableRequest); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable)); @@ -40,7 +41,8 @@ public class ExternalDatasets extends BaseController{ } @RequestMapping(method = RequestMethod.GET, value = {"/external/datasets"}, produces = "application/json") - public @ResponseBody ResponseEntity>> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) { + public @ResponseBody + ResponseEntity>> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) { try { List dataTable = new ExternalDatasetManager().getWithExternal(this.getApiContext(), query, this.getApiContext().getRemoteFetcher()); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE)); @@ -51,10 +53,11 @@ public class ExternalDatasets extends BaseController{ } @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getSingle/{id}"}, consumes = "application/json", produces = "application/json") - public @ResponseBody ResponseItem getWithExternal(@PathVariable UUID id, Principal principal) { + public @ResponseBody + ResponseItem getWithExternal(@PathVariable UUID id, Principal principal) { try { ExternalDatasetListingModel externalDatasetModel = new ExternalDatasetManager().getSingle(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), id); - return new ResponseItem().payload(externalDatasetModel ).status(ApiMessageCode.NO_MESSAGE); + return new ResponseItem().payload(externalDatasetModel).status(ApiMessageCode.NO_MESSAGE); } catch (Exception ex) { ex.printStackTrace(); return new ResponseItem().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()); diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java index 9480fb5fb..fa8596799 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Login.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Login.java @@ -2,8 +2,8 @@ package eu.eudat.controllers; import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.managers.UserManager; -import eu.eudat.models.login.Credentials; import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.models.login.Credentials; import eu.eudat.models.login.LoginInfo; import eu.eudat.models.security.Principal; import eu.eudat.security.CustomAuthenticationProvider; diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java index 400358dbf..270ba3aa7 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java @@ -1,52 +1,45 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - import eu.eudat.models.external.OrganisationsExternalSourcesModel; import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class Organisations extends BaseController{ +public class Organisations extends BaseController { - @Autowired - public Organisations(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public Organisations(ApiContext apiContext) { + super(apiContext); + } - @RequestMapping(method = RequestMethod.GET, value = { "/external/organisations" }, produces="application/json") - public @ResponseBody ResponseEntity> listExternalOrganisations(@RequestParam(value="query", required=false) String query ){ - try { - List> remoteRepos = this.getApiContext().getRemoteFetcher().getOrganisations(query); - OrganisationsExternalSourcesModel projectsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(projectsExternalSourcesModel).status(ApiMessageCode.SUCCESS_MESSAGE)); - } - catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); - } - catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); - }catch (Exception ex){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/external/organisations"}, produces = "application/json") + public @ResponseBody + ResponseEntity> listExternalOrganisations(@RequestParam(value = "query", required = false) String query) { + try { + List> remoteRepos = this.getApiContext().getRemoteFetcher().getOrganisations(query); + OrganisationsExternalSourcesModel projectsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(projectsExternalSourcesModel).status(ApiMessageCode.SUCCESS_MESSAGE)); + } catch (NoURLFound ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); + } catch (HugeResultSet ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); + } + } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java b/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java index c764c5e3d..b332d9e28 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Projects.java @@ -1,41 +1,27 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - -import javax.transaction.Transactional; -import javax.validation.Valid; - +import eu.eudat.entities.Project; +import eu.eudat.managers.ProjectManager; import eu.eudat.models.external.ProjectsExternalSourcesModel; -import eu.eudat.models.helpers.responses.*; +import eu.eudat.models.helpers.common.DataTableData; +import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.project.ProjectCriteriaRequest; import eu.eudat.models.project.ProjectListingModel; +import eu.eudat.models.project.ProjectTableRequest; import eu.eudat.models.security.Principal; -import eu.eudat.security.claims.ClaimedAuthorities; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.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.springframework.web.bind.annotation.*; -import eu.eudat.entities.Project; - -import eu.eudat.managers.ProjectManager; -import eu.eudat.models.helpers.common.DataTableData; -import eu.eudat.models.project.ProjectTableRequest; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; - -import static eu.eudat.types.Authorities.ADMIN; -import static eu.eudat.types.Authorities.USER; +import javax.transaction.Transactional; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; @RestController diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java index 884b16cad..3e9afc633 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Registries.java @@ -1,55 +1,48 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - import eu.eudat.models.external.RegistriesExternalSourcesModel; import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class Registries extends BaseController{ +public class Registries extends BaseController { - @Autowired - public Registries(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public Registries(ApiContext apiContext) { + super(apiContext); + } + + @RequestMapping(method = RequestMethod.GET, value = {"/external/registries"}, produces = "application/json") + public @ResponseBody + ResponseEntity> listExternalRegistries(@RequestParam(value = "query", required = false) String query) { + try { + List> remoteRepos = this.getApiContext().getRemoteFetcher().getRegistries(query); + RegistriesExternalSourcesModel registriesExternalSourcesModel = new RegistriesExternalSourcesModel().fromExternalItem(remoteRepos); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(registriesExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); + } catch (NoURLFound ex) { + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); + } catch (HugeResultSet ex) { + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); + } catch (Exception ex) { + ex.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); + } + } - @RequestMapping(method = RequestMethod.GET, value = { "/external/registries" }, produces="application/json") - public @ResponseBody ResponseEntity> listExternalRegistries(@RequestParam(value="query", required=false) String query ){ - try { - List> remoteRepos = this.getApiContext().getRemoteFetcher().getRegistries(query); - RegistriesExternalSourcesModel registriesExternalSourcesModel = new RegistriesExternalSourcesModel().fromExternalItem(remoteRepos); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(registriesExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); - } - catch(NoURLFound ex) { - ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); - } - catch(HugeResultSet ex) { - ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); - }catch (Exception ex){ - ex.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); - } - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java index f9ac0b774..4ec4a60e6 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Researchers.java @@ -1,14 +1,13 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - import eu.eudat.exceptions.security.UnauthorisedException; import eu.eudat.managers.ResearcherManager; import eu.eudat.models.dmp.Researcher; import eu.eudat.models.external.ResearchersExternalSourcesModel; import eu.eudat.models.helpers.responses.ResponseItem; import eu.eudat.models.security.Principal; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; @@ -17,53 +16,52 @@ import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class Researchers extends BaseController{ +public class Researchers extends BaseController { - @Autowired - public Researchers(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public Researchers(ApiContext apiContext) { + super(apiContext); + } - @RequestMapping(method = RequestMethod.GET, value = { "/external/researchers" }, produces="application/json") - public @ResponseBody ResponseEntity> listExternalResearchers(@RequestParam(value="query", required=false) String query ){ - try { - List> remoteRepos = this.getApiContext().getRemoteFetcher().getResearchers(query); - ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); - } - catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); - } - catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); - }catch (Exception ex){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/external/researchers"}, produces = "application/json") + public @ResponseBody + ResponseEntity> listExternalResearchers(@RequestParam(value = "query", required = false) String query) { + try { + List> remoteRepos = this.getApiContext().getRemoteFetcher().getResearchers(query); + ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); + } catch (NoURLFound ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); + } catch (HugeResultSet ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); + } + } - @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/researchers/create" }, consumes = "application/json",produces="application/json") - public @ResponseBody ResponseEntity> create(@RequestBody eu.eudat.models.researcher.Researcher researcher, Principal principal) { - try { - ResearcherManager.create(this.getApiContext(),researcher); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); - }catch (UnauthorisedException e){ - e.printStackTrace(); - throw e; - } - catch (Exception e) { - e.printStackTrace(); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message(e.getMessage())); - } - } + @Transactional + @RequestMapping(method = RequestMethod.POST, value = {"/researchers/create"}, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity> create(@RequestBody eu.eudat.models.researcher.Researcher researcher, Principal principal) { + try { + ResearcherManager.create(this.getApiContext(), researcher); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE)); + } catch (UnauthorisedException e) { + e.printStackTrace(); + throw e; + } catch (Exception e) { + e.printStackTrace(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message(e.getMessage())); + } + } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java index 729547ed9..340ec18ba 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Services.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Services.java @@ -1,52 +1,45 @@ package eu.eudat.controllers; -import java.util.List; -import java.util.Map; - import eu.eudat.models.external.ServiceExternalSourcesModel; import eu.eudat.models.helpers.responses.ResponseItem; +import eu.eudat.proxy.config.exceptions.HugeResultSet; +import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.services.ApiContext; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; -import eu.eudat.proxy.config.exceptions.HugeResultSet; -import eu.eudat.proxy.config.exceptions.NoURLFound; +import java.util.List; +import java.util.Map; @RestController @CrossOrigin @RequestMapping(value = {"/api"}) -public class Services extends BaseController{ +public class Services extends BaseController { - @Autowired - public Services(ApiContext apiContext) { - super(apiContext); - } + @Autowired + public Services(ApiContext apiContext) { + super(apiContext); + } - @RequestMapping(method = RequestMethod.GET, value = { "/external/services" }, produces="application/json") - public @ResponseBody ResponseEntity> listExternalServices(@RequestParam(value="query", required=false) String query ){ - try { - List> remoteRepos = this.getApiContext().getRemoteFetcher().getServices(query); - ServiceExternalSourcesModel serviceExternalSourcesModel = new ServiceExternalSourcesModel().fromExternalItem(remoteRepos); - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(serviceExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); - } - catch(NoURLFound ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); - } - catch(HugeResultSet ex) { - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); - }catch (Exception ex){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); - } - } + @RequestMapping(method = RequestMethod.GET, value = {"/external/services"}, produces = "application/json") + public @ResponseBody + ResponseEntity> listExternalServices(@RequestParam(value = "query", required = false) String query) { + try { + List> remoteRepos = this.getApiContext().getRemoteFetcher().getServices(query); + ServiceExternalSourcesModel serviceExternalSourcesModel = new ServiceExternalSourcesModel().fromExternalItem(remoteRepos); + return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(serviceExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); + } catch (NoURLFound ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found")); + } catch (HugeResultSet ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set")); + } catch (Exception ex) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage())); + } + } } diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java index 005c2fb5d..ffec2827d 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java @@ -22,7 +22,7 @@ import java.util.UUID; @RequestMapping("api/invite/") @RestController @CrossOrigin -public class UserInvitationController extends BaseController{ +public class UserInvitationController extends BaseController { @Autowired public UserInvitationController(ApiContext apiContext) { @@ -30,10 +30,11 @@ public class UserInvitationController extends BaseController{ } @Transactional - @RequestMapping(method = RequestMethod.POST, value = { "/users" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity> users(@RequestBody Invitation invitation, Principal principal) { + @RequestMapping(method = RequestMethod.POST, value = {"/users"}, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity> users(@RequestBody Invitation invitation, Principal principal) { try { - InvitationsManager.inviteUsers(this.getApiContext(),invitation,principal); + InvitationsManager.inviteUsers(this.getApiContext(), invitation, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message("Users have beeen invited")); } catch (Exception e) { e.printStackTrace(); @@ -42,25 +43,26 @@ public class UserInvitationController extends BaseController{ } @Transactional - @RequestMapping(method = RequestMethod.GET, value = { "/exchange/{invitationID}" }, produces="application/json") - public @ResponseBody ResponseEntity> exchange(@PathVariable UUID invitationID, Principal principal) { + @RequestMapping(method = RequestMethod.GET, value = {"/exchange/{invitationID}"}, produces = "application/json") + public @ResponseBody + ResponseEntity> exchange(@PathVariable UUID invitationID, Principal principal) { try { - UUID dmpId = InvitationsManager.assignUserAcceptedInvitation(this.getApiContext(),invitationID,principal); + UUID dmpId = InvitationsManager.assignUserAcceptedInvitation(this.getApiContext(), invitationID, principal); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).payload(dmpId)); - }catch (UnauthorisedException e){ + } catch (UnauthorisedException e) { e.printStackTrace(); - throw e; - } - catch (Exception e) { + throw e; + } catch (Exception e) { e.printStackTrace(); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem().status(ApiMessageCode.SUCCESS_MESSAGE).message(e.getMessage())); } } - @RequestMapping(method = RequestMethod.POST, value = { "/getUsers" }, consumes = "application/json", produces="application/json") - public @ResponseBody ResponseEntity>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) { + @RequestMapping(method = RequestMethod.POST, value = {"/getUsers"}, consumes = "application/json", produces = "application/json") + public @ResponseBody + ResponseEntity>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) { try { - List users = InvitationsManager.getUsers(this.getApiContext(),userInfoRequestItem); + List users = InvitationsManager.getUsers(this.getApiContext(), userInfoRequestItem); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(users)); } catch (Exception e) { e.printStackTrace(); diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java b/dmp-backend/src/main/java/eu/eudat/controllers/Users.java index 6fe3e6426..500f9841f 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/Users.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/Users.java @@ -1,11 +1,8 @@ package eu.eudat.controllers; -import eu.eudat.managers.ProjectManager; import eu.eudat.managers.UserManager; import eu.eudat.models.helpers.common.DataTableData; import eu.eudat.models.helpers.responses.ResponseItem; -import eu.eudat.models.project.ProjectListingModel; -import eu.eudat.models.project.ProjectTableRequest; import eu.eudat.models.security.Principal; import eu.eudat.models.userinfo.UserInfoTableRequestItem; import eu.eudat.models.userinfo.UserListingModel; @@ -21,7 +18,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import static eu.eudat.types.Authorities.ADMIN; -import static eu.eudat.types.Authorities.USER; @RestController diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java index 08c0a6fc7..6b679d66a 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java @@ -40,7 +40,7 @@ public class ControllerErrorHandler { private ValidationErrorContext processFieldErrors(List fieldErrors) { ValidationErrorContext dto = new ValidationErrorContext(); - for (FieldError fieldError: fieldErrors) { + for (FieldError fieldError : fieldErrors) { String localizedErrorMessage = resolveLocalizedErrorMessage(fieldError); dto.addFieldError(fieldError.getField(), localizedErrorMessage); } @@ -49,7 +49,7 @@ public class ControllerErrorHandler { } private String resolveLocalizedErrorMessage(FieldError fieldError) { - Locale currentLocale = LocaleContextHolder.getLocale(); + Locale currentLocale = LocaleContextHolder.getLocale(); String localizedErrorMessage = messageSource.getMessage(fieldError, currentLocale); if (localizedErrorMessage.equals(fieldError.getDefaultMessage())) { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java index 50e5fed3c..a72ed4c77 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java @@ -7,12 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.*; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; -import java.util.List; -import java.util.UUID; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceContext; @Repository("databaseCtx") @@ -35,11 +32,11 @@ public class DatabaseContext> { EntityManager entityManager = this.entityManager; if (item.getKeys()[0] != null) { T oldItem = entityManager.find(type, item.getKeys()[0]); - if(oldItem!=null) { + if (oldItem != null) { oldItem.update(item); entityManager.merge(oldItem); return oldItem; - }else { + } else { entityManager.persist(item); } } else entityManager.persist(item); @@ -51,7 +48,7 @@ public class DatabaseContext> { return ((Number) entityManager.createQuery("select count(e) from " + entityClass.getSimpleName() + " e").getSingleResult()).longValue(); } - public void delete(T item){ + public void delete(T item) { this.entityManager.remove(item); } } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java index 9d0ec13aa..b452284c8 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java @@ -6,10 +6,8 @@ import eu.eudat.entities.DataEntity; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Set; -import java.util.UUID; @Service("databaseService") @@ -26,19 +24,19 @@ public class DatabaseService> { return this.databaseCtx.getQueryable(tClass); } - public QueryableList getQueryable(Set hints,Class tClass) { + public QueryableList getQueryable(Set hints, Class tClass) { return this.databaseCtx.getQueryable(tClass).setHints(hints); } - public T createOrUpdate(T item,Class tClass) { + public T createOrUpdate(T item, Class tClass) { return this.databaseCtx.createOrUpdate(item, tClass); } - public Long count(Class tClass){ + public Long count(Class tClass) { return this.databaseCtx.count(tClass); } - public void delete(T item){ + public void delete(T item) { this.databaseCtx.delete(item); } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java index fd611cc34..a8077a286 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDao.java @@ -1,7 +1,5 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.entities.DMP; import eu.eudat.entities.UserInfo; @@ -9,13 +7,15 @@ import eu.eudat.models.criteria.DataManagementPlanCriteria; import eu.eudat.models.datasetwizard.DatasetWizardAutocompleteRequest; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface DMPDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(DataManagementPlanCriteria criteria); + QueryableList getWithCriteria(DataManagementPlanCriteria criteria); - QueryableList getUserDmps(DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, UserInfo userInfo); + QueryableList getUserDmps(DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, UserInfo userInfo); - QueryableList getAuthenticated(QueryableList query,UserInfo principal); + QueryableList getAuthenticated(QueryableList query, UserInfo principal); - Long count(); + Long count(); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java index 16d14c9c6..959ed94ba 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java @@ -1,24 +1,20 @@ package eu.eudat.dao.entities; -import java.lang.reflect.Array; -import java.util.Arrays; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Dataset; -import eu.eudat.entities.DatasetProfile; +import eu.eudat.entities.DMP; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.DataManagementPlanCriteria; import eu.eudat.models.datasetwizard.DatasetWizardAutocompleteRequest; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.DMP; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Arrays; +import java.util.UUID; + @Component("dMPDao") public class DMPDaoImpl extends DatabaseAccess implements DMPDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java index 281fcee10..43755886b 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java @@ -1,12 +1,12 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.entities.DataRepository; import eu.eudat.models.criteria.DataRepositoryCriteria; import eu.eudat.queryable.QueryableList; -public interface DataRepositoryDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(DataRepositoryCriteria criteria); +import java.util.UUID; + +public interface DataRepositoryDao extends DatabaseAccessLayer { + QueryableList getWithCriteria(DataRepositoryCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java index 764ca5a2c..75599f3fa 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java @@ -1,16 +1,15 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; +import eu.eudat.entities.DataRepository; import eu.eudat.models.criteria.DataRepositoryCriteria; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.DataRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("dataRepositoryDao") public class DataRepositoryDaoImpl extends DatabaseAccess implements DataRepositoryDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java index 315fd21c5..f6ff6cb24 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java @@ -1,25 +1,23 @@ package eu.eudat.dao.entities; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.DataRepository; import eu.eudat.entities.Dataset; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.DatasetCriteria; import eu.eudat.queryable.QueryableList; -import org.springframework.transaction.annotation.Transactional; -public interface DatasetDao extends DatabaseAccessLayer { +import java.util.UUID; +import java.util.concurrent.CompletableFuture; - QueryableList getWithCriteria(DatasetCriteria criteria); +public interface DatasetDao extends DatabaseAccessLayer { - QueryableList getAuthenticated(QueryableList query, UserInfo principal); + QueryableList getWithCriteria(DatasetCriteria criteria); - CompletableFuture createOrUpdateAsync(Dataset item); + QueryableList getAuthenticated(QueryableList query, UserInfo principal); - Dataset find(UUID id,String hint); + CompletableFuture createOrUpdateAsync(Dataset item); - Long count(); + Dataset find(UUID id, String hint); + + Long count(); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java index 7c3bf38c5..ca1c87710 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java @@ -1,21 +1,18 @@ package eu.eudat.dao.entities; -import java.util.Arrays; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.DataRepository; import eu.eudat.entities.Dataset; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.DatasetCriteria; import eu.eudat.queryable.QueryableList; import eu.eudat.queryable.types.FieldSelectionType; import eu.eudat.queryable.types.SelectionField; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; @Component("datasetDao") public class DatasetDaoImpl extends DatabaseAccess implements DatasetDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java index 95f7e85c7..ca06b32a8 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java @@ -1,12 +1,12 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.entities.DatasetProfile; import eu.eudat.models.criteria.DatasetProfileCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface DatasetProfileDao extends DatabaseAccessLayer { QueryableList getWithCriteria(DatasetProfileCriteria criteria); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java index b71b1d97d..fd986e635 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java @@ -1,53 +1,53 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Dataset; import eu.eudat.entities.DatasetProfile; import eu.eudat.models.criteria.DatasetProfileCriteria; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("datasetProfileDao") public class DatasetProfileDaoImpl extends DatabaseAccess implements DatasetProfileDao { - @Autowired - public DatasetProfileDaoImpl(DatabaseService databaseService) { - this.setDatabaseService(databaseService); - } + @Autowired + public DatasetProfileDaoImpl(DatabaseService databaseService) { + this.setDatabaseService(databaseService); + } - @Override - public QueryableList getWithCriteria(DatasetProfileCriteria criteria) { - QueryableList query = getDatabaseService().getQueryable(DatasetProfile.class); - if(criteria.getLike()!=null&&!criteria.getLike().isEmpty())query.where((builder, root) -> builder.like(root.get("label"),"%"+criteria.getLike()+"%")); - return query; - } + @Override + public QueryableList getWithCriteria(DatasetProfileCriteria criteria) { + QueryableList query = getDatabaseService().getQueryable(DatasetProfile.class); + if (criteria.getLike() != null && !criteria.getLike().isEmpty()) + query.where((builder, root) -> builder.like(root.get("label"), "%" + criteria.getLike() + "%")); + return query; + } - @Override - public DatasetProfile createOrUpdate(DatasetProfile item) { - return this.getDatabaseService().createOrUpdate(item,DatasetProfile.class); - } + @Override + public DatasetProfile createOrUpdate(DatasetProfile item) { + return this.getDatabaseService().createOrUpdate(item, DatasetProfile.class); + } - @Override - public DatasetProfile find(UUID id) { - return getDatabaseService().getQueryable(DatasetProfile.class).where((builder, root) -> builder.equal(root.get("id"),id)).getSingle(); - } + @Override + public DatasetProfile find(UUID id) { + return getDatabaseService().getQueryable(DatasetProfile.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle(); + } - @Override - public QueryableList getAll() { - return getDatabaseService().getQueryable(DatasetProfile.class); - } + @Override + public QueryableList getAll() { + return getDatabaseService().getQueryable(DatasetProfile.class); + } - @Override - public void delete(DatasetProfile item) { - this.getDatabaseService().delete(item); - } + @Override + public void delete(DatasetProfile item) { + this.getDatabaseService().delete(item); + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(DatasetProfile.class); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(DatasetProfile.class); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java index 3f80dca8c..4ac24c3f3 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java @@ -1,11 +1,8 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.DMP; import eu.eudat.entities.ExternalDataset; -import eu.eudat.entities.Invitation; import eu.eudat.models.criteria.ExternalDatasetCriteria; -import eu.eudat.models.criteria.InvitationCriteria; import eu.eudat.queryable.QueryableList; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java index e15995fcd..3c12cf5df 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java @@ -1,9 +1,8 @@ package eu.eudat.dao.entities; + import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.DatasetProfile; import eu.eudat.entities.ExternalDataset; -import eu.eudat.entities.Project; import eu.eudat.models.criteria.ExternalDatasetCriteria; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; @@ -23,18 +22,19 @@ public class ExternalDatasetDaoImpl extends DatabaseAccess impl @Override public QueryableList getWithCriteria(ExternalDatasetCriteria criteria) { QueryableList query = this.getDatabaseService().getQueryable(ExternalDataset.class); - if (criteria.getLike() != null && !criteria.getLike().isEmpty()) query.where((builder, root) -> builder.like(root.get("label"), "%" + criteria.getLike() + "%")); + if (criteria.getLike() != null && !criteria.getLike().isEmpty()) + query.where((builder, root) -> builder.like(root.get("label"), "%" + criteria.getLike() + "%")); return query; } @Override public ExternalDataset createOrUpdate(ExternalDataset item) { - return this.getDatabaseService().createOrUpdate(item,ExternalDataset.class); + return this.getDatabaseService().createOrUpdate(item, ExternalDataset.class); } @Override public ExternalDataset find(UUID id) { - return this.getDatabaseService().getQueryable(ExternalDataset.class).where((builder, root) -> builder.equal(root.get("id"),id)).getSingle(); + return this.getDatabaseService().getQueryable(ExternalDataset.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle(); } @Override diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java index 9e75acde6..b5ddd3705 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDao.java @@ -1,10 +1,7 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Dataset; -import eu.eudat.entities.ExternalDataset; import eu.eudat.entities.Invitation; -import eu.eudat.models.criteria.DatasetCriteria; import eu.eudat.models.criteria.InvitationCriteria; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java index 30f0f2119..6191d615d 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java @@ -2,8 +2,6 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.DMP; -import eu.eudat.entities.ExternalDataset; import eu.eudat.entities.Invitation; import eu.eudat.models.criteria.InvitationCriteria; import eu.eudat.queryable.QueryableList; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java index da20902c8..bbafa6b88 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java @@ -1,15 +1,14 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Invitation; import eu.eudat.entities.Organisation; import eu.eudat.models.criteria.OrganisationCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface OrganisationDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(OrganisationCriteria criteria); + QueryableList getWithCriteria(OrganisationCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java index 2afbec59d..e68de353d 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java @@ -1,17 +1,15 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Invitation; +import eu.eudat.entities.Organisation; import eu.eudat.models.criteria.OrganisationCriteria; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.Organisation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("organisationDao") public class OrganisationDaoImpl extends DatabaseAccess implements OrganisationDao { @@ -30,7 +28,7 @@ public class OrganisationDaoImpl extends DatabaseAccess implements @Override public Organisation createOrUpdate(Organisation item) { - return this.getDatabaseService().createOrUpdate(item,Organisation.class); + return this.getDatabaseService().createOrUpdate(item, Organisation.class); } @Override diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java index 3ebd35dd2..6683ce2f0 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java @@ -1,20 +1,18 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Dataset; -import eu.eudat.entities.Organisation; import eu.eudat.entities.Project; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.ProjectCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface ProjectDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(ProjectCriteria criteria); + QueryableList getWithCriteria(ProjectCriteria criteria); - QueryableList getAuthenticated(QueryableList query, UserInfo principal); + QueryableList getAuthenticated(QueryableList query, UserInfo principal); - Long count(); + Long count(); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java index 899b95084..6c208ef10 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java @@ -1,16 +1,16 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.*; +import eu.eudat.entities.Project; +import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.ProjectCriteria; import eu.eudat.queryable.QueryableList; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("projectDao") public class ProjectDaoImpl extends DatabaseAccess implements ProjectDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java index 78ac6a00d..52241e197 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java @@ -1,15 +1,14 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Project; import eu.eudat.entities.Registry; import eu.eudat.models.criteria.RegistryCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface RegistryDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(RegistryCriteria criteria); + QueryableList getWithCriteria(RegistryCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java index 21a5487d3..263e78161 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java @@ -1,49 +1,48 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Organisation; +import eu.eudat.entities.Registry; import eu.eudat.models.criteria.RegistryCriteria; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.Registry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("registryDao") public class RegistryDaoImpl extends DatabaseAccess implements RegistryDao { - @Autowired - public RegistryDaoImpl(DatabaseService databaseService) { - this.setDatabaseService(databaseService); - } + @Autowired + public RegistryDaoImpl(DatabaseService databaseService) { + this.setDatabaseService(databaseService); + } - @Override - public QueryableList getWithCriteria(RegistryCriteria criteria) { - QueryableList query = this.getDatabaseService().getQueryable(Registry.class); - if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike())); - return query; - } + @Override + public QueryableList getWithCriteria(RegistryCriteria criteria) { + QueryableList query = this.getDatabaseService().getQueryable(Registry.class); + if (criteria.getLike() != null) + query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + return query; + } - @Override - public Registry createOrUpdate(Registry item) { - return this.getDatabaseService().createOrUpdate(item,Registry.class); - } + @Override + public Registry createOrUpdate(Registry item) { + return this.getDatabaseService().createOrUpdate(item, Registry.class); + } - @Override - public Registry find(UUID id) { - return this.getDatabaseService().getQueryable(Registry.class).where((builder, root) -> builder.equal(root.get("id"),id)).getSingle(); - } + @Override + public Registry find(UUID id) { + return this.getDatabaseService().getQueryable(Registry.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle(); + } - @Override - public void delete(Registry item) { - this.getDatabaseService().delete(item); - } + @Override + public void delete(Registry item) { + this.getDatabaseService().delete(item); + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(Registry.class); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(Registry.class); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java index cf49c34d4..f3ff5e0c1 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java @@ -1,15 +1,14 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Registry; import eu.eudat.entities.Researcher; import eu.eudat.models.criteria.ResearcherCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface ResearcherDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(ResearcherCriteria criteria); + QueryableList getWithCriteria(ResearcherCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java index bdbfcf57b..cfbaba4ac 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java @@ -1,49 +1,48 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Organisation; +import eu.eudat.entities.Researcher; import eu.eudat.models.criteria.ResearcherCriteria; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.Researcher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("researcherDao") public class ResearcherDaoImpl extends DatabaseAccess implements ResearcherDao { - @Autowired - public ResearcherDaoImpl(DatabaseService databaseService) { - this.setDatabaseService(databaseService); - } + @Autowired + public ResearcherDaoImpl(DatabaseService databaseService) { + this.setDatabaseService(databaseService); + } - @Override - public QueryableList getWithCriteria(ResearcherCriteria criteria) { - QueryableList query = this.getDatabaseService().getQueryable(Researcher.class); - if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike())); - return query; - } + @Override + public QueryableList getWithCriteria(ResearcherCriteria criteria) { + QueryableList query = this.getDatabaseService().getQueryable(Researcher.class); + if (criteria.getLike() != null) + query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + return query; + } - @Override - public Researcher createOrUpdate(Researcher item) { - return this.getDatabaseService().createOrUpdate(item,Researcher.class); - } + @Override + public Researcher createOrUpdate(Researcher item) { + return this.getDatabaseService().createOrUpdate(item, Researcher.class); + } - @Override - public Researcher find(UUID id) { - return this.getDatabaseService().getQueryable(Researcher.class).where((builder, root) -> builder.equal(root.get("id"),id)).getSingle(); - } + @Override + public Researcher find(UUID id) { + return this.getDatabaseService().getQueryable(Researcher.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle(); + } - @Override - public void delete(Researcher item) { - this.getDatabaseService().delete(item); - } + @Override + public void delete(Researcher item) { + this.getDatabaseService().delete(item); + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(Researcher.class); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(Researcher.class); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java index dfa623c68..c16cae23e 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java @@ -1,15 +1,14 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Researcher; import eu.eudat.entities.Service; import eu.eudat.models.criteria.ServiceCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface ServiceDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(ServiceCriteria criteria); + QueryableList getWithCriteria(ServiceCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java index 3e86f2df9..d56cdbddf 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java @@ -1,49 +1,48 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Organisation; +import eu.eudat.entities.Service; import eu.eudat.models.criteria.ServiceCriteria; import eu.eudat.queryable.QueryableList; - -import eu.eudat.entities.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("serviceDao") public class ServiceDaoImpl extends DatabaseAccess implements ServiceDao { - @Autowired - public ServiceDaoImpl(DatabaseService databaseService) { - this.setDatabaseService(databaseService); - } + @Autowired + public ServiceDaoImpl(DatabaseService databaseService) { + this.setDatabaseService(databaseService); + } - @Override - public QueryableList getWithCriteria(ServiceCriteria criteria) { - QueryableList query = this.getDatabaseService().getQueryable(Service.class); - if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike())); - return query; - } + @Override + public QueryableList getWithCriteria(ServiceCriteria criteria) { + QueryableList query = this.getDatabaseService().getQueryable(Service.class); + if (criteria.getLike() != null) + query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike())); + return query; + } - @Override - public Service createOrUpdate(Service item) { - return this.getDatabaseService().createOrUpdate(item,Service.class); - } + @Override + public Service createOrUpdate(Service item) { + return this.getDatabaseService().createOrUpdate(item, Service.class); + } - @Override - public Service find(UUID id) { - return this.getDatabaseService().getQueryable(Service.class).where((builder, root) -> builder.equal(root.get("id"),id)).getSingle(); - } + @Override + public Service find(UUID id) { + return this.getDatabaseService().getQueryable(Service.class).where((builder, root) -> builder.equal(root.get("id"), id)).getSingle(); + } - @Override - public void delete(Service item) { - this.getDatabaseService().delete(item); - } + @Override + public void delete(Service item) { + this.getDatabaseService().delete(item); + } - @Override - public QueryableList asQueryable() { - return this.getDatabaseService().getQueryable(Service.class); - } + @Override + public QueryableList asQueryable() { + return this.getDatabaseService().getQueryable(Service.class); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java index e399ea6f4..9a7e4ac9b 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDao.java @@ -1,7 +1,6 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Service; import eu.eudat.entities.UserDMP; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java index 7b8da3bea..9213ffc45 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java @@ -1,9 +1,7 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccess; -import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Service; import eu.eudat.entities.UserDMP; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java index 8fab000f0..5348127f5 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java @@ -1,15 +1,14 @@ package eu.eudat.dao.entities; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Service; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.UserInfoCriteria; import eu.eudat.queryable.QueryableList; +import java.util.UUID; + public interface UserInfoDao extends DatabaseAccessLayer { - QueryableList getWithCriteria(UserInfoCriteria criteria); + QueryableList getWithCriteria(UserInfoCriteria criteria); } \ No newline at end of file diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java index 7729e8e82..20b2ff259 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java @@ -1,17 +1,15 @@ package eu.eudat.dao.entities; -import java.util.Arrays; -import java.util.UUID; - import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; -import eu.eudat.entities.Organisation; import eu.eudat.entities.UserInfo; import eu.eudat.models.criteria.UserInfoCriteria; import eu.eudat.queryable.QueryableList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.UUID; + @Component("userInfoDao") public class UserInfoDaoImpl extends DatabaseAccess implements UserInfoDao { diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java index e4e8e8457..5d42da3f4 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java @@ -1,7 +1,6 @@ package eu.eudat.dao.entities; import eu.eudat.dao.DatabaseAccess; -import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.dao.databaselayer.service.DatabaseService; import eu.eudat.entities.UserInfo; import eu.eudat.entities.UserRole; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java index 48018b332..2b6f3ccbf 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java @@ -2,13 +2,12 @@ package eu.eudat.dao.entities.security; import eu.eudat.dao.DatabaseAccessLayer; import eu.eudat.entities.Credential; -import eu.eudat.entities.Dataset; import eu.eudat.models.login.Credentials; import java.util.UUID; -public interface CredentialDao extends DatabaseAccessLayer { +public interface CredentialDao extends DatabaseAccessLayer { Credential getLoggedInCredentials(Credentials credentials); } diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java index 0a9d51c06..8add130f0 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java @@ -3,7 +3,6 @@ package eu.eudat.dao.entities.security; import eu.eudat.dao.DatabaseAccess; import eu.eudat.dao.databaselayer.service.DatabaseService; import eu.eudat.entities.Credential; -import eu.eudat.entities.UserInfo; import eu.eudat.models.login.Credentials; import eu.eudat.queryable.QueryableList; import eu.eudat.security.validators.TokenValidatorFactoryImpl; diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java index 590178563..38416f5e5 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java @@ -1,13 +1,12 @@ package eu.eudat.dao.entities.security; import eu.eudat.dao.DatabaseAccessLayer; -import eu.eudat.entities.Credential; import eu.eudat.entities.UserToken; import java.util.UUID; -public interface UserTokenDao extends DatabaseAccessLayer { +public interface UserTokenDao extends DatabaseAccessLayer { UserToken createOrUpdate(UserToken item); diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java b/dmp-backend/src/main/java/eu/eudat/entities/Credential.java index e961e6413..ef22f8dba 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Credential.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Credential.java @@ -1,7 +1,5 @@ package eu.eudat.entities; -import org.hibernate.annotations.GenericGenerator; - import javax.persistence.*; import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java b/dmp-backend/src/main/java/eu/eudat/entities/DMP.java index ee276c7f3..29e8da2c3 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DMP.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMP.java @@ -1,17 +1,12 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.*; - -import javax.persistence.*; - -import eu.eudat.types.Authorities; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.io.Serializable; +import java.util.*; @Entity @@ -279,7 +274,7 @@ public class DMP implements Serializable, DataEntity { @Override public void update(DMP entity) { - this.associatedDmps = entity.associatedDmps ; + this.associatedDmps = entity.associatedDmps; this.label = entity.getLabel(); this.status = entity.getStatus(); this.created = entity.created; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java index 8affa74c8..2ee1288c9 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java @@ -1,71 +1,63 @@ package eu.eudat.entities; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; 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 com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; - @Entity -@Table(name="\"DMPOrganisation\"") +@Table(name = "\"DMPOrganisation\"") public class DMPOrganisation implements Serializable { - - @Id - @GeneratedValue + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - + private UUID id; + @Column(name = "\"DMP\"") - private UUID dmp; - + private UUID dmp; + @Column(name = "\"Organisation\"") - private UUID organisation; - - @Column(name = "\"Role\"") - private Integer role; + private UUID organisation; - public UUID getId() { - return id; - } + @Column(name = "\"Role\"") + private Integer role; - public void setId(UUID id) { - this.id = id; - } + public UUID getId() { + return id; + } - public UUID getDmp() { - return dmp; - } + public void setId(UUID id) { + this.id = id; + } - public void setDmp(UUID dmp) { - this.dmp = dmp; - } + public UUID getDmp() { + return dmp; + } - public UUID getOrganisation() { - return organisation; - } + public void setDmp(UUID dmp) { + this.dmp = dmp; + } - public void setOrganisation(UUID organisation) { - this.organisation = organisation; - } + public UUID getOrganisation() { + return organisation; + } - public Integer getRole() { - return role; - } + public void setOrganisation(UUID organisation) { + this.organisation = organisation; + } + + public Integer getRole() { + return role; + } + + public void setRole(Integer role) { + this.role = role; + } - public void setRole(Integer role) { - this.role = role; - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java index 77a879215..98e63bf75 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java @@ -1,121 +1,110 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.Date; +import java.util.Set; +import java.util.UUID; @Entity -@Table(name="\"DMPProfile\"") +@Table(name = "\"DMPProfile\"") public class DMPProfile { - - @Id - @GeneratedValue + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile") - private Set dmps; - - + private UUID id; + + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile") + private Set dmps; + + @Column(name = "\"Label\"") - private String label; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; + private String label; - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public Date getCreated() { - return created; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public void setCreated(Date created) { - this.created = created; - } + public Short getStatus() { + return status; + } - public Date getModified() { - return modified; - } + public void setStatus(Short status) { + this.status = status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - public UUID getId() { - return id; - } + public Date getCreated() { + return created; + } - public void setId(UUID id) { - this.id = id; - } - public String getLabel() { - return label; - } + public void setCreated(Date created) { + this.created = created; + } - public void setLabel(String label) { - this.label = label; - } - public String getDefinition() { - return definition; - } + public Date getModified() { + return modified; + } - public void setDefinition(String definition) { - this.definition = definition; - } - public Set getDmps() { - return dmps; - } + public void setModified(Date modified) { + this.modified = modified; + } + + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getDmps() { + return dmps; + } + + public void setDmps(Set dmps) { + this.dmps = dmps; + } - public void setDmps(Set dmps) { - this.dmps = dmps; - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java b/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java index f8a3c9b9d..83ab5730d 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java @@ -1,74 +1,65 @@ package eu.eudat.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.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.UUID; @Entity -@Table(name="\"DMPResearcher\"") +@Table(name = "\"DMPResearcher\"") public class DMPResearcher { - - @Id - @GeneratedValue + + @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") + private UUID id; + + @Type(type = "org.hibernate.type.PostgresUUIDType") @Column(name = "\"DMP\"") - private UUID dmp; - - @Type(type="org.hibernate.type.PostgresUUIDType") + private UUID dmp; + + @Type(type = "org.hibernate.type.PostgresUUIDType") @Column(name = "\"Researcher\"") - private UUID researcher; - - @Column(name = "\"Role\"") - private Integer role; - - public UUID getId() { - return id; - } + private UUID researcher; - public void setId(UUID id) { - this.id = id; - } + @Column(name = "\"Role\"") + private Integer role; - public UUID getDmp() { - return dmp; - } + public UUID getId() { + return id; + } - public void setDmp(UUID dmp) { - this.dmp = dmp; - } + public void setId(UUID id) { + this.id = id; + } - public UUID getResearcher() { - return researcher; - } + public UUID getDmp() { + return dmp; + } - public void setResearcher(UUID researcher) { - this.researcher = researcher; - } + public void setDmp(UUID dmp) { + this.dmp = dmp; + } - public Integer getRole() { - return role; - } + public UUID getResearcher() { + return researcher; + } + + public void setResearcher(UUID researcher) { + this.researcher = researcher; + } + + public Integer getRole() { + return role; + } + + public void setRole(Integer role) { + this.role = role; + } - public void setRole(Integer role) { - this.role = role; - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java index e4763f786..1be39124a 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DataEntity.java @@ -1,9 +1,5 @@ package eu.eudat.entities; -import javax.persistence.Tuple; -import java.util.Map; -import java.util.Set; - public interface DataEntity { void update(T entity); diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java b/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java index c60f1dc60..52c5247c8 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java @@ -1,167 +1,153 @@ package eu.eudat.entities; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Set; import java.util.UUID; -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.OneToMany; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; - @Entity -@Table(name="\"DataRepository\"") -public class DataRepository implements Serializable,DataEntity { - - @Id - @GeneratedValue +@Table(name = "\"DataRepository\"") +public class DataRepository implements Serializable, DataEntity { + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Abbreviation\"") - private String abbreviation; + private UUID id; - @Column(name = "\"Reference\"", nullable = false) - private String reference; - - @Column(name = "\"Uri\"") - private String uri; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; + @Column(name = "\"Label\"") + private String label; - - - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DatasetDataRepository\"", - joinColumns={@JoinColumn(name="\"DataRepository\"", referencedColumnName="\"ID\"")}, - inverseJoinColumns={@JoinColumn(name="\"Dataset\"", referencedColumnName="\"ID\"")} - ) + @Column(name = "\"Abbreviation\"") + private String abbreviation; + + @Column(name = "\"Reference\"", nullable = false) + private String reference; + + @Column(name = "\"Uri\"") + private String uri; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; + + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"DatasetDataRepository\"", + joinColumns = {@JoinColumn(name = "\"DataRepository\"", referencedColumnName = "\"ID\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"Dataset\"", referencedColumnName = "\"ID\"")} + ) private Set datasets; - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; + + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public Date getCreated() { - return created; - } + public Short getStatus() { + return status; + } - public void setCreated(Date created) { - this.created = created; - } + public void setStatus(Short status) { + this.status = status; + } - public Date getModified() { - return modified; - } + public Date getCreated() { + return created; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - - public UUID getId() { - return id; - } + public void setCreated(Date created) { + this.created = created; + } - public void setId(UUID id) { - this.id = id; - } - public String getLabel() { - return label; - } + public Date getModified() { + return modified; + } - public void setLabel(String label) { - this.label = label; - } - public String getAbbreviation() { - return abbreviation; - } + public void setModified(Date modified) { + this.modified = modified; + } - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - public String getReference() { - return reference; - } + public UUID getId() { + return id; + } - public void setReference(String reference) { - this.reference = reference; - } + public void setId(UUID id) { + this.id = id; + } - public String getUri() { - return uri; - } + public String getLabel() { + return label; + } - public void setUri(String uri) { - this.uri = uri; - } + public void setLabel(String label) { + this.label = label; + } - public String getDefinition() { - return definition; - } + public String getAbbreviation() { + return abbreviation; + } - public void setDefinition(String definition) { - this.definition = definition; - } + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } - public Set getDatasets() { - return datasets; - } + public String getReference() { + return reference; + } - public void setDatasets(Set datasets) { - this.datasets = datasets; - } + public void setReference(String reference) { + this.reference = reference; + } - @Override - public void update(DataRepository entity) { + public String getUri() { + return uri; + } - } + public void setUri(String uri) { + this.uri = uri; + } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getDatasets() { + return datasets; + } + + public void setDatasets(Set datasets) { + this.datasets = datasets; + } + + @Override + public void update(DataRepository entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java b/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java index 015d0d6a3..d8cae40c0 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Dataset.java @@ -1,18 +1,11 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.*; - -import javax.persistence.*; - -import eu.eudat.models.project.*; -import eu.eudat.models.project.Project; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.*; @Entity @Table(name = "\"Dataset\"") diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java index a825b8990..862f71548 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java @@ -7,9 +7,8 @@ import javax.persistence.*; import java.util.UUID; - @Entity -@Table(name="\"DatasetExternalDataset\"") +@Table(name = "\"DatasetExternalDataset\"") public class DatasetExternalDataset { @Id @@ -19,16 +18,16 @@ public class DatasetExternalDataset { private UUID id; - @Type(type="org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL + @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 + @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL @Column(name = "\"ExternalDataset\"", nullable = false) private UUID externalDataset; @Column(name = "\"Role\"") - private Integer role; + private Integer role; public UUID getId() { return id; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java index 564dac7d9..bdb5c79d4 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java @@ -1,153 +1,138 @@ package eu.eudat.entities; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Set; import java.util.UUID; -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.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; - @Entity -@Table(name="\"DatasetProfile\"") -public class DatasetProfile implements Serializable,DataEntity { - - @Id - @GeneratedValue +@Table(name = "\"DatasetProfile\"") +public class DatasetProfile implements Serializable, DataEntity { + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Column(name = "\"Label\"") - private String label; - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile") - private Set dataset; + private UUID id; - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) - private String definition; + @Column(name = "\"Label\"") + private String label; - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - @Column(name = "\"Description\"") - private String description; - - - public String getDescription() { - return description; - } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile") + private Set dataset; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) + private String definition; - public void setDescription(String description) { - this.description = description; - } - - - public Short getStatus() { - return status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Created\"") + private Date created; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); + + @Column(name = "\"Description\"") + private String description; - public Date getCreated() { - return created; - } + public String getDescription() { + return description; + } - public void setCreated(Date created) { - this.created = created; - } + public void setDescription(String description) { + this.description = description; + } - public Date getModified() { - return modified; - } + public Short getStatus() { + return status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } + public void setStatus(Short status) { + this.status = status; + } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } + public Date getCreated() { + return created; + } - - public Set getDataset() { - return dataset; - } - - public void setDataset(Set dataset) { - this.dataset = dataset; - } - - @Override - public String toString() { - return "DatasetProfileListingModel [id=" + id + ", label=" + label + ", dataset=" + dataset + ", definition=" + definition + "]"; - } + public void setCreated(Date created) { + this.created = created; + } - @Override - public void update(DatasetProfile entity) { + public Date getModified() { + return modified; + } - } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public void setModified(Date modified) { + this.modified = modified; + } + + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + + public Set getDataset() { + return dataset; + } + + public void setDataset(Set dataset) { + this.dataset = dataset; + } + + @Override + public String toString() { + return "DatasetProfileListingModel [id=" + id + ", label=" + label + ", dataset=" + dataset + ", definition=" + definition + "]"; + } + + + @Override + public void update(DatasetProfile entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java index 433d1790a..42fd02b92 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java @@ -1,68 +1,57 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.io.Serializable; +import java.util.UUID; @Entity -@Table(name="\"DatasetProfileRuleset\"") +@Table(name = "\"DatasetProfileRuleset\"") public class DatasetProfileRuleset implements Serializable { - - @Id - @GeneratedValue + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; + private UUID id; - - @Column(name = "\"Label\"") - private String label; - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) - private String definition; + @Column(name = "\"Label\"") + private String label; - public UUID getId() { - return id; - } + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) + private String definition; - public void setId(UUID id) { - this.id = id; - } + public UUID getId() { + return id; + } - public String getLabel() { - return label; - } + public void setId(UUID id) { + this.id = id; + } - public void setLabel(String label) { - this.label = label; - } + public String getLabel() { + return label; + } - public String getDefinition() { + public void setLabel(String label) { + this.label = label; + } + + public String getDefinition() { // return XML.toJSONObject(definition).toString(); //return definition as json - return definition; - } + return definition; + } - public void setDefinition(String definition) { + public void setDefinition(String definition) { // this.definition = XML.toString(definition); //if definition is in json - this.definition = definition; - } - + this.definition = definition; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java index e1656f7af..38b32290d 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java @@ -1,69 +1,57 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.UUID; @Entity -@Table(name="\"DatasetProfileViewstyle\"") +@Table(name = "\"DatasetProfileViewstyle\"") public class DatasetProfileViewstyle { - - @Id - @GeneratedValue + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; + private UUID id; - - @Column(name = "\"Label\"") - private String label; - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) - private String definition; + @Column(name = "\"Label\"") + private String label; - public UUID getId() { - return id; - } + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) + private String definition; - public void setId(UUID id) { - this.id = id; - } + public UUID getId() { + return id; + } - public String getLabel() { - return label; - } + public void setId(UUID id) { + this.id = id; + } - public void setLabel(String label) { - this.label = label; - } + public String getLabel() { + return label; + } - public String getDefinition() { + public void setLabel(String label) { + this.label = label; + } + + public String getDefinition() { // return XML.toJSONObject(definition).toString(); //return definition as json - return definition; - } + return definition; + } - public void setDefinition(String definition) { + public void setDefinition(String definition) { // this.definition = XML.toString(definition); //if definition is in json - this.definition = definition; - } + this.definition = definition; + } + - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java index dbb08a9b3..9628ac2d0 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java @@ -1,75 +1,67 @@ package eu.eudat.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.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.io.Serializable; +import java.util.UUID; @Entity -@Table(name="\"DatasetRegistry\"") +@Table(name = "\"DatasetRegistry\"") public class DatasetRegistry implements Serializable { - - @Id - @GeneratedValue + + @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 = "\"Registry\"", nullable = false) - private UUID registry; + private UUID id; - @Column(name = "\"Role\"") - private Integer role; - public UUID getId() { - return id; - } + @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL + @Column(name = "\"Dataset\"", nullable = false) + private UUID dataset; - public void setId(UUID id) { - this.id = id; - } + @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL + @Column(name = "\"Registry\"", nullable = false) + private UUID registry; - public UUID getDataset() { - return dataset; - } + @Column(name = "\"Role\"") + private Integer role; - public void setDataset(UUID dataset) { - this.dataset = dataset; - } + public UUID getId() { + return id; + } - public UUID getRegistry() { - return registry; - } + public void setId(UUID id) { + this.id = id; + } - public void setRegistry(UUID registry) { - this.registry = registry; - } + public UUID getDataset() { + return dataset; + } + + public void setDataset(UUID dataset) { + this.dataset = dataset; + } + + public UUID getRegistry() { + return registry; + } + + public void setRegistry(UUID registry) { + this.registry = registry; + } + + public Integer getRole() { + return role; + } + + public void setRole(Integer role) { + this.role = role; + } - public Integer getRole() { - return role; - } - public void setRole(Integer role) { - this.role = role; - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java b/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java index ed7171dab..872abb822 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java @@ -1,75 +1,67 @@ package eu.eudat.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.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.io.Serializable; +import java.util.UUID; @Entity -@Table(name="\"DatasetService\"") +@Table(name = "\"DatasetService\"") public class DatasetService implements Serializable { - - @Id - @GeneratedValue + + @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 = "\"Service\"", nullable = false) - private UUID service; + private UUID id; - @Column(name = "\"Role\"") - private Integer role; - public UUID getId() { - return id; - } + @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL + @Column(name = "\"Dataset\"", nullable = false) + private UUID dataset; - public void setId(UUID id) { - this.id = id; - } + @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL + @Column(name = "\"Service\"", nullable = false) + private UUID service; - public UUID getDataset() { - return dataset; - } + @Column(name = "\"Role\"") + private Integer role; - public void setDataset(UUID dataset) { - this.dataset = dataset; - } + public UUID getId() { + return id; + } - public UUID getService() { - return service; - } + public void setId(UUID id) { + this.id = id; + } - public void setService(UUID service) { - this.service = service; - } + public UUID getDataset() { + return dataset; + } + + public void setDataset(UUID dataset) { + this.dataset = dataset; + } + + public UUID getService() { + return service; + } + + public void setService(UUID service) { + this.service = service; + } + + public Integer getRole() { + return role; + } + + public void setRole(Integer role) { + this.role = role; + } - public Integer getRole() { - return role; - } - public void setRole(Integer role) { - this.role = role; - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java b/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java index 42a85d7b7..334c07c22 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/ExternalDataset.java @@ -1,7 +1,5 @@ package eu.eudat.entities; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; @@ -11,8 +9,8 @@ import java.util.UUID; @Entity -@Table(name="\"ExternalDataset\"") -public class ExternalDataset implements DataEntity{ +@Table(name = "\"ExternalDataset\"") +public class ExternalDataset implements DataEntity { @Id @GeneratedValue @@ -36,9 +34,9 @@ public class ExternalDataset implements DataEntity{ private Date modified; @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DatasetExternalDataset\"", - joinColumns={@JoinColumn(name="\"ExternalDataset\"", referencedColumnName="\"Id\"")}, - inverseJoinColumns={@JoinColumn(name="\"Dataset\"", referencedColumnName="\"ID\"")} + @JoinTable(name = "\"DatasetExternalDataset\"", + joinColumns = {@JoinColumn(name = "\"ExternalDataset\"", referencedColumnName = "\"Id\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"Dataset\"", referencedColumnName = "\"ID\"")} ) private Set datasets; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java b/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java index 00726f3cd..57764e202 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Invitation.java @@ -4,13 +4,12 @@ import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; import javax.persistence.*; -import java.util.Date; import java.util.UUID; @Entity -@Table(name="\"Invitation\"") -public class Invitation implements DataEntity{ +@Table(name = "\"Invitation\"") +public class Invitation implements DataEntity { @Id @GeneratedValue @@ -35,7 +34,7 @@ public class Invitation implements DataEntity{ @Column(name = "\"AcceptedInvitation\"", nullable = false) private boolean acceptedInvitation; - @Type(type="eu.eudat.typedefinition.XMLType") + @Type(type = "eu.eudat.typedefinition.XMLType") @Column(name = "\"Properties\"", columnDefinition = "xml", nullable = true) private String properties; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java b/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java index 9588f3d9f..910005dc5 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Organisation.java @@ -1,170 +1,157 @@ package eu.eudat.entities; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.io.Serializable; import java.util.Date; import java.util.Set; import java.util.UUID; -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.OneToMany; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; - @Entity -@Table(name="\"Organisation\"") -public class Organisation implements Serializable,DataEntity { - - @Id - @GeneratedValue +@Table(name = "\"Organisation\"") +public class Organisation implements Serializable, DataEntity { + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Abbreviation\"") - private String abbreviation; + private UUID id; - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) - private String reference; - - @Column(name = "\"Uri\"") - private String uri; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; + @Column(name = "\"Label\"") + private String label; - - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DMPOrganisation\"", - joinColumns={@JoinColumn(name="\"Organisation\"", referencedColumnName="\"ID\"")}, - inverseJoinColumns={@JoinColumn(name="\"DMP\"", referencedColumnName="\"ID\"")} - ) + @Column(name = "\"Abbreviation\"") + private String abbreviation; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) + private String reference; + + @Column(name = "\"Uri\"") + private String uri; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; + + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"DMPOrganisation\"", + joinColumns = {@JoinColumn(name = "\"Organisation\"", referencedColumnName = "\"ID\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"DMP\"", referencedColumnName = "\"ID\"")} + ) private Set dMPs; - - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public Date getCreated() { - return created; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public void setCreated(Date created) { - this.created = created; - } + public Short getStatus() { + return status; + } - public Date getModified() { - return modified; - } + public void setStatus(Short status) { + this.status = status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getAbbreviation() { - return abbreviation; - } - - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } - - public Set getdMPs() { - return dMPs; - } - - public void setdMPs(Set dMPs) { - this.dMPs = dMPs; - } + public Date getCreated() { + return created; + } - @Override - public void update(Organisation entity) { + public void setCreated(Date created) { + this.created = created; + } - } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public Date getModified() { + return modified; + } + + + public void setModified(Date modified) { + this.modified = modified; + } + + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getdMPs() { + return dMPs; + } + + public void setdMPs(Set dMPs) { + this.dMPs = dMPs; + } + + + @Override + public void update(Organisation entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Project.java b/dmp-backend/src/main/java/eu/eudat/entities/Project.java index 8d9f6ea6f..1d9c0fd18 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Project.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Project.java @@ -1,267 +1,254 @@ package eu.eudat.entities; -import java.io.Serializable; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.Date; import java.util.Set; import java.util.UUID; -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.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; - @Entity -@Table(name="\"Project\"") +@Table(name = "\"Project\"") public class Project implements DataEntity { - public enum Status { - ACTIVE((short) 1), INACTIVE((short) 0), DELETED((short) 99); + public enum Status { + ACTIVE((short) 1), INACTIVE((short) 0), DELETED((short) 99); - private short value; + private short value; - private Status(short value) { - this.value = value; - } + private Status(short value) { + this.value = value; + } - public short getValue() { - return value; - } + public short getValue() { + return value; + } - public static Status fromInteger(int value) { - switch (value) { - case 0: - return INACTIVE; - case 1: - return ACTIVE; - case 99: - return DELETED; - default: - throw new RuntimeException("Unsupported Project Status"); - } - } - } - - @Id - @GeneratedValue + public static Status fromInteger(int value) { + switch (value) { + case 0: + return INACTIVE; + case 1: + return ACTIVE; + case 99: + return DELETED; + default: + throw new RuntimeException("Unsupported Project Status"); + } + } + } + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - - @OneToMany(mappedBy = "project") - private Set dmps; - - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Abbreviation\"") - private String abbreviation; + private UUID id; + + + @OneToMany(mappedBy = "project") + private Set dmps; + + + @Column(name = "\"Label\"") + private String label; + + @Column(name = "\"Abbreviation\"") + private String abbreviation; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) + private String reference; + + @Column(name = "\"Uri\"") + private String uri; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; + + + @Column(name = "\"StartDate\"", nullable = false) + private Date startdate = null; + + @Column(name = "\"EndDate\"", nullable = false) + private Date enddate = null; + + + @Column(name = "\"Status\"", nullable = false) + private Short status; + - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) - private String reference; - - @Column(name = "\"Uri\"") - private String uri; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; - - - @Column(name = "\"StartDate\"", nullable = false) - private Date startdate = null; - - @Column(name = "\"EndDate\"", nullable = false) - private Date enddate = null; - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "\"CreationUser\"", nullable = true) - private UserInfo creationUser; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - @Column(name = "\"Description\"") - private String description; - - - public String getDescription() { - return description; - } + private UserInfo creationUser; - public void setDescription(String description) { - this.description = description; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); + + @Column(name = "\"Description\"") + private String description; - public Short getStatus() { - return status; - } + public String getDescription() { + return description; + } - public void setStatus(Short status) { - this.status = status; - } + public void setDescription(String description) { + this.description = description; + } - public Date getCreated() { - return created; - } + public Short getStatus() { + return status; + } - public void setCreated(Date created) { - this.created = created; - } + public void setStatus(Short status) { + this.status = status; + } - public Date getModified() { - return modified; - } + public Date getCreated() { + return created; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - public Date getStartdate() { - return startdate; - } + public void setCreated(Date created) { + this.created = created; + } - public void setStartdate(Date startdate) { - this.startdate = startdate; - } + public Date getModified() { + return modified; + } - public Date getEnddate() { - return enddate; - } + public void setModified(Date modified) { + this.modified = modified; + } - public void setEnddate(Date enddate) { - this.enddate = enddate; - } + public Date getStartdate() { + return startdate; + } - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getAbbreviation() { - return abbreviation; - } - - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } + public void setStartdate(Date startdate) { + this.startdate = startdate; + } - public Set getDmps() { - return dmps; - } - - public void setDmps(Set dmps) { - this.dmps = dmps; - } + public Date getEnddate() { + return enddate; + } - public UserInfo getCreationUser() { - return creationUser; - } + public void setEnddate(Date enddate) { + this.enddate = enddate; + } - public void setCreationUser(UserInfo creationUser) { - this.creationUser = creationUser; - } + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } - public String toString() { - try { - return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(this).replace("\"", """); - } catch (JsonProcessingException e) { - return ""; - } - } + public Set getDmps() { + return dmps; + } - @Override - public void update(Project entity) { - this.description = entity.getDescription(); - this.label = entity.getLabel(); - this.abbreviation = entity.getAbbreviation(); - this.created = entity.getCreated(); - this.definition = entity.getDefinition(); - this.dmps = entity.getDmps(); - this.enddate = entity.getEnddate(); - //this.creationUser = entity.getCreationUser(); //TODO - } + public void setDmps(Set dmps) { + this.dmps = dmps; + } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + + public UserInfo getCreationUser() { + return creationUser; + } + + + public void setCreationUser(UserInfo creationUser) { + this.creationUser = creationUser; + } + + + public String toString() { + try { + return new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT).writeValueAsString(this).replace("\"", """); + } catch (JsonProcessingException e) { + return ""; + } + } + + @Override + public void update(Project entity) { + this.description = entity.getDescription(); + this.label = entity.getLabel(); + this.abbreviation = entity.getAbbreviation(); + this.created = entity.getCreated(); + this.definition = entity.getDefinition(); + this.dmps = entity.getDmps(); + this.enddate = entity.getEnddate(); + //this.creationUser = entity.getCreationUser(); //TODO + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java b/dmp-backend/src/main/java/eu/eudat/entities/Registry.java index 097b9589b..57a1a882b 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Registry.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Registry.java @@ -1,169 +1,155 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; -import java.util.UUID; - -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.OneToMany; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.Date; +import java.util.Set; +import java.util.UUID; @Entity -@Table(name="\"Registry\"") +@Table(name = "\"Registry\"") public class Registry implements DataEntity { - - @Id - @GeneratedValue + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Abbreviation\"") - private String abbreviation; + private UUID id; - @Column(name = "\"Reference\"", nullable = true) - private String reference; - - @Column(name = "\"Uri\"") - private String uri; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; + @Column(name = "\"Label\"") + private String label; - - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DatasetRegistry\"", - joinColumns={@JoinColumn(name="\"Registry\"", referencedColumnName="\"ID\"")}, - inverseJoinColumns={@JoinColumn(name="\"Dataset\"", referencedColumnName="\"ID\"")} - ) + @Column(name = "\"Abbreviation\"") + private String abbreviation; + + @Column(name = "\"Reference\"", nullable = true) + private String reference; + + @Column(name = "\"Uri\"") + private String uri; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; + + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"DatasetRegistry\"", + joinColumns = {@JoinColumn(name = "\"Registry\"", referencedColumnName = "\"ID\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"Dataset\"", referencedColumnName = "\"ID\"")} + ) private Set datasets; - - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public Date getCreated() { - return created; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public void setCreated(Date created) { - this.created = created; - } + public Short getStatus() { + return status; + } - public Date getModified() { - return modified; - } + public void setStatus(Short status) { + this.status = status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getAbbreviation() { - return abbreviation; - } - - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } - - public Set getDatasets() { - return datasets; - } - - public void setDatasets(Set datasets) { - this.datasets = datasets; - } + public Date getCreated() { + return created; + } - @Override - public void update(Registry entity) { + public void setCreated(Date created) { + this.created = created; + } - } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public Date getModified() { + return modified; + } + + + public void setModified(Date modified) { + this.modified = modified; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getDatasets() { + return datasets; + } + + public void setDatasets(Set datasets) { + this.datasets = datasets; + } + + + @Override + public void update(Registry entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java b/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java index 439b4d4dd..de296f2f9 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Researcher.java @@ -1,169 +1,156 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; -import java.util.UUID; - -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.OneToMany; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.Date; +import java.util.Set; +import java.util.UUID; @Entity -@Table(name="\"Researcher\"") +@Table(name = "\"Researcher\"") public class Researcher implements DataEntity { - - @Id - @GeneratedValue + + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Uri\"") - private String uri; + private UUID id; - @Column(name = "\"PrimaryEmail\"") - private String primaryEmail; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) - private String definition; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) - private String reference; + @Column(name = "\"Label\"") + private String label; - - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DMPResearcher\"", - joinColumns={@JoinColumn(name="\"Researcher\"", referencedColumnName="\"ID\"")}, - inverseJoinColumns={@JoinColumn(name="\"DMP\"", referencedColumnName="\"ID\"")} - ) + @Column(name = "\"Uri\"") + private String uri; + + @Column(name = "\"PrimaryEmail\"") + private String primaryEmail; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true) + private String definition; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true) + private String reference; + + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"DMPResearcher\"", + joinColumns = {@JoinColumn(name = "\"Researcher\"", referencedColumnName = "\"ID\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"DMP\"", referencedColumnName = "\"ID\"")} + ) private Set dMPs; - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public Date getCreated() { - return created; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public void setCreated(Date created) { - this.created = created; - } + public Short getStatus() { + return status; + } - public Date getModified() { - return modified; - } + public void setStatus(Short status) { + this.status = status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getPrimaryEmail() { - return primaryEmail; - } - - public void setPrimaryEmail(String primaryEmail) { - this.primaryEmail = primaryEmail; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } - - public Set getdMPs() { - return dMPs; - } - - public void setdMPs(Set dMPs) { - this.dMPs = dMPs; - } + public Date getCreated() { + return created; + } - @Override - public void update(Researcher entity) { + public void setCreated(Date created) { + this.created = created; + } - } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public Date getModified() { + return modified; + } + + + public void setModified(Date modified) { + this.modified = modified; + } + + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getPrimaryEmail() { + return primaryEmail; + } + + public void setPrimaryEmail(String primaryEmail) { + this.primaryEmail = primaryEmail; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getdMPs() { + return dMPs; + } + + public void setdMPs(Set dMPs) { + this.dMPs = dMPs; + } + + + @Override + public void update(Researcher entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/Service.java b/dmp-backend/src/main/java/eu/eudat/entities/Service.java index e27045f60..3a8f16ff1 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/Service.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/Service.java @@ -1,169 +1,156 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; -import java.util.UUID; - -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.OneToMany; -import javax.persistence.Table; - import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import javax.persistence.*; +import java.util.Date; +import java.util.Set; +import java.util.UUID; @Entity -@Table(name="\"Service\"") +@Table(name = "\"Service\"") public class Service implements DataEntity { - @Id - @GeneratedValue + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - - @Column(name = "\"Label\"") - private String label; - - @Column(name = "\"Abbreviation\"") - private String abbreviation; + private UUID id; - @Column(name = "\"Reference\"", nullable = true) - private String reference; - - @Column(name = "\"Uri\"") - private String uri; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) - private String definition; - - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"DatasetService\"", - joinColumns={@JoinColumn(name="\"Service\"", referencedColumnName="\"ID\"")}, - inverseJoinColumns={@JoinColumn(name="\"Dataset\"", referencedColumnName="\"ID\"")} - ) + @Column(name = "\"Label\"") + private String label; + + @Column(name = "\"Abbreviation\"") + private String abbreviation; + + @Column(name = "\"Reference\"", nullable = true) + private String reference; + + @Column(name = "\"Uri\"") + private String uri; + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false) + private String definition; + + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"DatasetService\"", + joinColumns = {@JoinColumn(name = "\"Service\"", referencedColumnName = "\"ID\"")}, + inverseJoinColumns = {@JoinColumn(name = "\"Dataset\"", referencedColumnName = "\"ID\"")} + ) private Set datasets; - - - @Column(name = "\"Status\"", nullable = false) - private Short status; - - - @Column(name = "\"Created\"") - private Date created = null; - - @Column(name = "\"Modified\"") - private Date modified = new Date(); - - - public Short getStatus() { - return status; - } - public void setStatus(Short status) { - this.status = status; - } + @Column(name = "\"Status\"", nullable = false) + private Short status; - public Date getCreated() { - return created; - } + @Column(name = "\"Created\"") + private Date created = null; + + @Column(name = "\"Modified\"") + private Date modified = new Date(); - public void setCreated(Date created) { - this.created = created; - } + public Short getStatus() { + return status; + } - public Date getModified() { - return modified; - } + public void setStatus(Short status) { + this.status = status; + } - public void setModified(Date modified) { - this.modified = modified; - } - - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public String getAbbreviation() { - return abbreviation; - } - - public void setAbbreviation(String abbreviation) { - this.abbreviation = abbreviation; - } - - public String getReference() { - return reference; - } - - public void setReference(String reference) { - this.reference = reference; - } - - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } - - public Set getDatasets() { - return datasets; - } - - public void setDatasets(Set datasets) { - this.datasets = datasets; - } + public Date getCreated() { + return created; + } - @Override - public void update(Service entity) { + public void setCreated(Date created) { + this.created = created; + } - } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + public Date getModified() { + return modified; + } + + + public void setModified(Date modified) { + this.modified = modified; + } + + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getAbbreviation() { + return abbreviation; + } + + public void setAbbreviation(String abbreviation) { + this.abbreviation = abbreviation; + } + + public String getReference() { + return reference; + } + + public void setReference(String reference) { + this.reference = reference; + } + + public String getUri() { + return uri; + } + + public void setUri(String uri) { + this.uri = uri; + } + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public Set getDatasets() { + return datasets; + } + + public void setDatasets(Set datasets) { + this.datasets = datasets; + } + + + @Override + public void update(Service entity) { + + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java b/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java index 2e61470f4..ab145e910 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java @@ -1,23 +1,16 @@ package eu.eudat.entities; -import java.io.Serializable; -import java.util.UUID; +import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; - -import eu.eudat.types.ApiMessageCode; -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import java.util.UUID; @Entity @Table(name = "\"UserDMP\"") public class UserDMP implements DataEntity { public enum UserDMPRoles { - OWNER(0) , USER(1); + OWNER(0), USER(1); private Integer value; @@ -49,11 +42,11 @@ public class UserDMP implements DataEntity { private UUID id; @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name="usr") + @JoinColumn(name = "usr") private UserInfo user; @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name="dmp") + @JoinColumn(name = "dmp") private DMP dmp; @Column(name = "role") diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java b/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java index d577907f9..58e2ddfbc 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java @@ -1,184 +1,179 @@ package eu.eudat.entities; -import java.io.Serializable; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.Date; import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.*; - -import org.hibernate.annotations.GenericGenerator; -import org.hibernate.annotations.Type; - -import com.fasterxml.jackson.annotation.JsonIdentityInfo; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; - @Entity -@Table(name="\"UserInfo\"") +@Table(name = "\"UserInfo\"") @NamedEntityGraphs({ - @NamedEntityGraph( - name = "userInfo", - attributeNodes = {@NamedAttributeNode("userRoles"), @NamedAttributeNode("credentials")}) + @NamedEntityGraph( + name = "userInfo", + attributeNodes = {@NamedAttributeNode("userRoles"), @NamedAttributeNode("credentials")}) }) -public class UserInfo implements DataEntity{ +public class UserInfo implements DataEntity { - @Id - @GeneratedValue + @Id + @GeneratedValue @GenericGenerator(name = "uuid2", strategy = "uuid2") @Column(name = "id", updatable = false, nullable = false, columnDefinition = "BINARY(16)") - private UUID id; - - - @Column(name = "email", nullable = false) - private String email = null; - - @Column(name = "authorization_level", nullable = false) - private Short authorization_level; //0 admin, 1 user - - @Column(name = "usertype", nullable = false) - private Short usertype; // 0 internal, 1 external - - @Column(name = "verified_email", nullable = true) - private Boolean verified_email = null; - - @Column(name = "name", nullable = true) - private String name = null; - - - @Column(name = "created", nullable = false) - private Date created = null; - - - @Column(name = "lastloggedin", nullable = true) - private Date lastloggedin = null; + private UUID id; - - @Type(type="eu.eudat.typedefinition.XMLType") - @Column(name = "additionalinfo", columnDefinition = "xml", nullable = true) - private String additionalinfo; - @OneToMany(fetch = FetchType.LAZY) - @JoinTable(name="\"UserDMP\"", - joinColumns={@JoinColumn(name="usr", referencedColumnName="id")}, - inverseJoinColumns={@JoinColumn(name="dmp", referencedColumnName="\"ID\"")} - ) + @Column(name = "email", nullable = false) + private String email = null; + + @Column(name = "authorization_level", nullable = false) + private Short authorization_level; //0 admin, 1 user + + @Column(name = "usertype", nullable = false) + private Short usertype; // 0 internal, 1 external + + @Column(name = "verified_email", nullable = true) + private Boolean verified_email = null; + + @Column(name = "name", nullable = true) + private String name = null; + + + @Column(name = "created", nullable = false) + private Date created = null; + + + @Column(name = "lastloggedin", nullable = true) + private Date lastloggedin = null; + + + @Type(type = "eu.eudat.typedefinition.XMLType") + @Column(name = "additionalinfo", columnDefinition = "xml", nullable = true) + private String additionalinfo; + + @OneToMany(fetch = FetchType.LAZY) + @JoinTable(name = "\"UserDMP\"", + joinColumns = {@JoinColumn(name = "usr", referencedColumnName = "id")}, + inverseJoinColumns = {@JoinColumn(name = "dmp", referencedColumnName = "\"ID\"")} + ) private Set dmps; - @OneToMany(mappedBy="userInfo",fetch = FetchType.LAZY) - private Set credentials = new HashSet<>(); + @OneToMany(mappedBy = "userInfo", fetch = FetchType.LAZY) + private Set credentials = new HashSet<>(); - @OneToMany(mappedBy="userInfo",fetch = FetchType.LAZY) - private Set userRoles = new HashSet<>(); - - public Set getDmps() { - return dmps; - } + @OneToMany(mappedBy = "userInfo", fetch = FetchType.LAZY) + private Set userRoles = new HashSet<>(); - public void setDmps(Set dmps) { - this.dmps = dmps; - } + public Set getDmps() { + return dmps; + } - public UUID getId() { - return id; - } + public void setDmps(Set dmps) { + this.dmps = dmps; + } - public void setId(UUID id) { - this.id = id; - } + public UUID getId() { + return id; + } - public Date getCreated() { - return created; - } + public void setId(UUID id) { + this.id = id; + } - public void setCreated(Date created) { - this.created = created; - } + public Date getCreated() { + return created; + } - public Date getLastloggedin() { - return lastloggedin; - } + public void setCreated(Date created) { + this.created = created; + } - public void setLastloggedin(Date lastloggedin) { - this.lastloggedin = lastloggedin; - } + public Date getLastloggedin() { + return lastloggedin; + } - public String getEmail() { - return email; - } + public void setLastloggedin(Date lastloggedin) { + this.lastloggedin = lastloggedin; + } - public void setEmail(String email) { - this.email = email; - } + public String getEmail() { + return email; + } - public Short getAuthorization_level() { - return authorization_level; - } + public void setEmail(String email) { + this.email = email; + } - public void setAuthorization_level(Short authorization_level) { - this.authorization_level = authorization_level; - } + public Short getAuthorization_level() { + return authorization_level; + } - public Short getUsertype() { - return usertype; - } + public void setAuthorization_level(Short authorization_level) { + this.authorization_level = authorization_level; + } - public void setUsertype(Short usertype) { - this.usertype = usertype; - } + public Short getUsertype() { + return usertype; + } - public Boolean getVerified_email() { - return verified_email; - } + public void setUsertype(Short usertype) { + this.usertype = usertype; + } - public void setVerified_email(Boolean verified_email) { - this.verified_email = verified_email; - } + public Boolean getVerified_email() { + return verified_email; + } - public String getName() { - return name; - } + public void setVerified_email(Boolean verified_email) { + this.verified_email = verified_email; + } - public void setName(String name) { - this.name = name; - } + public String getName() { + return name; + } - public String getAdditionalinfo() { - return additionalinfo; - } + public void setName(String name) { + this.name = name; + } - public void setAdditionalinfo(String additionalinfo) { - this.additionalinfo = additionalinfo; - } + public String getAdditionalinfo() { + return additionalinfo; + } - public Set getCredentials() { - return credentials; - } + public void setAdditionalinfo(String additionalinfo) { + this.additionalinfo = additionalinfo; + } - public void setCredentials(Set credentials) { - this.credentials = credentials; - } + public Set getCredentials() { + return credentials; + } - public Set getUserRoles() { - return userRoles; - } + public void setCredentials(Set credentials) { + this.credentials = credentials; + } - public void setUserRoles(Set userRoles) { - this.userRoles = userRoles; - } + public Set getUserRoles() { + return userRoles; + } - @Override - public void update(UserInfo entity) { - this.name = entity.getName(); - this.email = entity.getEmail(); - this.additionalinfo = entity.getAdditionalinfo(); - this.lastloggedin = entity.getLastloggedin(); - this.userRoles = entity.getUserRoles(); - } + public void setUserRoles(Set userRoles) { + this.userRoles = userRoles; + } - @Override - public Object[] getKeys() { - return new UUID[]{this.id == null ? null : this.id}; - } + @Override + public void update(UserInfo entity) { + this.name = entity.getName(); + this.email = entity.getEmail(); + this.additionalinfo = entity.getAdditionalinfo(); + this.lastloggedin = entity.getLastloggedin(); + this.userRoles = entity.getUserRoles(); + } + + @Override + public Object[] getKeys() { + return new UUID[]{this.id == null ? null : this.id}; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java b/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java index ef9f9631d..f63e8d4e6 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserRole.java @@ -3,7 +3,6 @@ package eu.eudat.entities; import org.hibernate.annotations.GenericGenerator; import javax.persistence.*; -import java.util.Date; import java.util.UUID; diff --git a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java b/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java index ce6be8419..d53b68d3a 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/UserToken.java @@ -6,8 +6,8 @@ import java.util.UUID; @Entity -@Table(name="\"UserToken\"") -public class UserToken implements DataEntity{ +@Table(name = "\"UserToken\"") +public class UserToken implements DataEntity { @Id @Column(name = "\"Token\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)") diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java index 85b9bfd94..0b9ac753f 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/DatabaseViewStyleDefinition.java @@ -2,6 +2,6 @@ package eu.eudat.entities.xmlmodels.datasetprofiledefinition; import eu.eudat.utilities.DatabaseDefinition; -public interface DatabaseViewStyleDefinition extends DatabaseDefinition{ +public interface DatabaseViewStyleDefinition extends DatabaseDefinition { } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java index 48f91df17..09a088c8a 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java @@ -1,147 +1,155 @@ package eu.eudat.entities.xmlmodels.datasetprofiledefinition; import eu.eudat.models.components.commons.DefaultValue; -import org.w3c.dom.Document; -import org.w3c.dom.Element; import eu.eudat.models.components.commons.ViewStyle; import eu.eudat.models.components.commons.Visibility; import eu.eudat.models.components.commons.datafield.FieldData; import eu.eudat.utilities.XmlSerializable; import eu.eudat.utilities.builders.ModelBuilder; import eu.eudat.utilities.builders.XmlBuilder; +import org.w3c.dom.Document; +import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import java.util.LinkedList; import java.util.List; -public class Field implements DatabaseViewStyleDefinition,XmlSerializable{ - private String id; - private int ordinal; - private ViewStyle viewStyle; - private DefaultValue defaultValue; - private Visibility visible; - private FieldData data; - private List validations; +public class Field implements DatabaseViewStyleDefinition, XmlSerializable { + private String id; + private int ordinal; + private ViewStyle viewStyle; + private DefaultValue defaultValue; + private Visibility visible; + private FieldData data; + private List validations; - 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 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 String getId() { + return id; + } - public DefaultValue getDefaultValue() { - return defaultValue; - } + public void setId(String id) { + this.id = id; + } - public void setDefaultValue(DefaultValue defaultValue) { - this.defaultValue = defaultValue; - } + public int getOrdinal() { + return ordinal; + } - public Visibility getVisible() { - return visible; - } - public void setVisible(Visibility visible) { - this.visible = visible; - } + public void setOrdinal(int ordinal) { + this.ordinal = ordinal; + } - public List getValidations() { - return validations; - } + public ViewStyle getViewStyle() { + return viewStyle; + } - public void setValidations(List validations) { - this.validations = validations; - } + public void setViewStyle(ViewStyle viewStyle) { + this.viewStyle = viewStyle; + } - @Override - public Element toXml(Document doc) { - Element rootElement = doc.createElement("field"); - rootElement.setAttribute("id", this.id); - rootElement.setAttribute("ordinal", ""+this.ordinal); + public FieldData getData() { + return data; + } - Element viewStyle = doc.createElement("viewStyle"); - viewStyle.setAttribute("renderstyle", this.viewStyle.getRenderStyle()); - viewStyle.setAttribute("cssClass", this.viewStyle.getCssClass()); + public void setData(FieldData data) { + this.data = data; + } - Element visibility = this.visible.toXml(doc); + public DefaultValue getDefaultValue() { + return defaultValue; + } - Element defaultValue = doc.createElement("defaultValue"); - defaultValue.setAttribute("type",this.defaultValue.getType()); - defaultValue.setAttribute("value",this.defaultValue.getValue()); + public void setDefaultValue(DefaultValue defaultValue) { + this.defaultValue = defaultValue; + } - Element validations = doc.createElement("validations"); - for(eu.eudat.models.admin.components.datasetprofile.Field.ValidationType validationType: this.validations){ - Element validation = doc.createElement("validation"); - validation.setAttribute("type",""+validationType.getValue()); - validations.appendChild(validation); - } + public Visibility getVisible() { + return visible; + } - rootElement.appendChild(validations); - rootElement.appendChild(defaultValue); - rootElement.appendChild(visibility); - rootElement.appendChild(viewStyle); - 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")); + public void setVisible(Visibility visible) { + this.visible = visible; + } - this.viewStyle = new ViewStyle(); - Element viewStyle = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "viewStyle"); + public List getValidations() { + return validations; + } - this.viewStyle.setRenderStyle(viewStyle.getAttribute("renderstyle")); - this.viewStyle.setCssClass(viewStyle.getAttribute("cssClass")); + public void setValidations(List validations) { + this.validations = validations; + } - Element visibility = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "visible"); + @Override + public Element toXml(Document doc) { + Element rootElement = doc.createElement("field"); + rootElement.setAttribute("id", this.id); + rootElement.setAttribute("ordinal", "" + this.ordinal); - this.visible = new Visibility().fromXml(visibility); + Element viewStyle = doc.createElement("viewStyle"); + viewStyle.setAttribute("renderstyle", this.viewStyle.getRenderStyle()); + viewStyle.setAttribute("cssClass", this.viewStyle.getCssClass()); - Element dataElement = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "data"); + Element visibility = this.visible.toXml(doc); - Element defaultValue = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "defaultValue"); + Element defaultValue = doc.createElement("defaultValue"); + defaultValue.setAttribute("type", this.defaultValue.getType()); + defaultValue.setAttribute("value", this.defaultValue.getValue()); - this.defaultValue = new DefaultValue(); - this.defaultValue.setType(defaultValue.getAttribute("type")); - this.defaultValue.setValue(defaultValue.getAttribute("value")); - this.data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(),dataElement); - if(this.data!=null)this.data.fromXml(dataElement); + Element validations = doc.createElement("validations"); + for (eu.eudat.models.admin.components.datasetprofile.Field.ValidationType validationType : this.validations) { + Element validation = doc.createElement("validation"); + validation.setAttribute("type", "" + validationType.getValue()); + validations.appendChild(validation); + } - this.validations = new LinkedList<>(); - Element validations = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "validations"); - if(validations!=null){ - NodeList validationElements = validations.getChildNodes(); - for (int temp = 0; temp < validationElements.getLength(); temp++) { - Node validationElement = validationElements.item(temp); - if (validationElement.getNodeType() == Node.ELEMENT_NODE) { - int enumValue = Integer.parseInt(((Element)validationElement).getAttribute("type")); - eu.eudat.models.admin.components.datasetprofile.Field.ValidationType validationType = eu.eudat.models.admin.components.datasetprofile.Field.ValidationType.fromInteger(enumValue); - this.validations.add(validationType); - } - } - } - return this; - } + rootElement.appendChild(validations); + rootElement.appendChild(defaultValue); + rootElement.appendChild(visibility); + rootElement.appendChild(viewStyle); + 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.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"); + + Element defaultValue = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "defaultValue"); + + this.defaultValue = new DefaultValue(); + this.defaultValue.setType(defaultValue.getAttribute("type")); + this.defaultValue.setValue(defaultValue.getAttribute("value")); + this.data = new ModelBuilder().toFieldData(null, this.viewStyle.getRenderStyle(), dataElement); + if (this.data != null) this.data.fromXml(dataElement); + + this.validations = new LinkedList<>(); + Element validations = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "validations"); + if (validations != null) { + NodeList validationElements = validations.getChildNodes(); + for (int temp = 0; temp < validationElements.getLength(); temp++) { + Node validationElement = validationElements.item(temp); + if (validationElement.getNodeType() == Node.ELEMENT_NODE) { + int enumValue = Integer.parseInt(((Element) validationElement).getAttribute("type")); + eu.eudat.models.admin.components.datasetprofile.Field.ValidationType validationType = eu.eudat.models.admin.components.datasetprofile.Field.ValidationType.fromInteger(enumValue); + this.validations.add(validationType); + } + } + } + return this; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java index 566090123..7cc836e55 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java @@ -1,169 +1,168 @@ package eu.eudat.entities.xmlmodels.datasetprofiledefinition; -import java.util.LinkedList; -import java.util.List; - import eu.eudat.models.components.commons.Multiplicity; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.eudat.utilities.XmlSerializable; -import eu.eudat.utilities.builders.XmlBuilder; +import java.util.LinkedList; +import java.util.List; -public class FieldSet implements DatabaseViewStyleDefinition,XmlSerializable
{ - private String id; - private int ordinal; - private List fields; - private String title; - private String description; - private String extendedDescription; - private Multiplicity multiplicity; - private boolean hasCommentField; - private String commentFieldValue; - public List getFields() { - return fields; - } +public class FieldSet implements DatabaseViewStyleDefinition, XmlSerializable
{ + private String id; + private int ordinal; + private List fields; + private String title; + private String description; + private String extendedDescription; + private Multiplicity multiplicity; + private boolean hasCommentField; + private String commentFieldValue; - public void setFields(List fields) { - this.fields = fields; - } + public List getFields() { + return fields; + } - public String getId() { - return id; - } + public void setFields(List fields) { + this.fields = fields; + } - public void setId(String id) { - this.id = id; - } + public String getId() { + return id; + } - public int getOrdinal() { - return ordinal; - } + public void setId(String id) { + this.id = id; + } - public void setOrdinal(int ordinal) { - this.ordinal = ordinal; - } + public int getOrdinal() { + return ordinal; + } - public String getTitle() { - return title; - } + public void setOrdinal(int ordinal) { + this.ordinal = ordinal; + } - public void setTitle(String title) { - this.title = title; - } + public String getTitle() { + return title; + } - public String getDescription() { - return description; - } + public void setTitle(String title) { + this.title = title; + } - public void setDescription(String description) { - this.description = description; - } + public String getDescription() { + return description; + } - public String getExtendedDescription() { - return extendedDescription; - } + public void setDescription(String description) { + this.description = description; + } - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } + public String getExtendedDescription() { + return extendedDescription; + } - public Multiplicity getMultiplicity() { - return multiplicity; - } + public void setExtendedDescription(String extendedDescription) { + this.extendedDescription = extendedDescription; + } - public void setMultiplicity(Multiplicity multiplicity) { - this.multiplicity = multiplicity; - } + public Multiplicity getMultiplicity() { + return multiplicity; + } - public boolean getHasCommentField() { - return hasCommentField; - } + public void setMultiplicity(Multiplicity multiplicity) { + this.multiplicity = multiplicity; + } - public void setHasCommentField(boolean hasCommentField) { - this.hasCommentField = hasCommentField; - } + public boolean getHasCommentField() { + return hasCommentField; + } - public String getCommentFieldValue() { - return commentFieldValue; - } + public void setHasCommentField(boolean hasCommentField) { + this.hasCommentField = hasCommentField; + } - public void setCommentFieldValue(String commentFieldValue) { - this.commentFieldValue = commentFieldValue; - } + public String getCommentFieldValue() { + return commentFieldValue; + } - @Override - public Element toXml(Document doc) { - Element fieldSet = doc.createElement("fieldSet"); - fieldSet.setAttribute("id", this.id); - fieldSet.setAttribute("ordinal", ""+this.ordinal); - Element title = doc.createElement("title"); - title.setTextContent(this.title); + public void setCommentFieldValue(String commentFieldValue) { + this.commentFieldValue = commentFieldValue; + } - Element description = doc.createElement("description"); - description.setTextContent(this.description); + @Override + public Element toXml(Document doc) { + Element fieldSet = doc.createElement("fieldSet"); + fieldSet.setAttribute("id", this.id); + fieldSet.setAttribute("ordinal", "" + this.ordinal); + Element title = doc.createElement("title"); + title.setTextContent(this.title); - Element extendedDescription = doc.createElement("extendedDescription"); - extendedDescription.setTextContent(this.extendedDescription); + Element description = doc.createElement("description"); + description.setTextContent(this.description); - Element multiplicity = doc.createElement("multiplicity"); - multiplicity.setAttribute("min", ""+this.multiplicity.getMin()); - multiplicity.setAttribute("max", ""+this.multiplicity.getMax()); + Element extendedDescription = doc.createElement("extendedDescription"); + extendedDescription.setTextContent(this.extendedDescription); - Element commentField = doc.createElement("commentField"); - commentField.setAttribute("hasCommentField",""+this.hasCommentField); - commentField.setAttribute("commentFieldValue",this.commentFieldValue); + Element multiplicity = doc.createElement("multiplicity"); + multiplicity.setAttribute("min", "" + this.multiplicity.getMin()); + multiplicity.setAttribute("max", "" + this.multiplicity.getMax()); + + Element commentField = doc.createElement("commentField"); + commentField.setAttribute("hasCommentField", "" + this.hasCommentField); + commentField.setAttribute("commentFieldValue", this.commentFieldValue); + Element fieldsElement = doc.createElement("fields"); + for (Field field : fields) { + fieldsElement.appendChild(field.toXml(doc)); + } + fieldSet.appendChild(commentField); + fieldSet.appendChild(fieldsElement); + fieldSet.appendChild(multiplicity); + fieldSet.appendChild(title); + fieldSet.appendChild(description); + fieldSet.appendChild(extendedDescription); + return fieldSet; + } - Element fieldsElement = doc.createElement("fields"); - for(Field field : fields){ - fieldsElement.appendChild(field.toXml(doc)); - } - fieldSet.appendChild(commentField); - fieldSet.appendChild(fieldsElement); - fieldSet.appendChild(multiplicity); - fieldSet.appendChild(title); - fieldSet.appendChild(description); - fieldSet.appendChild(extendedDescription); - return fieldSet; - } + @Override + public FieldSet fromXml(Element element) { + this.id = element.getAttribute("id"); + this.ordinal = Integer.parseInt(element.getAttribute("ordinal")); + this.fields = new LinkedList(); + Element title = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title"); + this.title = title.getTextContent(); + Element description = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description"); + this.description = description.getTextContent(); + Element extendedDescription = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription"); + this.extendedDescription = extendedDescription.getTextContent(); + Element commentField = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "commentField"); + this.hasCommentField = Boolean.parseBoolean(commentField.getAttribute("hasCommentField")); + this.commentFieldValue = commentField.getAttribute("commentFieldValue"); + Element fields = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fields"); - @Override - public FieldSet fromXml(Element element) { - this.id = element.getAttribute("id"); - this.ordinal = Integer.parseInt(element.getAttribute("ordinal")); - this.fields = new LinkedList(); - Element title = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title"); - this.title = title.getTextContent(); - Element description = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description"); - this.description = description.getTextContent(); - Element extendedDescription = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription"); - this.extendedDescription = extendedDescription.getTextContent(); - Element commentField = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "commentField"); - this.hasCommentField = Boolean.parseBoolean(commentField.getAttribute("hasCommentField")); - this.commentFieldValue = commentField.getAttribute("commentFieldValue"); - Element fields = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fields"); + if (fields != null) { + NodeList fieldElements = fields.getChildNodes(); + for (int temp = 0; temp < fieldElements.getLength(); temp++) { + Node fieldElement = fieldElements.item(temp); + if (fieldElement.getNodeType() == Node.ELEMENT_NODE) { + this.fields.add(new Field().fromXml((Element) fieldElement)); + } + } + } - if(fields!=null){ - NodeList fieldElements = fields.getChildNodes(); - for (int temp = 0; temp < fieldElements.getLength(); temp++) { - Node fieldElement = fieldElements.item(temp); - if (fieldElement.getNodeType() == Node.ELEMENT_NODE) { - this.fields.add(new Field().fromXml((Element)fieldElement)); - } - } - } + this.multiplicity = new Multiplicity(); + Element multiplicity = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "multiplicity"); - this.multiplicity = new Multiplicity(); - Element multiplicity = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "multiplicity"); + this.multiplicity.setMin(Integer.parseInt(multiplicity.getAttribute("min"))); + this.multiplicity.setMax(Integer.parseInt(multiplicity.getAttribute("max"))); - this.multiplicity.setMin(Integer.parseInt(multiplicity.getAttribute("min"))); - this.multiplicity.setMax(Integer.parseInt(multiplicity.getAttribute("max"))); + return this; + } - return this; - } - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java index 7a9dc7291..f83103f5e 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Page.java @@ -5,7 +5,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -public class Page implements DatabaseViewStyleDefinition,XmlSerializable { +public class Page implements DatabaseViewStyleDefinition, XmlSerializable { private String id; private int ordinal; private String title; @@ -37,9 +37,9 @@ public class Page implements DatabaseViewStyleDefinition,XmlSerializable { @Override public Element toXml(Document doc) { Element root = doc.createElement("page"); - root.setAttribute("title",this.title); - root.setAttribute("ordinal",""+this.ordinal); - root.setAttribute("id",this.id); + root.setAttribute("title", this.title); + root.setAttribute("ordinal", "" + this.ordinal); + root.setAttribute("id", this.id); return root; } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java index 1c6bcd4e7..2aa89ad14 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java @@ -1,167 +1,182 @@ package eu.eudat.entities.xmlmodels.datasetprofiledefinition; -import java.util.LinkedList; -import java.util.List; - +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.eudat.utilities.XmlSerializable; -import eu.eudat.utilities.builders.XmlBuilder; +import java.util.LinkedList; +import java.util.List; -public class Section implements DatabaseViewStyleDefinition,XmlSerializable
{ - private String id; - private int ordinal; - private boolean defaultVisibility; - private String page; - private String title; - private String description; - private String extendedDescription; - private List
sections; - private List
fieldSets; - 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 isDefaultVisibility() { - return defaultVisibility; - } - public void setDefaultVisibility(boolean defaultVisibility) { - this.defaultVisibility = defaultVisibility; - } - public String getPage() { - return page; - } - public void setPage(String page) { - this.page = page; - } - 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 List
getSections() { - return sections; - } - public void setSections(List
sections) { - this.sections = sections; - } +public class Section implements DatabaseViewStyleDefinition, XmlSerializable
{ + private String id; + private int ordinal; + private boolean defaultVisibility; + private String page; + private String title; + private String description; + private String extendedDescription; + private List
sections; + private List
fieldSets; - public List
getFieldSets() { - return fieldSets; - } + public String getId() { + return id; + } - public void setFieldSets(List
fieldSets) { - this.fieldSets = fieldSets; - } + public void setId(String id) { + this.id = id; + } + + public int getOrdinal() { + return ordinal; + } + + public void setOrdinal(int ordinal) { + this.ordinal = ordinal; + } + + public boolean isDefaultVisibility() { + return defaultVisibility; + } + + public void setDefaultVisibility(boolean defaultVisibility) { + this.defaultVisibility = defaultVisibility; + } + + public String getPage() { + return page; + } + + public void setPage(String page) { + this.page = page; + } + + 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 List
getSections() { + return sections; + } + + public void setSections(List
sections) { + this.sections = sections; + } + + public List
getFieldSets() { + return fieldSets; + } + + public void setFieldSets(List
fieldSets) { + this.fieldSets = fieldSets; + } + + public String getExtendedDescription() { + return extendedDescription; + } + + public void setExtendedDescription(String extendedDescription) { + this.extendedDescription = extendedDescription; + } + + @Override + public Element toXml(Document doc) { + Element rootElement = doc.createElement("section"); + rootElement.setAttribute("id", this.id); + rootElement.setAttribute("ordinal", "" + this.ordinal); + rootElement.setAttribute("defaultVisibility", "" + this.defaultVisibility); + rootElement.setAttribute("page", "" + this.page); + + Element description = doc.createElement("description"); + description.setTextContent(this.description); + + Element extendedDescription = doc.createElement("extendedDescription"); + extendedDescription.setTextContent(this.extendedDescription); + + Element title = doc.createElement("title"); + title.setTextContent(this.title); + + if (sections != null) { + Element sections = doc.createElement("sections"); + for (Section section : this.sections) { + sections.appendChild(section.toXml(doc)); + } + rootElement.appendChild(sections); + } + + if (this.fieldSets != null) { + Element formGroups = doc.createElement("fieldSets"); + for (FieldSet fieldSet : this.fieldSets) { + formGroups.appendChild(fieldSet.toXml(doc)); + } + rootElement.appendChild(formGroups); + } + + rootElement.appendChild(title); + rootElement.appendChild(extendedDescription); + rootElement.appendChild(description); + + return rootElement; + } + + @Override + public Section fromXml(Element element) { + + this.id = element.getAttribute("id"); + this.ordinal = Integer.parseInt(element.getAttribute("ordinal")); + this.defaultVisibility = Boolean.getBoolean(element.getAttribute("defaultVisibility")); + this.page = element.getAttribute("page"); + + Element description = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "description"); + if (description != null) this.description = description.getTextContent(); + + Element extendedDescription = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "extendedDescription"); + if (extendedDescription != null) this.extendedDescription = extendedDescription.getTextContent(); + + Element title = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "title"); + if (title != null) this.title = title.getTextContent(); + + this.sections = new LinkedList
(); + Element sections = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections"); + if (sections != null) { + NodeList sectionElements = sections.getChildNodes(); + for (int temp = 0; temp < sectionElements.getLength(); temp++) { + Node sectionElement = sectionElements.item(temp); + if (sectionElement.getNodeType() == Node.ELEMENT_NODE) { + this.sections.add(new Section().fromXml((Element) sectionElement)); + } + } + } + + this.fieldSets = new LinkedList
(); + Element fieldGroups = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fieldSets"); + + if (fieldGroups != null) { + NodeList fieldGroupElements = fieldGroups.getChildNodes(); + for (int temp = 0; temp < fieldGroupElements.getLength(); temp++) { + Node fieldGroupElement = fieldGroupElements.item(temp); + if (fieldGroupElement.getNodeType() == Node.ELEMENT_NODE) { + this.fieldSets.add(new FieldSet().fromXml((Element) fieldGroupElement)); + } + } + } + + return this; + } - public String getExtendedDescription() { - return extendedDescription; - } - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } - - @Override - public Element toXml(Document doc) { - Element rootElement = doc.createElement("section"); - rootElement.setAttribute("id", this.id); - rootElement.setAttribute("ordinal", ""+this.ordinal); - rootElement.setAttribute("defaultVisibility", ""+this.defaultVisibility); - rootElement.setAttribute("page", ""+this.page); - - Element description = doc.createElement("description"); - description.setTextContent(this.description); - - Element extendedDescription = doc.createElement("extendedDescription"); - extendedDescription.setTextContent(this.extendedDescription); - - Element title = doc.createElement("title"); - title.setTextContent(this.title); - - if(sections!=null){ - Element sections = doc.createElement("sections"); - for(Section section : this.sections){ - sections.appendChild(section.toXml(doc)); - } - rootElement.appendChild(sections); - } - - if(this.fieldSets!=null){ - Element formGroups = doc.createElement("fieldSets"); - for(FieldSet fieldSet : this.fieldSets){ - formGroups.appendChild(fieldSet.toXml(doc)); - } - rootElement.appendChild(formGroups); - } - - rootElement.appendChild(title); - rootElement.appendChild(extendedDescription); - rootElement.appendChild(description); - - return rootElement; - } - @Override - public Section fromXml(Element element) { - - this.id = element.getAttribute("id"); - this.ordinal = Integer.parseInt(element.getAttribute("ordinal")); - this.defaultVisibility = Boolean.getBoolean(element.getAttribute("defaultVisibility")); - this.page = element.getAttribute("page"); - - Element description = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(),"description"); - if(description!=null) this.description = description.getTextContent(); - - Element extendedDescription = XmlBuilder.getNodeFromListByTagName(element.getChildNodes(),"extendedDescription"); - if(extendedDescription != null) this.extendedDescription = extendedDescription.getTextContent(); - - Element title =XmlBuilder.getNodeFromListByTagName(element.getChildNodes(),"title"); - if(title!=null) this.title = title.getTextContent(); - - this.sections = new LinkedList
(); - Element sections = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "sections"); - if(sections!=null){ - NodeList sectionElements = sections.getChildNodes(); - for (int temp = 0; temp < sectionElements.getLength(); temp++) { - Node sectionElement = sectionElements.item(temp); - if (sectionElement.getNodeType() == Node.ELEMENT_NODE) { - this.sections.add(new Section().fromXml((Element)sectionElement)); - } - } - } - - this.fieldSets = new LinkedList
(); - Element fieldGroups = (Element)XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "fieldSets"); - if(fieldGroups!=null){ - NodeList fieldGroupElements = fieldGroups.getChildNodes(); - for (int temp = 0; temp < fieldGroupElements.getLength(); temp++) { - Node fieldGroupElement = fieldGroupElements.item(temp); - if (fieldGroupElement.getNodeType() == Node.ELEMENT_NODE) { - this.fieldSets.add(new FieldSet().fromXml((Element)fieldGroupElement)); - } - } - } - - return this; - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java index 5671a8a3b..20d86974d 100644 --- a/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java +++ b/dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/ViewStyleModel.java @@ -1,14 +1,14 @@ package eu.eudat.entities.xmlmodels.datasetprofiledefinition; -import java.util.LinkedList; -import java.util.List; +import eu.eudat.utilities.XmlSerializable; +import eu.eudat.utilities.builders.XmlBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.eudat.utilities.XmlSerializable; -import eu.eudat.utilities.builders.XmlBuilder; +import java.util.LinkedList; +import java.util.List; public class ViewStyleModel implements XmlSerializable { private List
sections; @@ -40,7 +40,7 @@ public class ViewStyleModel implements XmlSerializable { } for (Page page : this.pages) { - pages.appendChild(page.toXml(doc)); + pages.appendChild(page.toXml(doc)); } root.appendChild(pages); @@ -63,8 +63,8 @@ public class ViewStyleModel implements XmlSerializable { } } this.pages = new LinkedList<>(); - Element pages = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(),"pages"); - if(pages!=null){ + Element pages = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "pages"); + if (pages != null) { NodeList pagesElements = pages.getChildNodes(); for (int temp = 0; temp < pagesElements.getLength(); temp++) { Node pageElement = pagesElements.item(temp); 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 index 0903b81a1..328ebccd6 100644 --- 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 @@ -2,6 +2,6 @@ package eu.eudat.entities.xmlmodels.modeldefinition; import eu.eudat.utilities.DatabaseDefinition; -public interface DatabaseModelDefinition extends DatabaseDefinition{ +public interface DatabaseModelDefinition extends DatabaseDefinition { } diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java b/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java index 8c0f6d62e..c81af0833 100644 --- a/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java +++ b/dmp-backend/src/main/java/eu/eudat/exceptions/security/NonValidTokenException.java @@ -2,10 +2,10 @@ package eu.eudat.exceptions.security; public class NonValidTokenException extends Exception { - private static final long serialVersionUID = -2834659827755141154L; - - public NonValidTokenException(String msg) { - super(msg); - } + private static final long serialVersionUID = -2834659827755141154L; + + public NonValidTokenException(String msg) { + super(msg); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java b/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java index 0ee0f8a29..6995f0be3 100644 --- a/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java +++ b/dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java @@ -5,16 +5,19 @@ import org.springframework.web.bind.annotation.ResponseStatus; @ResponseStatus(value = HttpStatus.UNAUTHORIZED) -public class UnauthorisedException extends RuntimeException{ +public class UnauthorisedException extends RuntimeException { public UnauthorisedException() { super(); } + public UnauthorisedException(String message, Throwable cause) { super(message, cause); } + public UnauthorisedException(String message) { super(message); } + public UnauthorisedException(Throwable cause) { super(cause); } diff --git a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java b/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java index ee51bdf7e..ffa0065f9 100644 --- a/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java +++ b/dmp-backend/src/main/java/eu/eudat/handlers/PrincipalArgumentResolver.java @@ -12,7 +12,10 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; import java.lang.annotation.Annotation; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.UUID; public final class PrincipalArgumentResolver implements HandlerMethodArgumentResolver { @@ -39,7 +42,8 @@ public final class PrincipalArgumentResolver implements HandlerMethodArgumentRes Principal principal = this.authenticationService.Touch(authToken); if (principal == null) throw new UnauthorisedException("Authentication Information Missing"); - if (!principal.isAuthorized(claimList)) throw new UnauthorisedException("You are not Authorized For this Action"); + if (!principal.isAuthorized(claimList)) + throw new UnauthorisedException("You are not Authorized For this Action"); return principal; } diff --git a/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java b/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java index 8eda41023..6f586388c 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/AdminManager.java @@ -1,27 +1,18 @@ package eu.eudat.managers; -import java.util.Date; -import java.util.List; - import eu.eudat.builders.entity.DatasetProfileBuilder; +import eu.eudat.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel; +import eu.eudat.models.admin.composite.DatasetProfile; import eu.eudat.services.ApiContext; +import eu.eudat.utilities.builders.ModelBuilder; +import eu.eudat.utilities.builders.XmlBuilder; 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.entities.DatasetProfileViewstyle; -import eu.eudat.entities.xmlmodels.datasetprofiledefinition.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; +import java.util.Date; public class AdminManager { - public static eu.eudat.entities.DatasetProfile generateViewStyleDefinition(DatasetProfile profile, ApiContext apiContext) { ViewStyleModel viewStyleModel = new ViewStyleModel(); viewStyleModel.setSections(new ModelBuilder().toViewStyleDefinition(profile.getSections(), eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section.class)); @@ -40,12 +31,11 @@ public class AdminManager { public static eu.eudat.models.admin.composite.DatasetProfile generateDatasetProfileModel(eu.eudat.entities.DatasetProfile profile) { Document viewStyleDoc = XmlBuilder.fromXml(profile.getDefinition()); - Element root = (Element) viewStyleDoc.getDocumentElement(); + Element root = viewStyleDoc.getDocumentElement(); eu.eudat.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewstyle = new eu.eudat.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel().fromXml(root); eu.eudat.models.admin.composite.DatasetProfile datasetprofile = new eu.eudat.models.admin.composite.DatasetProfile(); datasetprofile.buildProfile(viewstyle); - return datasetprofile; } } diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java index f7ecf0155..12f9b865c 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DashBoardManager.java @@ -3,16 +3,10 @@ package eu.eudat.managers; import eu.eudat.dao.entities.DMPDao; import eu.eudat.dao.entities.DatasetDao; import eu.eudat.dao.entities.ProjectDao; -import eu.eudat.entities.DMP; -import eu.eudat.entities.Dataset; -import eu.eudat.entities.Project; import eu.eudat.entities.UserInfo; import eu.eudat.models.dashboard.DashBoardStatistics; import eu.eudat.models.security.Principal; -import java.lang.reflect.Array; -import java.util.Arrays; - public class DashBoardManager { public DashBoardStatistics getStatistics(DatasetDao datasetRepository, DMPDao dataManagementPlanRepository, ProjectDao projectRepository) { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java index ec22fc15d..62877d8c0 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DataManagementPlanManager.java @@ -1,9 +1,5 @@ package eu.eudat.managers; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; - import eu.eudat.builders.entity.UserInfoBuilder; import eu.eudat.dao.entities.*; import eu.eudat.entities.*; @@ -25,6 +21,13 @@ import eu.eudat.queryable.QueryableList; import eu.eudat.services.ApiContext; import org.springframework.scheduling.annotation.Async; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + public class DataManagementPlanManager { public DataTableData getPaged(ApiContext apiContext, DataManagementPlanTableRequest dataManagementPlanTableRequest, Principal principal) throws Exception { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java index 35b32cc1f..f72a11fbf 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetManager.java @@ -37,7 +37,7 @@ public class DatasetManager { DataTableData dataTable = new DataTableData(); CompletableFuture> itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DatasetListingModel.class)).toListAsync().whenComplete((resultList, throwable) -> { - List datasets = resultList.stream().map(item-> new DatasetListingModel().fromDataModel(item)).collect(Collectors.toList()); + List datasets = resultList.stream().map(item -> new DatasetListingModel().fromDataModel(item)).collect(Collectors.toList()); dataTable.setData(datasets); }); diff --git a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java b/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java index 1a06b4e8a..864e12869 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/DatasetWizardManager.java @@ -11,7 +11,6 @@ import eu.eudat.models.dmp.DataManagementPlan; import eu.eudat.models.security.Principal; import eu.eudat.queryable.QueryableList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java index e3b2fb972..d9b62ed1c 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java @@ -5,9 +5,9 @@ import eu.eudat.builders.model.models.DataTableDataBuilder; import eu.eudat.dao.entities.ExternalDatasetDao; import eu.eudat.entities.ExternalDataset; import eu.eudat.models.criteria.ExternalDatasetCriteria; +import eu.eudat.models.externaldataset.ExternalDatasetListingModel; import eu.eudat.models.externaldataset.ExternalDatasetTableRequest; import eu.eudat.models.helpers.common.DataTableData; -import eu.eudat.models.externaldataset.ExternalDatasetListingModel; import eu.eudat.proxy.config.exceptions.HugeResultSet; import eu.eudat.proxy.config.exceptions.NoURLFound; import eu.eudat.proxy.fetching.RemoteFetcher; @@ -31,7 +31,7 @@ public class ExternalDatasetManager { public List getWithExternal(ApiContext apiContext, String query, RemoteFetcher remoteFetcher) throws HugeResultSet, NoURLFound, InstantiationException, IllegalAccessException { ExternalDatasetCriteria criteria = apiContext.getBuilderFactory().getBuilder(ExternalDatasetCriteriaBuilder.class).like(query).build(); QueryableList items = apiContext.getDatabaseRepository().getExternalDatasetDao().getWithCriteria(criteria); - List externalDatasets = items.toList().stream().map(item-> new ExternalDatasetListingModel().fromDataModel(item)).collect(Collectors.toList()); + List externalDatasets = items.toList().stream().map(item -> new ExternalDatasetListingModel().fromDataModel(item)).collect(Collectors.toList()); return externalDatasets; } diff --git a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java b/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java index 7d644b9ac..d4dad79f7 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/PaginationManager.java @@ -21,9 +21,9 @@ public class PaginationManager { ColumnOrderings columnOrderings = tableRequest.getOrderings(); for (Ordering ordering : columnOrderings.getFieldOrderings()) { if (ordering.getOrderByType() == Ordering.OrderByType.ASC) - applyAscOrder(items,ordering); + applyAscOrder(items, ordering); if (ordering.getOrderByType() == Ordering.OrderByType.DESC) { - applyDescOrder(items,ordering); + applyDescOrder(items, ordering); } } return; diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java index 92b1d1235..15e11c098 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/ProjectManager.java @@ -1,12 +1,5 @@ package eu.eudat.managers; -import java.text.ParseException; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CompletableFuture; -import java.util.stream.Collectors; - import eu.eudat.builders.model.models.ProjectBuilder; import eu.eudat.dao.entities.ProjectDao; import eu.eudat.dao.entities.UserInfoDao; @@ -25,6 +18,13 @@ import eu.eudat.proxy.fetching.RemoteFetcher; import eu.eudat.queryable.QueryableList; import eu.eudat.services.ApiContext; +import java.text.ParseException; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; + public class ProjectManager { public DataTableData getPaged(ProjectDao projectRepository, ProjectTableRequest projectTableRequest) throws Exception { diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java index 21d92e823..9d47d482a 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/ResearcherManager.java @@ -3,8 +3,6 @@ package eu.eudat.managers; import eu.eudat.entities.Researcher; import eu.eudat.services.ApiContext; -import java.util.Arrays; - /** * Created by ikalyvas on 2/5/2018. */ diff --git a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java index a27d58b0b..b84c9dba4 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/UserManager.java @@ -12,11 +12,10 @@ import eu.eudat.models.userinfo.UserListingModel; import eu.eudat.queryable.QueryableList; import eu.eudat.services.ApiContext; import eu.eudat.services.AuthenticationService; +import eu.eudat.utilities.builders.XmlBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; -import eu.eudat.utilities.builders.XmlBuilder; - import java.util.List; import java.util.stream.Collectors; diff --git a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java b/dmp-backend/src/main/java/eu/eudat/models/DataModel.java index 063dd0187..25412ddc1 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/DataModel.java +++ b/dmp-backend/src/main/java/eu/eudat/models/DataModel.java @@ -2,8 +2,10 @@ package eu.eudat.models; import eu.eudat.entities.DataEntity; -public interface DataModel { +public interface DataModel { M fromDataModel(T entity); + T toDataModel() throws Exception; + String getHint(); } diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java index 7fb9d4a34..b82ba7efc 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Field.java @@ -1,149 +1,167 @@ package eu.eudat.models.admin.components.datasetprofile; -import eu.eudat.entities.xmlmodels.modeldefinition.*; -import eu.eudat.models.project.Project; -import eu.eudat.utilities.ModelDefinition; -import org.apache.commons.lang3.RandomStringUtils; - 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.ViewStyleDefinition; import eu.eudat.utilities.builders.ModelBuilder; +import org.apache.commons.lang3.RandomStringUtils; import java.util.List; import java.util.stream.Collectors; -public class Field implements ViewStyleDefinition,Comparable{ +public class Field implements ViewStyleDefinition, Comparable { - public enum ValidationType { - NONE((short)0),REQUIRED((short) 1); - private short value; - private ValidationType(short value) { this.value = value; } - public short getValue(){return value;} - public static ValidationType fromInteger(int value) { - switch (value) { - case 0: - return NONE; - case 1: - return REQUIRED; - default: - throw new RuntimeException("Unsupported Project Status"); - } - } - public static List fromIntegers(List values){ - return values.stream().map(ValidationType::fromInteger).collect(Collectors.toList()); - } - } + public enum ValidationType { + NONE((short) 0), REQUIRED((short) 1); + private short value; - private String id; - private Integer ordinal; - private String value; - private ViewStyle viewStyle; - private String datatype; - private int page; - private DefaultValue defaultValue; - private Object data; - private Visibility visible; - private List validations; - 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 String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - public ViewStyle getViewStyle() { - return viewStyle; - } - public void setViewStyle(ViewStyle viewStyle) { - this.viewStyle = viewStyle; - } - public int getPage() { - return page; - } - public void setPage(int page) { - this.page = page; - } - - public DefaultValue getDefaultValue() { - return defaultValue; - } - public void setDefaultValue(DefaultValue defaultValue) { - this.defaultValue = defaultValue; - } - public String getDatatype() { - return datatype; - } - public void setDatatype(String datatype) { - this.datatype = datatype; - } - + private ValidationType(short value) { + this.value = value; + } - public Object getData() { - return data; - } - public void setData(Object data) { - this.data = data; - } - - - public Visibility getVisible() { - return visible; - } - public void setVisible(Visibility visible) { - this.visible = visible; - } + public short getValue() { + return value; + } - public List getValidations() { - return this.validations.stream().map(item->(int)item.getValue()).collect(Collectors.toList()); - } + public static ValidationType fromInteger(int value) { + switch (value) { + case 0: + return NONE; + case 1: + return REQUIRED; + default: + throw new RuntimeException("Unsupported Project Status"); + } + } - public void setValidations(List validations) { - this.validations = ValidationType.fromIntegers(validations); - } + public static List fromIntegers(List values) { + return values.stream().map(ValidationType::fromInteger).collect(Collectors.toList()); + } + } + + private String id; + private Integer ordinal; + private String value; + private ViewStyle viewStyle; + private String datatype; + private int page; + private DefaultValue defaultValue; + private Object data; + private Visibility visible; + private List validations; + + 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 String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public ViewStyle getViewStyle() { + return viewStyle; + } + + public void setViewStyle(ViewStyle viewStyle) { + this.viewStyle = viewStyle; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public DefaultValue getDefaultValue() { + return defaultValue; + } + + public void setDefaultValue(DefaultValue defaultValue) { + this.defaultValue = defaultValue; + } + + public String getDatatype() { + return datatype; + } + + public void setDatatype(String datatype) { + this.datatype = datatype; + } + + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + + public Visibility getVisible() { + return visible; + } + + public void setVisible(Visibility visible) { + this.visible = visible; + } + + public List getValidations() { + return this.validations.stream().map(item -> (int) item.getValue()).collect(Collectors.toList()); + } + + public void setValidations(List validations) { + this.validations = ValidationType.fromIntegers(validations); + } + + @Override + public eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field field) { + if (this.id == null || this.id.isEmpty()) this.id = "field_" + RandomStringUtils.random(5, true, true); + + field.setId(this.id); + field.setOrdinal(this.ordinal); + field.setViewStyle(this.viewStyle); + field.setData(new ModelBuilder().toFieldData(data, this.viewStyle.getRenderStyle())); + field.setVisible(this.visible); + field.setDefaultValue(this.defaultValue); + field.setValidations(this.validations); + return field; + } + + @Override + public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field item) { + this.id = item.getId(); + this.ordinal = item.getOrdinal(); + this.viewStyle = item.getViewStyle(); + this.data = item.getData(); + this.visible = item.getVisible(); + this.defaultValue = item.getDefaultValue(); + this.validations = item.getValidations(); + } + + @Override + public int compareTo(Object o) { + return this.ordinal.compareTo(((Field) o).ordinal); + } - @Override - public eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field field) { - if(this.id == null||this.id.isEmpty())this.id = "field_"+RandomStringUtils.random(5, true, true); - field.setId(this.id); - field.setOrdinal(this.ordinal); - field.setViewStyle(this.viewStyle); - field.setData(new ModelBuilder().toFieldData(data, this.viewStyle.getRenderStyle())); - field.setVisible(this.visible); - field.setDefaultValue(this.defaultValue); - field.setValidations(this.validations); - return field; - } - @Override - public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field item) { - this.id = item.getId(); - this.ordinal = item.getOrdinal(); - this.viewStyle = item.getViewStyle(); - this.data = item.getData(); - this.visible = item.getVisible(); - this.defaultValue = item.getDefaultValue(); - this.validations = item.getValidations(); - } - @Override - public int compareTo(Object o) { - return this.ordinal.compareTo(((Field)o).ordinal); - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java index d829b925b..640e8faba 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/FieldSet.java @@ -1,124 +1,122 @@ package eu.eudat.models.admin.components.datasetprofile; -import java.util.List; - -import eu.eudat.utilities.ModelDefinition; -import org.apache.commons.lang3.RandomStringUtils; - import eu.eudat.models.components.commons.Multiplicity; import eu.eudat.utilities.ViewStyleDefinition; import eu.eudat.utilities.builders.ModelBuilder; +import org.apache.commons.lang3.RandomStringUtils; -public class FieldSet implements Comparable, ViewStyleDefinition{ - private String id; - private Integer ordinal; - private Multiplicity multiplicity; - private String title; - private String description; - private String extendedDescription; - private boolean hasCommentField; - private List fields; +import java.util.List; - public List getFields() { - return fields; - } +public class FieldSet implements Comparable, ViewStyleDefinition { + private String id; + private Integer ordinal; + private Multiplicity multiplicity; + private String title; + private String description; + private String extendedDescription; + private boolean hasCommentField; + private List fields; - public void setFields(List fields) { - this.fields = fields; - } + public List getFields() { + return fields; + } - public String getId() { - return id; - } + public void setFields(List fields) { + this.fields = fields; + } - public void setId(String id) { - this.id = id; - } + public String getId() { + return id; + } - public int getOrdinal() { - return ordinal; - } + public void setId(String id) { + this.id = id; + } - public void setOrdinal(int ordinal) { - this.ordinal = ordinal; - } + public int getOrdinal() { + return ordinal; + } - public Multiplicity getMultiplicity() { - return multiplicity; - } + public void setOrdinal(int ordinal) { + this.ordinal = ordinal; + } - public void setMultiplicity(Multiplicity multiplicity) { - this.multiplicity = multiplicity; - } + public Multiplicity getMultiplicity() { + return multiplicity; + } - public void setOrdinal(Integer ordinal) { - this.ordinal = ordinal; - } + public void setMultiplicity(Multiplicity multiplicity) { + this.multiplicity = multiplicity; + } - public String getTitle() { - return title; - } + public void setOrdinal(Integer ordinal) { + this.ordinal = ordinal; + } - public void setTitle(String title) { - this.title = title; - } + public String getTitle() { + return title; + } - public String getDescription() { - return description; - } + public void setTitle(String title) { + this.title = title; + } - public void setDescription(String description) { - this.description = description; - } + public String getDescription() { + return description; + } - public String getExtendedDescription() { - return extendedDescription; - } + public void setDescription(String description) { + this.description = description; + } - public void setExtendedDescription(String extendedDescription) { - this.extendedDescription = extendedDescription; - } + public String getExtendedDescription() { + return extendedDescription; + } - public boolean getHasCommentField() { - return hasCommentField; - } + public void setExtendedDescription(String extendedDescription) { + this.extendedDescription = extendedDescription; + } - public void setHasCommentField(boolean hasCommentField) { - this.hasCommentField = hasCommentField; - } + public boolean getHasCommentField() { + return hasCommentField; + } - @Override - public eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet item) { - if(this.id == null||this.id.isEmpty())this.id = "fieldSet_"+RandomStringUtils.random(5, true, true); + public void setHasCommentField(boolean hasCommentField) { + this.hasCommentField = hasCommentField; + } - List viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field.class); - item.setFields(viewStylefields); - item.setId(this.id); - item.setDescription(this.description); - item.setTitle(this.title); - item.setExtendedDescription(this.extendedDescription); - item.setOrdinal(this.ordinal); - item.setMultiplicity(this.multiplicity); - item.setHasCommentField(this.hasCommentField); - return item; - } + @Override + public eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet item) { + if (this.id == null || this.id.isEmpty()) this.id = "fieldSet_" + RandomStringUtils.random(5, true, true); + + List viewStylefields = new ModelBuilder().toViewStyleDefinition(this.fields, eu.eudat.entities.xmlmodels.datasetprofiledefinition.Field.class); + item.setFields(viewStylefields); + item.setId(this.id); + item.setDescription(this.description); + item.setTitle(this.title); + item.setExtendedDescription(this.extendedDescription); + item.setOrdinal(this.ordinal); + item.setMultiplicity(this.multiplicity); + item.setHasCommentField(this.hasCommentField); + return item; + } + + @Override + public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet item) { + this.fields = new ModelBuilder().fromViewStyleDefinition(item.getFields(), Field.class); + this.id = item.getId(); + this.ordinal = item.getOrdinal(); + this.description = item.getDescription(); + this.extendedDescription = item.getExtendedDescription(); + this.title = item.getTitle(); + this.multiplicity = item.getMultiplicity(); + this.hasCommentField = item.getHasCommentField(); + } + + @Override + public int compareTo(Object o) { + return this.ordinal.compareTo(((FieldSet) o).ordinal); + } - @Override - public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet item) { - this.fields = new ModelBuilder().fromViewStyleDefinition(item.getFields(), Field.class); - this.id = item.getId(); - this.ordinal = item.getOrdinal(); - this.description = item.getDescription(); - this.extendedDescription = item.getExtendedDescription(); - this.title = item.getTitle(); - this.multiplicity = item.getMultiplicity(); - this.hasCommentField = item.getHasCommentField(); - } - @Override - public int compareTo(Object o) { - return this.ordinal.compareTo(((FieldSet)o).ordinal); - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java index 96c62d20d..997c1c6a8 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/components/datasetprofile/Page.java @@ -1,10 +1,9 @@ package eu.eudat.models.admin.components.datasetprofile; -import eu.eudat.entities.xmlmodels.datasetprofiledefinition.*; import eu.eudat.utilities.ViewStyleDefinition; -public class Page implements Comparable,ViewStyleDefinition { +public class Page implements Comparable, ViewStyleDefinition { private String id; private Integer ordinal; private String title; @@ -50,6 +49,6 @@ public class Page implements Comparable,ViewStyleDefinition{ - private List
sections; - private List
fieldSets; - private Boolean defaultVisibility; - private String page; - private Integer ordinal; - private String id; - private String title; - private String description; - public List
getSections() { - return sections; - } - public void setSections(List
sections) { - this.sections = sections; - } +import java.util.List; - public List
getFieldSets() { - return fieldSets; - } +public class Section implements Comparable, ViewStyleDefinition { + private List
sections; + private List
fieldSets; + private Boolean defaultVisibility; + private String page; + private Integer ordinal; + private String id; + private String title; + private String description; + + public List
getSections() { + return sections; + } + + public void setSections(List
sections) { + this.sections = sections; + } + + public List
getFieldSets() { + return fieldSets; + } + + public void setFieldSets(List
fieldSets) { + this.fieldSets = fieldSets; + } + + public Boolean getDefaultVisibility() { + return defaultVisibility; + } + + public void setDefaultVisibility(Boolean defaultVisibility) { + this.defaultVisibility = defaultVisibility; + } + + public String getPage() { + return page; + } + + public void setPage(String page) { + this.page = page; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + 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 int getOrdinal() { + return ordinal; + } + + public void setOrdinal(int ordinal) { + this.ordinal = ordinal; + } + + @Override + public eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section item) { + if (this.id == null || this.id.isEmpty()) this.id = "section_" + RandomStringUtils.random(5, true, true); + item.setDefaultVisibility(this.defaultVisibility); + item.setDescription(this.description); + if (this.fieldSets != null) + item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.fieldSets, eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet.class)); + item.setId(this.id); + item.setOrdinal(this.ordinal); + item.setPage(this.page); + if (this.sections != null) + item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section.class)); + item.setTitle(this.title); + return item; + } + + @Override + public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section item) { + + this.defaultVisibility = item.isDefaultVisibility(); + this.description = item.getDescription(); + this.fieldSets = new ModelBuilder().fromViewStyleDefinition(item.getFieldSets(), FieldSet.class); + this.id = item.getId(); + this.ordinal = item.getOrdinal(); + this.page = item.getPage(); + this.sections = new ModelBuilder().fromViewStyleDefinition(item.getSections(), Section.class); + this.title = item.getTitle(); + } + + @Override + public int compareTo(Object o) { + return this.ordinal.compareTo(((Section) o).getOrdinal()); + } - public void setFieldSets(List
fieldSets) { - this.fieldSets = fieldSets; - } - public Boolean getDefaultVisibility() { - return defaultVisibility; - } - public void setDefaultVisibility(Boolean defaultVisibility) { - this.defaultVisibility = defaultVisibility; - } - public String getPage() { - return page; - } - public void setPage(String page) { - this.page = page; - } - public String getId() { - return id; - } - public void setId(String id) { - this.id = id; - } - 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 int getOrdinal() { - return ordinal; - } - public void setOrdinal(int ordinal) { - this.ordinal = ordinal; - } - @Override - public eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section toDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section item) { - if(this.id == null||this.id.isEmpty())this.id = "section_"+RandomStringUtils.random(5, true, true); - item.setDefaultVisibility(this.defaultVisibility); - item.setDescription(this.description); - if(this.fieldSets!=null)item.setFieldSets(new ModelBuilder().toViewStyleDefinition(this.fieldSets, eu.eudat.entities.xmlmodels.datasetprofiledefinition.FieldSet.class)); - item.setId(this.id); - item.setOrdinal(this.ordinal); - item.setPage(this.page); - if(this.sections!=null)item.setSections(new ModelBuilder().toViewStyleDefinition(this.sections, eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section.class)); - item.setTitle(this.title); - return item; - } - @Override - public void fromDatabaseDefinition(eu.eudat.entities.xmlmodels.datasetprofiledefinition.Section item) { - - this.defaultVisibility = item.isDefaultVisibility(); - this.description = item.getDescription(); - this.fieldSets = new ModelBuilder().fromViewStyleDefinition(item.getFieldSets(),FieldSet.class); - this.id = item.getId(); - this.ordinal = item.getOrdinal(); - this.page = item.getPage(); - this.sections = new ModelBuilder().fromViewStyleDefinition(item.getSections(),Section.class); - this.title = item.getTitle(); - } - @Override - public int compareTo(Object o) { - return this.ordinal.compareTo(((Section)o).getOrdinal()); - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java b/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java index c00e180d7..daab0d00f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java +++ b/dmp-backend/src/main/java/eu/eudat/models/admin/composite/DatasetProfile.java @@ -1,42 +1,42 @@ package eu.eudat.models.admin.composite; +import eu.eudat.models.admin.components.datasetprofile.Page; +import eu.eudat.models.admin.components.datasetprofile.Section; import eu.eudat.utilities.builders.ModelBuilder; -import eu.eudat.utilities.helpers.ModelBuilderCollector; import java.util.List; -import eu.eudat.models.admin.components.datasetprofile.*; - public class DatasetProfile { - private String label; - private List
sections; - private List pages; - public List
getSections() { - return sections; - } + private String label; + private List
sections; + private List pages; - public void setSections(List
sections) { - this.sections = sections; - } - - public String getLabel() { - return label; - } + public List
getSections() { + return sections; + } - public void setLabel(String label) { - this.label = label; - } + public void setSections(List
sections) { + this.sections = sections; + } - public List getPages() { - return pages; - } + public String getLabel() { + return label; + } - public void setPages(List pages) { - this.pages = pages; - } + public void setLabel(String label) { + this.label = label; + } - public void buildProfile(eu.eudat.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle){ - this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class); - this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class); - } + public List getPages() { + return pages; + } + + public void setPages(List pages) { + this.pages = pages; + } + + public void buildProfile(eu.eudat.entities.xmlmodels.datasetprofiledefinition.ViewStyleModel viewStyle) { + this.sections = new ModelBuilder().fromViewStyleDefinition(viewStyle.getSections(), Section.class); + this.pages = new ModelBuilder().fromViewStyleDefinition(viewStyle.getPages(), Page.class); + } } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java index 347b7490a..75547ad2f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/DefaultValue.java @@ -1,21 +1,24 @@ package eu.eudat.models.components.commons; public class DefaultValue { - private String type; - private String value; - - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - - + private String type; + private String value; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java index ea627cbfc..f527eed3f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Multiplicity.java @@ -2,21 +2,24 @@ package eu.eudat.models.components.commons; public class Multiplicity { - private int min; - private int max; - - public int getMin() { - return min; - } - public void setMin(int min) { - this.min = min; - } - public int getMax() { - return max; - } - public void setMax(int max) { - this.max = max; - } - - + private int min; + private int max; + + public int getMin() { + return min; + } + + public void setMin(int min) { + this.min = min; + } + + public int getMax() { + return max; + } + + public void setMax(int max) { + this.max = max; + } + + } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java index 2f3006d5c..388804ae9 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Rule.java @@ -1,77 +1,86 @@ package eu.eudat.models.components.commons; import eu.eudat.entities.xmlmodels.modeldefinition.DatabaseModelDefinition; +import eu.eudat.utilities.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; -import eu.eudat.utilities.XmlSerializable; +public class Rule implements XmlSerializable, DatabaseModelDefinition { + private String ruleType; + private String target; + private String ruleStyle; + private String value; + private String valueType; + + public String getRuleType() { + return ruleType; + } + + public void setRuleType(String ruleType) { + this.ruleType = ruleType; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public String getRuleStyle() { + return ruleStyle; + } + + public void setRuleStyle(String ruleStyle) { + this.ruleStyle = ruleStyle; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getValueType() { + return valueType; + } + + public void setValueType(String valueType) { + this.valueType = valueType; + } + + @Override + public Element toXml(Document doc) { + Element rule = doc.createElement("rule"); + rule.setAttribute("type", this.ruleType); + rule.setAttribute("target", this.target); + rule.setAttribute("ruleStyle", this.ruleStyle); + + Element value = doc.createElement("value"); + value.setAttribute("type", this.valueType); + value.setTextContent(this.value); + + rule.appendChild(value); + return rule; + } + + @Override + public Rule fromXml(Element item) { + this.ruleType = item.getAttribute("type"); + this.target = item.getAttribute("target"); + this.ruleStyle = item.getAttribute("ruleStyle"); + + Element value = (Element) item.getElementsByTagName("value").item(0); + if (value != null) { + this.valueType = value.getAttribute("type"); + this.value = value.getTextContent(); + } + + return this; + } + -public class Rule implements XmlSerializable,DatabaseModelDefinition { - private String ruleType; - private String target; - private String ruleStyle; - private String value; - private String valueType; - public String getRuleType() { - return ruleType; - } - public void setRuleType(String ruleType) { - this.ruleType = ruleType; - } - public String getTarget() { - return target; - } - public void setTarget(String target) { - this.target = target; - } - public String getRuleStyle() { - return ruleStyle; - } - public void setRuleStyle(String ruleStyle) { - this.ruleStyle = ruleStyle; - } - public String getValue() { - return value; - } - public void setValue(String value) { - this.value = value; - } - public String getValueType() { - return valueType; - } - public void setValueType(String valueType) { - this.valueType = valueType; - } - - @Override - public Element toXml(Document doc) { - Element rule = doc.createElement("rule"); - rule.setAttribute("type",this.ruleType); - rule.setAttribute("target", this.target); - rule.setAttribute("ruleStyle", this.ruleStyle); - - Element value = doc.createElement("value"); - value.setAttribute("type", this.valueType); - value.setTextContent(this.value); - - rule.appendChild(value); - return rule; - } - @Override - public Rule fromXml(Element item) { - this.ruleType = item.getAttribute("type"); - this.target = item.getAttribute("target"); - this.ruleStyle = item.getAttribute("ruleStyle"); - - Element value = (Element)item.getElementsByTagName("value").item(0); - if(value!=null){ - this.valueType = value.getAttribute("type"); - this.value = value.getTextContent(); - } - - return this; - } - - - } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java index 87794f2cc..7bcd39d57 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/ViewStyle.java @@ -1,20 +1,23 @@ package eu.eudat.models.components.commons; public class ViewStyle { - private String renderStyle; - private String cssClass; - - public String getRenderStyle() { - return renderStyle; - } - public void setRenderStyle(String renderStyle) { - this.renderStyle = renderStyle; - } - public String getCssClass() { - return cssClass; - } - public void setCssClass(String cssClass) { - this.cssClass = cssClass; - } - + private String renderStyle; + private String cssClass; + + public String getRenderStyle() { + return renderStyle; + } + + public void setRenderStyle(String renderStyle) { + this.renderStyle = renderStyle; + } + + public String getCssClass() { + return cssClass; + } + + public void setCssClass(String cssClass) { + this.cssClass = cssClass; + } + } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java index d423412db..7c7ec7b1d 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/Visibility.java @@ -1,57 +1,57 @@ package eu.eudat.models.components.commons; -import java.util.LinkedList; -import java.util.List; - +import eu.eudat.utilities.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import eu.eudat.utilities.XmlSerializable; +import java.util.LinkedList; +import java.util.List; -public class Visibility implements XmlSerializable{ - private List rules; - private String style; - public List getRules() { - return rules; - } +public class Visibility implements XmlSerializable { + private List rules; + private String style; - public void setRules(List rules) { - this.rules = rules; - } + public List getRules() { + return rules; + } - public String getStyle() { - return style; - } + public void setRules(List rules) { + this.rules = rules; + } - public void setStyle(String style) { - this.style = style; - } + public String getStyle() { + return style; + } - @Override - public Element toXml(Document doc) { - Element root = doc.createElement("visible"); - root.setAttribute("style", this.style); - if(rules!=null&&!rules.isEmpty()){ - for(Rule rule:rules){ - root.appendChild(rule.toXml(doc)); - } - } - return root; - } + public void setStyle(String style) { + this.style = style; + } - @Override - public Visibility fromXml(Element item) { - this.style = item.getAttribute("style"); - this.rules = new LinkedList(); - NodeList rulesElements = item.getChildNodes(); - for (int temp = 0; temp < rulesElements.getLength(); temp++) { - Node ruleElement = rulesElements.item(temp); - if (ruleElement .getNodeType() == Node.ELEMENT_NODE) { - this.rules.add(new Rule().fromXml((Element)ruleElement)); - } - } - return this; - } + @Override + public Element toXml(Document doc) { + Element root = doc.createElement("visible"); + root.setAttribute("style", this.style); + if (rules != null && !rules.isEmpty()) { + for (Rule rule : rules) { + root.appendChild(rule.toXml(doc)); + } + } + return root; + } + + @Override + public Visibility fromXml(Element item) { + this.style = item.getAttribute("style"); + this.rules = new LinkedList(); + NodeList rulesElements = item.getChildNodes(); + for (int temp = 0; temp < rulesElements.getLength(); temp++) { + Node ruleElement = rulesElements.item(temp); + if (ruleElement.getNodeType() == Node.ELEMENT_NODE) { + this.rules.add(new Rule().fromXml((Element) ruleElement)); + } + } + return this; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java index 0e59411f0..d29a0ce6e 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/AutoCompleteData.java @@ -1,75 +1,77 @@ package eu.eudat.models.components.commons.datafield; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -public class AutoCompleteData extends ComboBoxData{ - private String url; - private Option autoCompleteOptions; - - - - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - public Option getAutoCompleteOptions() { - return autoCompleteOptions; - } - public void setAutoCompleteOptions(Option autoCompleteOptions) { - this.autoCompleteOptions = autoCompleteOptions; - } - @Override - public Element toXml(Document doc) { - Element root = super.toXml(doc); +import java.util.Map; + +public class AutoCompleteData extends ComboBoxData { + private String url; + private Option autoCompleteOptions; + + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public Option getAutoCompleteOptions() { + return autoCompleteOptions; + } + + public void setAutoCompleteOptions(Option autoCompleteOptions) { + this.autoCompleteOptions = autoCompleteOptions; + } + + @Override + public Element toXml(Document doc) { + Element root = super.toXml(doc); + + root.setAttribute("url", this.url); + Element element = doc.createElement("option"); + element.setAttribute("label", this.autoCompleteOptions.getLabel()); + element.setAttribute("value", autoCompleteOptions.getValue()); + root.appendChild(element); + return root; + } + + @Override + public AutoCompleteData fromXml(Element item) { + super.fromXml(item); + this.url = item.getAttribute("url"); + Element optionElement = (Element) item.getElementsByTagName("option").item(0); + if (optionElement != null) { + this.autoCompleteOptions = new Option(); + this.autoCompleteOptions.setLabel(optionElement.getAttribute("label")); + this.autoCompleteOptions.setValue(optionElement.getAttribute("value")); + } + return this; + } + + @Override + public AutoCompleteData fromData(Object data) { + super.fromData(data); + this.autoCompleteOptions = new Option(); + if (data != null) { + this.url = (String) ((Map) data).get("url"); + Map options = ((Map>) data).get("option"); + if (options != null) { + this.autoCompleteOptions.setLabel(options.get("label")); + this.autoCompleteOptions.setValue(options.get("value")); + } + } + + return this; + } + + @Override + public Object toData() { + // TODO Auto-generated method stub + return null; + } + - root.setAttribute("url", this.url); - Element element = doc.createElement("option"); - element.setAttribute("label", this.autoCompleteOptions.getLabel()); - element.setAttribute("value", autoCompleteOptions.getValue()); - root.appendChild(element); - return root; - } - @Override - public AutoCompleteData fromXml(Element item) { - super.fromXml(item); - this.url = item.getAttribute("url"); - Element optionElement = (Element)item.getElementsByTagName("option").item(0); - if(optionElement!=null){ - this.autoCompleteOptions = new Option(); - this.autoCompleteOptions.setLabel(optionElement.getAttribute("label")); - this.autoCompleteOptions.setValue(optionElement.getAttribute("value")); - } - return this; - } - @Override - public AutoCompleteData fromData(Object data) { - super.fromData(data); - this.autoCompleteOptions = new Option(); - if(data!=null){ - this.url = (String)((Map)data).get("url"); - Map options = ((Map>)data).get("option"); - if(options!=null){ - this.autoCompleteOptions.setLabel(options.get("label")); - this.autoCompleteOptions.setValue(options.get("value")); - } - } - - return this; - } - @Override - public Object toData() { - // TODO Auto-generated method stub - return null; - } - - } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java index d97fb4889..26b2c9f6f 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/BooleanDecisionData.java @@ -5,32 +5,32 @@ import org.w3c.dom.Element; import java.util.Map; -public class BooleanDecisionData extends FieldData{ +public class BooleanDecisionData extends FieldData { - @Override - public BooleanDecisionData fromData(Object data) { - if(data!=null){ - this.setLabel((String)((Map)data).get("label")); - } - return this; - } + @Override + public BooleanDecisionData fromData(Object data) { + if (data != null) { + this.setLabel((String) ((Map) data).get("label")); + } + return this; + } - @Override - public Object toData() { - return null; - } + @Override + public Object toData() { + return null; + } - @Override - public Element toXml(Document doc) { - Element element = doc.createElement("data"); - element.setAttribute("label",this.getLabel()); - return element; - } + @Override + public Element toXml(Document doc) { + Element element = doc.createElement("data"); + element.setAttribute("label", this.getLabel()); + return element; + } - @Override - public BooleanDecisionData fromXml(Element item) { - this.setLabel(item.getAttribute("label")); - return this; - } + @Override + public BooleanDecisionData fromXml(Element item) { + this.setLabel(item.getAttribute("label")); + return this; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java index a2ec6d1bd..6fa9ddd14 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/CheckBoxData.java @@ -1,37 +1,37 @@ package eu.eudat.models.components.commons.datafield; -import java.util.Map; - import org.w3c.dom.Document; import org.w3c.dom.Element; -public class CheckBoxData extends FieldData{ +import java.util.Map; - @Override - public Element toXml(Document doc) { - Element root = doc.createElement("data"); - root.setAttribute("label", this.getLabel()); - return root; - } +public class CheckBoxData extends FieldData { - @Override - public CheckBoxData fromXml(Element item) { - this.setLabel(item!=null?item.getAttribute("label"):""); - return this; - } + @Override + public Element toXml(Document doc) { + Element root = doc.createElement("data"); + root.setAttribute("label", this.getLabel()); + return root; + } - @Override - public CheckBoxData fromData(Object data) { - if(data!=null){ - this.setLabel((String)((Map)data).get("label")); - } - return this; - } + @Override + public CheckBoxData fromXml(Element item) { + this.setLabel(item != null ? item.getAttribute("label") : ""); + return this; + } - @Override - public Object toData() { - // TODO Auto-generated method stub - return null; - } + @Override + public CheckBoxData fromData(Object data) { + if (data != null) { + this.setLabel((String) ((Map) data).get("label")); + } + return this; + } + + @Override + public Object toData() { + // TODO Auto-generated method stub + return null; + } } diff --git a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java index 61e73e41c..3713538d9 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java +++ b/dmp-backend/src/main/java/eu/eudat/models/components/commons/datafield/ComboBoxData.java @@ -1,85 +1,90 @@ package eu.eudat.models.components.commons.datafield; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - +import eu.eudat.utilities.XmlSerializable; import org.w3c.dom.Document; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import eu.eudat.utilities.XmlSerializable; +import java.util.Map; + +public abstract class ComboBoxData extends FieldData { + public class Option implements XmlSerializable