no message

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"]

dmp-backend/pom.xml

@@ -14,6 +14,7 @@
     <properties>
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>
+        <project.version>0.2.0</project.version>
 
         <dmp-backend-commons.version>0.0.1-SNAPSHOT</dmp-backend-commons.version>
         <org.springframework.version>4.3.8.RELEASE</org.springframework.version>
@@ -34,10 +35,9 @@
         <logback.version>1.1.1</logback.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet.servlet-api.version>3.0.1</javax.servlet.servlet-api.version>
-        <!-- 		<jcloverslf4j.version>1.7.6</jcloverslf4j.version> -->
+        <docker.image.prefix>ikalyvas</docker.image.prefix>
     </properties>
 
-
     <dependencies>
 
         <dependency>
@@ -189,6 +189,7 @@
     </dependencies>
 
     <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/ui-resources</directory>
@@ -206,8 +207,22 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.3.6</version>
+                <configuration>
+                    <repository>${docker.image.prefix}/${project.artifactId}</repository>
+                    <buildArgs>
+                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
     </build>
 
     <profiles>

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 {

dmp-backend/src/main/java/eu/eudat/builders/Builder.java

@@ -0,0 +1,8 @@
+package eu.eudat.builders;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public abstract class Builder<T> {
+    public abstract T build();
+}

dmp-backend/src/main/java/eu/eudat/builders/BuilderFactory.java

@@ -0,0 +1,8 @@
+package eu.eudat.builders;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public interface BuilderFactory {
+    <T extends Builder> T getBuilder(Class<T> tClass);
+}

dmp-backend/src/main/java/eu/eudat/builders/BuilderFactoryImpl.java

@@ -0,0 +1,30 @@
+package eu.eudat.builders;
+
+import eu.eudat.builders.entity.*;
+import eu.eudat.builders.model.criteria.DataRepositoryCriteriaBuilder;
+import eu.eudat.builders.model.criteria.RegistryCriteriaBuilder;
+import eu.eudat.builders.model.models.DataTableDataBuilder;
+import eu.eudat.builders.model.models.PrincipalBuilder;
+import eu.eudat.builders.model.models.ProjectBuilder;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+@Service("builderFactory")
+public class BuilderFactoryImpl implements BuilderFactory {
+
+    public <T extends Builder> T getBuilder(Class<T> tClass) {
+        if (tClass.equals(CredentialBuilder.class)) return (T) new CredentialBuilder();
+        if (tClass.equals(DataRepositoryCriteriaBuilder.class)) return (T) new DataRepositoryCriteriaBuilder();
+        if (tClass.equals(DatasetProfileBuilder.class)) return (T) new DatasetProfileBuilder();
+        if (tClass.equals(DataTableDataBuilder.class)) return (T) new DataTableDataBuilder<>();
+        if (tClass.equals(PrincipalBuilder.class)) return (T) new PrincipalBuilder();
+        if (tClass.equals(ProjectBuilder.class)) return (T) new ProjectBuilder();
+        if (tClass.equals(RegistryCriteriaBuilder.class)) return (T) new RegistryCriteriaBuilder();
+        if (tClass.equals(UserInfoBuilder.class)) return (T) new UserInfoBuilder();
+        if (tClass.equals(UserRoleBuilder.class)) return (T) new UserRoleBuilder();
+        if (tClass.equals(UserTokenBuilder.class)) return (T) new UserTokenBuilder();
+        return null;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java

@@ -0,0 +1,83 @@
+package eu.eudat.builders.entity;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.Credential;
+import eu.eudat.entities.UserInfo;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class CredentialBuilder extends Builder<Credential> {
+
+    private UUID id;
+
+    private UserInfo userInfo;
+
+    private Integer status;
+
+    private Integer provider;
+
+    private String publicValue;
+
+    private String secret;
+
+    private Date creationTime;
+
+    private Date lastUpdateTime;
+
+    public CredentialBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public CredentialBuilder userInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+        return this;
+    }
+
+    public CredentialBuilder status(Integer status) {
+        this.status = status;
+        return this;
+    }
+
+    public CredentialBuilder provider(Integer provider) {
+        this.provider = provider;
+        return this;
+    }
+
+    public CredentialBuilder publicValue(String publicValue) {
+        this.publicValue = publicValue;
+        return this;
+    }
+
+    public CredentialBuilder secret(String secret) {
+        this.secret = secret;
+        return this;
+    }
+
+    public CredentialBuilder creationTime(Date creationTime) {
+        this.creationTime = creationTime;
+        return this;
+    }
+
+    public CredentialBuilder lastUpdateTime(Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+        return this;
+    }
+
+    public Credential build() {
+        Credential credential = new Credential();
+        credential.setStatus(status);
+        credential.setLastUpdateTime(lastUpdateTime);
+        credential.setCreationTime(creationTime);
+        credential.setProvider(provider);
+        credential.setSecret(secret);
+        credential.setPublicValue(publicValue);
+        credential.setUserInfo(userInfo);
+        credential.setId(id);
+        return credential;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java

@@ -0,0 +1,85 @@
+package eu.eudat.builders.entity;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.Dataset;
+import eu.eudat.entities.DatasetProfile;
+
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class DatasetProfileBuilder extends Builder<DatasetProfile> {
+
+    private UUID id;
+
+    private String label;
+
+    private Set<Dataset> dataset;
+
+    private String definition;
+
+    private Short status;
+
+    private Date created;
+
+    private Date modified = new Date();
+
+    private String description;
+
+    public DatasetProfileBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public DatasetProfileBuilder label(String label) {
+        this.label = label;
+        return this;
+    }
+
+    public DatasetProfileBuilder dataset(Set<Dataset> dataset) {
+        this.dataset = dataset;
+        return this;
+    }
+
+    public DatasetProfileBuilder definition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+    public DatasetProfileBuilder status(Short status) {
+        this.status = status;
+        return this;
+    }
+
+    public DatasetProfileBuilder created(Date created) {
+        this.created = created;
+        return this;
+    }
+
+    public DatasetProfileBuilder modified(Date modified) {
+        this.modified = modified;
+        return this;
+    }
+
+    public DatasetProfileBuilder description(String description) {
+        this.description = description;
+        return this;
+    }
+
+    @Override
+    public DatasetProfile build() {
+        DatasetProfile datasetProfile = new DatasetProfile();
+        datasetProfile.setCreated(created);
+        datasetProfile.setStatus(status);
+        datasetProfile.setId(id);
+        datasetProfile.setDataset(dataset);
+        datasetProfile.setDefinition(definition);
+        datasetProfile.setDescription(description);
+        datasetProfile.setModified(modified);
+        datasetProfile.setLabel(label);
+        return datasetProfile;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java

@@ -0,0 +1,120 @@
+package eu.eudat.builders.entity;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.Credential;
+import eu.eudat.entities.DMP;
+import eu.eudat.entities.UserInfo;
+import eu.eudat.entities.UserRole;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class UserInfoBuilder extends Builder<UserInfo> {
+
+    private UUID id;
+
+    private String email = null;
+
+    private Short authorization_level; //0 admin, 1 user
+
+    private Short usertype; // 0 internal, 1 external
+
+    private Boolean verified_email = null;
+
+    private String name = null;
+
+    private Date created = null;
+
+    private Date lastloggedin = null;
+
+    private String additionalinfo;
+
+    private Set<DMP> dmps;
+
+    private Set<Credential> credentials = new HashSet<>();
+
+    private Set<UserRole> userRoles = new HashSet<>();
+
+    public UserInfoBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public UserInfoBuilder email(String email) {
+        this.email = email;
+        return this;
+    }
+
+    public UserInfoBuilder authorization_level(Short authorization_level) {
+        this.authorization_level = authorization_level;
+        return this;
+    }
+
+    public UserInfoBuilder usertype(Short usertype) {
+        this.usertype = usertype;
+        return this;
+    }
+
+    public UserInfoBuilder verified_email(Boolean verified_email) {
+        this.verified_email = verified_email;
+        return this;
+    }
+
+    public UserInfoBuilder name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public UserInfoBuilder created(Date created) {
+        this.created = created;
+        return this;
+    }
+
+    public UserInfoBuilder lastloggedin(Date lastloggedin) {
+        this.lastloggedin = lastloggedin;
+        return this;
+    }
+
+    public UserInfoBuilder additionalinfo(String additionalinfo) {
+        this.additionalinfo = additionalinfo;
+        return this;
+    }
+
+    public UserInfoBuilder dmps(Set<DMP> dmps) {
+        this.dmps = dmps;
+        return this;
+    }
+
+    public UserInfoBuilder credentials(Set<Credential> credentials) {
+        this.credentials = credentials;
+        return this;
+    }
+
+    public UserInfoBuilder userRoles(Set<UserRole> userRoles) {
+        this.userRoles = userRoles;
+        return this;
+    }
+
+    @Override
+    public UserInfo build() {
+        UserInfo userInfo = new UserInfo();
+        userInfo.setId(id);
+        userInfo.setUsertype(usertype);
+        userInfo.setAuthorization_level(authorization_level);
+        userInfo.setLastloggedin(lastloggedin);
+        userInfo.setCreated(created);
+        userInfo.setEmail(email);
+        userInfo.setName(name);
+        userInfo.setAdditionalinfo(additionalinfo);
+        userInfo.setUserRoles(userRoles);
+        userInfo.setCredentials(credentials);
+        userInfo.setDmps(dmps);
+        userInfo.setVerified_email(verified_email);
+        return userInfo;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java

@@ -0,0 +1,43 @@
+package eu.eudat.builders.entity;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.UserInfo;
+import eu.eudat.entities.UserRole;
+
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class UserRoleBuilder extends Builder<UserRole> {
+
+    private UUID id;
+
+    private int role;
+
+    private UserInfo userInfo;
+
+    public UserRoleBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public UserRoleBuilder role(int role) {
+        this.role = role;
+        return this;
+    }
+
+    public UserRoleBuilder userInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+        return this;
+    }
+
+    @Override
+    public UserRole build() {
+        UserRole userRole = new UserRole();
+        userRole.setUserInfo(userInfo);
+        userRole.setRole(role);
+        userRole.setId(id);
+        return userRole;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java

@@ -0,0 +1,52 @@
+package eu.eudat.builders.entity;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.UserInfo;
+import eu.eudat.entities.UserToken;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class UserTokenBuilder extends Builder<UserToken> {
+
+    private UUID token;
+
+    private UserInfo user;
+
+    private Date issuedAt;
+
+    private Date expiresAt;
+
+    public UserTokenBuilder token(UUID token) {
+        this.token = token;
+        return this;
+    }
+
+    public UserTokenBuilder user(UserInfo user) {
+        this.user = user;
+        return this;
+    }
+
+    public UserTokenBuilder issuedAt(Date issuedAt) {
+        this.issuedAt = issuedAt;
+        return this;
+    }
+
+    public UserTokenBuilder expiresAt(Date expiresAt) {
+        this.expiresAt = expiresAt;
+        return this;
+    }
+
+    @Override
+    public UserToken build() {
+        UserToken userToken = new UserToken();
+        userToken.setExpiresAt(expiresAt);
+        userToken.setToken(token);
+        userToken.setUser(user);
+        userToken.setIssuedAt(issuedAt);
+        return userToken;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java

@@ -0,0 +1,23 @@
+package eu.eudat.builders.model.criteria;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.criteria.DataRepositoryCriteria;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class DataRepositoryCriteriaBuilder extends Builder<DataRepositoryCriteria> {
+    private String like;
+
+    public DataRepositoryCriteriaBuilder like(String like) {
+        this.like = like;
+        return this;
+    }
+
+    @Override
+    public DataRepositoryCriteria build() {
+        DataRepositoryCriteria dataRepositoryCriteria = new DataRepositoryCriteria();
+        dataRepositoryCriteria.setLike(like);
+        return dataRepositoryCriteria;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java

@@ -0,0 +1,23 @@
+package eu.eudat.builders.model.criteria;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.criteria.ExternalDatasetCriteria;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class ExternalDatasetCriteriaBuilder extends Builder<ExternalDatasetCriteria> {
+    private String like;
+
+    public ExternalDatasetCriteriaBuilder like(String like) {
+        this.like = like;
+        return this;
+    }
+
+    @Override
+    public ExternalDatasetCriteria build() {
+        ExternalDatasetCriteria externalDatasetCriteria = new ExternalDatasetCriteria();
+        externalDatasetCriteria.setLike(like);
+        return externalDatasetCriteria;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java

@@ -0,0 +1,23 @@
+package eu.eudat.builders.model.criteria;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.criteria.RegistryCriteria;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class RegistryCriteriaBuilder extends Builder<RegistryCriteria> {
+    private String like;
+
+    public RegistryCriteriaBuilder like(String like) {
+        this.like = like;
+        return this;
+    }
+
+    @Override
+    public RegistryCriteria build() {
+        RegistryCriteria registryCriteria = new RegistryCriteria();
+        registryCriteria.setLike(like);
+        return registryCriteria;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java

@@ -0,0 +1,23 @@
+package eu.eudat.builders.model.criteria;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.criteria.ServiceCriteria;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class ServiceCriteriaBuilder extends Builder<ServiceCriteria> {
+    private String like;
+
+    public ServiceCriteriaBuilder setLike(String like) {
+        this.like = like;
+        return this;
+    }
+
+    @Override
+    public ServiceCriteria build() {
+        ServiceCriteria serviceCriteria = new ServiceCriteria();
+        serviceCriteria.setLike(like);
+        return serviceCriteria;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/models/DataTableDataBuilder.java

@@ -0,0 +1,33 @@
+package eu.eudat.builders.model.models;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.helpers.common.DataTableData;
+
+import java.util.List;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class DataTableDataBuilder<T> extends Builder<DataTableData<T>> {
+
+    private Long totalCount;
+    private List<T> data;
+
+    public DataTableDataBuilder<T> totalCount(Long totalCount) {
+        this.totalCount = totalCount;
+        return this;
+    }
+
+    public DataTableDataBuilder<T> data(List<T> data) {
+        this.data = data;
+        return this;
+    }
+
+    @Override
+    public DataTableData<T> build() {
+        DataTableData<T> dataTableData = new DataTableData<>();
+        dataTableData.setTotalCount(totalCount);
+        dataTableData.setData(data);
+        return dataTableData;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/models/PrincipalBuilder.java

@@ -0,0 +1,57 @@
+package eu.eudat.builders.model.models;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.models.security.Principal;
+import eu.eudat.types.Authorities;
+
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class PrincipalBuilder extends Builder<Principal> {
+
+    private UUID id;
+    private UUID token;
+    private String name;
+    private Date expiresAt;
+    private Set<Authorities> authorities;
+
+    public PrincipalBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public PrincipalBuilder token(UUID token) {
+        this.token = token;
+        return this;
+    }
+
+    public PrincipalBuilder name(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public PrincipalBuilder expiresAt(Date expiresAt) {
+        this.expiresAt = expiresAt;
+        return this;
+    }
+
+    public PrincipalBuilder authorities(Set<Authorities> authorities) {
+        this.authorities = authorities;
+        return this;
+    }
+
+    @Override
+    public Principal build() {
+        Principal principal = new Principal();
+        principal.setAuthorities(authorities);
+        principal.setName(name);
+        principal.setExpiresAt(expiresAt);
+        principal.setToken(token);
+        principal.setId(id);
+        return principal;
+    }
+}

dmp-backend/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java

@@ -0,0 +1,134 @@
+package eu.eudat.builders.model.models;
+
+import eu.eudat.builders.Builder;
+import eu.eudat.entities.UserInfo;
+import eu.eudat.models.dmp.DataManagementPlan;
+import eu.eudat.models.project.Project;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Created by ikalyvas on 2/15/2018.
+ */
+public class ProjectBuilder extends Builder<Project> {
+
+    private UUID id;
+
+    private List<DataManagementPlan> dmps;
+
+    private String label;
+
+    private String abbreviation;
+
+    private String reference;
+
+    private String uri;
+
+    private String definition;
+
+    private Date startDate;
+
+    private Date endDate;
+
+    private eu.eudat.entities.Project.Status status;
+
+    private UserInfo creationUser;
+
+    private Date created;
+
+    private Date modified;
+
+    private String description;
+
+    public ProjectBuilder id(UUID id) {
+        this.id = id;
+        return this;
+    }
+
+    public ProjectBuilder dmps(List<DataManagementPlan> dmps) {
+        this.dmps = dmps;
+        return this;
+    }
+
+    public ProjectBuilder label(String label) {
+        this.label = label;
+        return this;
+    }
+
+    public ProjectBuilder abbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+        return this;
+    }
+
+    public ProjectBuilder reference(String reference) {
+        this.reference = reference;
+        return this;
+    }
+
+    public ProjectBuilder uri(String uri) {
+        this.uri = uri;
+        return this;
+    }
+
+    public ProjectBuilder definition(String definition) {
+        this.definition = definition;
+        return this;
+    }
+
+    public ProjectBuilder startDate(Date startDate) {
+        this.startDate = startDate;
+        return this;
+    }
+
+    public ProjectBuilder endDate(Date endDate) {
+        this.endDate = endDate;
+        return this;
+    }
+
+    public ProjectBuilder status(eu.eudat.entities.Project.Status status) {
+        this.status = status;
+        return this;
+    }
+
+    public ProjectBuilder creationUser(UserInfo creationUser) {
+        this.creationUser = creationUser;
+        return this;
+    }
+
+    public ProjectBuilder created(Date created) {
+        this.created = created;
+        return this;
+    }
+
+    public ProjectBuilder modified(Date modified) {
+        this.modified = modified;
+        return this;
+    }
+
+    public ProjectBuilder description(String description) {
+        this.description = description;
+        return this;
+    }
+
+    @Override
+    public Project build() {
+        Project project = new Project();
+        project.setStatus(status.getValue());
+        project.setAbbreviation(abbreviation);
+        project.setCreated(created);
+        project.setCreationUser(creationUser);
+        project.setDefinition(definition);
+        project.setDescription(description);
+        project.setDmps(dmps);
+        project.setEndDate(endDate);
+        project.setId(id);
+        project.setLabel(label);
+        project.setModified(modified);
+        project.setReference(reference);
+        project.setCreationUser(creationUser);
+        project.setStartDate(startDate);
+        return project;
+    }
+}

dmp-backend/src/main/java/eu/eudat/cache/ResponsesCache.java

@@ -1,20 +1,18 @@
 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

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;

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<HandlerMethodArgumentResolver> argumentResolvers) {
         argumentResolvers.add(new PrincipalArgumentResolver(this.authenticationService));

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<Object> addDmp(@Valid @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
         try {
-            eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile);
+            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<ResponseItem<UUID>> updateDmp(@PathVariable String id, @RequestBody DatasetProfile profile, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
         try {
-            eu.eudat.entities.DatasetProfile modelDefinition = AdminManager.generateViewStyleDefinition(profile);
+            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());

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;
 
@@ -25,10 +23,14 @@ public abstract class BaseController {
 
     @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));
 
     }
 }

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
@@ -73,8 +71,6 @@ public class DMPs extends BaseController {
             ex.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DMP>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
         }
-
-
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/dmps/new/{id}"}, consumes = "application/json", produces = "application/json")

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,12 +14,6 @@ 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"})
@@ -34,8 +30,7 @@ public class DashBoardController extends BaseController{
             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<DashBoardStatistics>().status(ApiMessageCode.NO_MESSAGE).payload(statistics));
-		}
-		catch(Exception ex) {
+        } catch (Exception ex) {
             ex.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DashBoardStatistics>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
         }
@@ -47,8 +42,7 @@ public class DashBoardController extends BaseController{
             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<DashBoardStatistics>().status(ApiMessageCode.NO_MESSAGE).payload(statistics));
-		}
-		catch(Exception ex) {
+        } catch (Exception ex) {
             ex.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DashBoardStatistics>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
         }

dmp-backend/src/main/java/eu/eudat/controllers/DataRepositories.java

@@ -1,23 +1,17 @@
 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
@@ -31,15 +25,14 @@ public class DataRepositories extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/datarepos"}, produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<List<Map<String,String>>>> listExternalDataRepositories(@RequestParam(value="query", required=false) String query ){
+    public @ResponseBody
+    ResponseEntity<ResponseItem<List<Map<String, String>>>> listExternalDataRepositories(@RequestParam(value = "query", required = false) String query) {
         try {
             List<Map<String, String>> remoteRepos = this.getApiContext().getRemoteFetcher().getRepositories(query);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<Map<String, String>>>().status(ApiMessageCode.NO_MESSAGE).payload(remoteRepos));
-		}
-		catch(NoURLFound ex) {
+        } catch (NoURLFound ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<List<Map<String, String>>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null));
-		}
-		catch(HugeResultSet ex) {
+        } catch (HugeResultSet ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<List<Map<String, String>>>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()).payload(null));
         }
     }

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

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
@@ -47,7 +42,7 @@ public class DatasetProfiles extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<DataTableData<DatasetProfileListingModel>>> getPaged(@RequestBody DatasetProfileTableRequestItem datasetProfileTableRequestItem) {
         try {
-            DataTableData<DatasetProfileListingModel> datasetProfileTableData = DatasetProfileManager.getPaged(this.getApiContext().getDatabaseRepository().getDatasetProfileDao(), datasetProfileTableRequestItem);
+            DataTableData<DatasetProfileListingModel> datasetProfileTableData = DatasetProfileManager.getPaged(this.getApiContext(), datasetProfileTableRequestItem);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(datasetProfileTableData));
         } catch (Exception ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<DataTableData<DatasetProfileListingModel>>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE));

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

dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java

@@ -28,9 +28,10 @@ public class ExternalDatasets extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getPaged"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody ResponseEntity<ResponseItem<DataTableData<ExternalDatasetListingModel>>> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<DataTableData<ExternalDatasetListingModel>>> getPaged(@RequestBody ExternalDatasetTableRequest datasetTableRequest, Principal principal) {
         try {
-            DataTableData<ExternalDatasetListingModel> dataTable = new ExternalDatasetManager().getPaged(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), datasetTableRequest);
+            DataTableData<ExternalDatasetListingModel> dataTable = new ExternalDatasetManager().getPaged(this.getApiContext(), datasetTableRequest);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<ExternalDatasetListingModel>>().status(ApiMessageCode.NO_MESSAGE).payload(dataTable));
 
         } catch (Exception ex) {
@@ -40,9 +41,10 @@ public class ExternalDatasets extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/datasets"}, produces = "application/json")
-    public @ResponseBody ResponseEntity<ResponseItem<List<ExternalDatasetListingModel>>> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<List<ExternalDatasetListingModel>>> getWithExternal(@RequestParam(value = "query", required = false) String query, Principal principal) {
         try {
-            List<ExternalDatasetListingModel> dataTable = new ExternalDatasetManager().getWithExternal(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), query, this.getApiContext().getRemoteFetcher());
+            List<ExternalDatasetListingModel> dataTable = new ExternalDatasetManager().getWithExternal(this.getApiContext(), query, this.getApiContext().getRemoteFetcher());
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<ExternalDatasetListingModel>>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE));
         } catch (Exception ex) {
             ex.printStackTrace();
@@ -51,7 +53,8 @@ public class ExternalDatasets extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getSingle/{id}"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody ResponseItem<ExternalDatasetListingModel> getWithExternal(@PathVariable UUID id, Principal principal) {
+    public @ResponseBody
+    ResponseItem<ExternalDatasetListingModel> getWithExternal(@PathVariable UUID id, Principal principal) {
         try {
             ExternalDatasetListingModel externalDatasetModel = new ExternalDatasetManager().getSingle(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), id);
             return new ResponseItem<ExternalDatasetListingModel>().payload(externalDatasetModel).status(ApiMessageCode.NO_MESSAGE);

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;

dmp-backend/src/main/java/eu/eudat/controllers/Organisations.java

@@ -1,24 +1,18 @@
 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
@@ -32,16 +26,15 @@ public class Organisations extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/organisations"}, produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<OrganisationsExternalSourcesModel>> listExternalOrganisations(@RequestParam(value="query", required=false) String query ){
+    public @ResponseBody
+    ResponseEntity<ResponseItem<OrganisationsExternalSourcesModel>> listExternalOrganisations(@RequestParam(value = "query", required = false) String query) {
         try {
             List<Map<String, String>> remoteRepos = this.getApiContext().getRemoteFetcher().getOrganisations(query);
             OrganisationsExternalSourcesModel projectsExternalSourcesModel = new OrganisationsExternalSourcesModel().fromExternalItem(remoteRepos);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<OrganisationsExternalSourcesModel>().payload(projectsExternalSourcesModel).status(ApiMessageCode.SUCCESS_MESSAGE));
-		}
-		catch(NoURLFound ex) {
+        } catch (NoURLFound ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<OrganisationsExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found"));
-		}
-		catch(HugeResultSet ex) {
+        } catch (HugeResultSet ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<OrganisationsExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set"));
         } catch (Exception ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<OrganisationsExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()));

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
@@ -104,7 +90,7 @@ public class Projects extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<List<eu.eudat.models.project.Project>>> getWithExternal(@RequestBody ProjectCriteriaRequest projectCriteria, Principal principal) {
         try {
-            List<eu.eudat.models.project.Project> dataTable = new ProjectManager().getCriteriaWithExternal(this.getApiContext().getDatabaseRepository().getProjectDao(), projectCriteria, this.getApiContext().getRemoteFetcher());
+            List<eu.eudat.models.project.Project> dataTable = new ProjectManager().getCriteriaWithExternal(this.getApiContext(), projectCriteria, this.getApiContext().getRemoteFetcher());
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<eu.eudat.models.project.Project>>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE));
         } catch (Exception ex) {
             ex.printStackTrace();

dmp-backend/src/main/java/eu/eudat/controllers/Registries.java

@@ -1,24 +1,18 @@
 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
@@ -32,17 +26,16 @@ public class Registries extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/registries"}, produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<RegistriesExternalSourcesModel>> listExternalRegistries(@RequestParam(value="query", required=false) String query ){
+    public @ResponseBody
+    ResponseEntity<ResponseItem<RegistriesExternalSourcesModel>> listExternalRegistries(@RequestParam(value = "query", required = false) String query) {
         try {
             List<Map<String, String>> remoteRepos = this.getApiContext().getRemoteFetcher().getRegistries(query);
             RegistriesExternalSourcesModel registriesExternalSourcesModel = new RegistriesExternalSourcesModel().fromExternalItem(remoteRepos);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<RegistriesExternalSourcesModel>().payload(registriesExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE));
-		}
-		catch(NoURLFound ex) {
+        } catch (NoURLFound ex) {
             ex.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<RegistriesExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found"));
-		}
-		catch(HugeResultSet ex) {
+        } catch (HugeResultSet ex) {
             ex.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<RegistriesExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set"));
         } catch (Exception ex) {

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,8 +16,8 @@ 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
@@ -33,16 +32,15 @@ public class Researchers extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/researchers"}, produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<ResearchersExternalSourcesModel>> listExternalResearchers(@RequestParam(value="query", required=false) String query ){
+    public @ResponseBody
+    ResponseEntity<ResponseItem<ResearchersExternalSourcesModel>> listExternalResearchers(@RequestParam(value = "query", required = false) String query) {
         try {
             List<Map<String, String>> remoteRepos = this.getApiContext().getRemoteFetcher().getResearchers(query);
             ResearchersExternalSourcesModel researchersExternalSourcesModel = new ResearchersExternalSourcesModel().fromExternalItem(remoteRepos);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ResearchersExternalSourcesModel>().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE));
-		}
-		catch(NoURLFound ex) {
+        } catch (NoURLFound ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ResearchersExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found"));
-		}
-		catch(HugeResultSet ex) {
+        } catch (HugeResultSet ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ResearchersExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set"));
         } catch (Exception ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ResearchersExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()));
@@ -51,15 +49,15 @@ public class Researchers extends BaseController{
 
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/researchers/create"}, consumes = "application/json", produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<Researcher>> create(@RequestBody eu.eudat.models.researcher.Researcher researcher, Principal principal) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Researcher>> create(@RequestBody eu.eudat.models.researcher.Researcher researcher, Principal principal) {
         try {
             ResearcherManager.create(this.getApiContext(), researcher);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Researcher>().status(ApiMessageCode.SUCCESS_MESSAGE));
         } catch (UnauthorisedException e) {
             e.printStackTrace();
             throw e;
-		}
-		catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<Researcher>().status(ApiMessageCode.SUCCESS_MESSAGE).message(e.getMessage()));
         }

dmp-backend/src/main/java/eu/eudat/controllers/Services.java

@@ -1,24 +1,18 @@
 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
@@ -32,16 +26,15 @@ public class Services extends BaseController{
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/external/services"}, produces = "application/json")
-	public @ResponseBody ResponseEntity<ResponseItem<ServiceExternalSourcesModel>> listExternalServices(@RequestParam(value="query", required=false) String query ){
+    public @ResponseBody
+    ResponseEntity<ResponseItem<ServiceExternalSourcesModel>> listExternalServices(@RequestParam(value = "query", required = false) String query) {
         try {
             List<Map<String, String>> remoteRepos = this.getApiContext().getRemoteFetcher().getServices(query);
             ServiceExternalSourcesModel serviceExternalSourcesModel = new ServiceExternalSourcesModel().fromExternalItem(remoteRepos);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<ServiceExternalSourcesModel>().payload(serviceExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE));
-		}
-		catch(NoURLFound ex) {
+        } catch (NoURLFound ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ServiceExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("External Url Not Found"));
-		}
-		catch(HugeResultSet ex) {
+        } catch (HugeResultSet ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ServiceExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message("Huge Result Set"));
         } catch (Exception ex) {
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<ServiceExternalSourcesModel>().status(ApiMessageCode.ERROR_MESSAGE).message(ex.getMessage()));

dmp-backend/src/main/java/eu/eudat/controllers/UserInvitationController.java

@@ -31,7 +31,8 @@ public class UserInvitationController extends BaseController{
 
     @Transactional
     @RequestMapping(method = RequestMethod.POST, value = {"/users"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody ResponseEntity<ResponseItem<Invitation>> users(@RequestBody Invitation invitation, Principal principal) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<Invitation>> users(@RequestBody Invitation invitation, Principal principal) {
         try {
             InvitationsManager.inviteUsers(this.getApiContext(), invitation, principal);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<Invitation>().status(ApiMessageCode.SUCCESS_MESSAGE).message("Users have beeen invited"));
@@ -43,22 +44,23 @@ public class UserInvitationController extends BaseController{
 
     @Transactional
     @RequestMapping(method = RequestMethod.GET, value = {"/exchange/{invitationID}"}, produces = "application/json")
-    public @ResponseBody ResponseEntity<ResponseItem<UUID>> exchange(@PathVariable UUID invitationID, Principal principal) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<UUID>> exchange(@PathVariable UUID invitationID, Principal principal) {
         try {
             UUID dmpId = InvitationsManager.assignUserAcceptedInvitation(this.getApiContext(), invitationID, principal);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<UUID>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(dmpId));
         } catch (UnauthorisedException e) {
             e.printStackTrace();
             throw e;
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(new ResponseItem<UUID>().status(ApiMessageCode.SUCCESS_MESSAGE).message(e.getMessage()));
         }
     }
 
     @RequestMapping(method = RequestMethod.POST, value = {"/getUsers"}, consumes = "application/json", produces = "application/json")
-    public @ResponseBody ResponseEntity<ResponseItem<List<UserInfoInvitationModel>>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) {
+    public @ResponseBody
+    ResponseEntity<ResponseItem<List<UserInfoInvitationModel>>> getUsers(@RequestBody UserInfoRequestItem userInfoRequestItem) {
         try {
             List<UserInfoInvitationModel> users = InvitationsManager.getUsers(this.getApiContext(), userInfoRequestItem);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<List<UserInfoInvitationModel>>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(users));

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
@@ -38,7 +34,7 @@ public class Users extends BaseController {
     public @ResponseBody
     ResponseEntity<ResponseItem<DataTableData<UserListingModel>>> getPaged(@Valid @RequestBody UserInfoTableRequestItem userInfoTableRequestItem, @ClaimedAuthorities(claims = {ADMIN}) Principal principal) {
         try {
-            DataTableData<UserListingModel> dataTable = UserManager.getPaged(this.getApiContext().getDatabaseRepository().getUserInfoDao(), userInfoTableRequestItem);
+            DataTableData<UserListingModel> dataTable = UserManager.getPaged(this.getApiContext(), userInfoTableRequestItem);
             return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DataTableData<UserListingModel>>().payload(dataTable).status(ApiMessageCode.NO_MESSAGE));
         } catch (Exception ex) {
             ex.printStackTrace();

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")

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")

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,6 +7,8 @@ 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<DMP, UUID> {
 
     QueryableList<DMP> getWithCriteria(DataManagementPlanCriteria criteria);

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<DMP> implements DMPDao {
 

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;
 
+import java.util.UUID;
+
 public interface DataRepositoryDao extends DatabaseAccessLayer<DataRepository, UUID> {
     QueryableList<DataRepository> getWithCriteria(DataRepositoryCriteria criteria);
 }

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<DataRepository> implements DataRepositoryDao {
 

dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDao.java

@@ -1,15 +1,13 @@
 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;
+
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public interface DatasetDao extends DatabaseAccessLayer<Dataset, UUID> {
 

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<Dataset> implements DatasetDao {

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<DatasetProfile, UUID> {
 
     QueryableList<DatasetProfile> getWithCriteria(DatasetProfileCriteria criteria);

dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.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.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<DatasetProfile> implements DatasetProfileDao {
 
@@ -22,7 +21,8 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DatasetProfile> implem
     @Override
     public QueryableList<DatasetProfile> getWithCriteria(DatasetProfileCriteria criteria) {
         QueryableList<DatasetProfile> query = getDatabaseService().getQueryable(DatasetProfile.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;
     }
 

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;

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,7 +22,8 @@ public class ExternalDatasetDaoImpl extends DatabaseAccess<ExternalDataset> impl
     @Override
     public QueryableList<ExternalDataset> getWithCriteria(ExternalDatasetCriteria criteria) {
         QueryableList<ExternalDataset> 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;
     }
 

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;
 

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;

dmp-backend/src/main/java/eu/eudat/dao/entities/OrganisationDao.java

@@ -1,13 +1,12 @@
 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<Organisation, UUID> {
 
     QueryableList<Organisation> getWithCriteria(OrganisationCriteria criteria);

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<Organisation> implements OrganisationDao {
 

dmp-backend/src/main/java/eu/eudat/dao/entities/ProjectDao.java

@@ -1,15 +1,13 @@
 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<Project, UUID> {
 
     QueryableList<Project> getWithCriteria(ProjectCriteria criteria);

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<Project> implements ProjectDao {
 

dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDao.java

@@ -1,13 +1,12 @@
 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<Registry, UUID> {
 
     QueryableList<Registry> getWithCriteria(RegistryCriteria criteria);

dmp-backend/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.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.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<Registry> implements RegistryDao {
 
@@ -23,7 +21,8 @@ public class RegistryDaoImpl extends DatabaseAccess<Registry> implements Registr
     @Override
     public QueryableList<Registry> getWithCriteria(RegistryCriteria criteria) {
         QueryableList<Registry> query = this.getDatabaseService().getQueryable(Registry.class);
-		if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike()));
+        if (criteria.getLike() != null)
+            query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike()));
         return query;
     }
 

dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDao.java

@@ -1,13 +1,12 @@
 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<Researcher, UUID> {
 
     QueryableList<Researcher> getWithCriteria(ResearcherCriteria criteria);

dmp-backend/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.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.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<Researcher> implements ResearcherDao {
 
@@ -23,7 +21,8 @@ public class ResearcherDaoImpl extends DatabaseAccess<Researcher> implements Res
     @Override
     public QueryableList<Researcher> getWithCriteria(ResearcherCriteria criteria) {
         QueryableList<Researcher> query = this.getDatabaseService().getQueryable(Researcher.class);
-		if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike()));
+        if (criteria.getLike() != null)
+            query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike()));
         return query;
     }
 

dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDao.java

@@ -1,13 +1,12 @@
 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<Service, UUID> {
 
     QueryableList<Service> getWithCriteria(ServiceCriteria criteria);

dmp-backend/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.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.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<Service> implements ServiceDao {
 
@@ -23,7 +21,8 @@ public class ServiceDaoImpl extends DatabaseAccess<Service> implements ServiceDa
     @Override
     public QueryableList<Service> getWithCriteria(ServiceCriteria criteria) {
         QueryableList<Service> query = this.getDatabaseService().getQueryable(Service.class);
-		if(criteria.getLike()!=null) query.where((builder, root) -> builder.equal(root.get("reference"),criteria.getLike()));
+        if (criteria.getLike() != null)
+            query.where((builder, root) -> builder.equal(root.get("reference"), criteria.getLike()));
         return query;
     }
 

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;

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;

dmp-backend/src/main/java/eu/eudat/dao/entities/UserInfoDao.java

@@ -1,13 +1,12 @@
 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<UserInfo, UUID> {
 
     QueryableList<UserInfo> getWithCriteria(UserInfoCriteria criteria);

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<UserInfo> implements UserInfoDao {
 

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;

dmp-backend/src/main/java/eu/eudat/dao/entities/security/CredentialDao.java

@@ -2,7 +2,6 @@ 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;

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;

dmp-backend/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java

@@ -1,7 +1,6 @@
 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;

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;

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

dmp-backend/src/main/java/eu/eudat/entities/DMPOrganisation.java

@@ -1,19 +1,11 @@
 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 com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.UUID;
 
 
 @Entity

dmp-backend/src/main/java/eu/eudat/entities/DMPProfile.java

@@ -1,24 +1,13 @@
 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

dmp-backend/src/main/java/eu/eudat/entities/DMPResearcher.java

@@ -1,20 +1,11 @@
 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

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<T> {
     void update(T entity);
 

dmp-backend/src/main/java/eu/eudat/entities/DataRepository.java

@@ -1,26 +1,14 @@
 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.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
 
 @Entity
 @Table(name = "\"DataRepository\"")
@@ -49,7 +37,6 @@ public class DataRepository implements Serializable,DataEntity<DataRepository> {
     private String definition;
 
 
-	
     @OneToMany(fetch = FetchType.LAZY)
     @JoinTable(name = "\"DatasetDataRepository\"",
             joinColumns = {@JoinColumn(name = "\"DataRepository\"", referencedColumnName = "\"ID\"")},
@@ -98,7 +85,6 @@ public class DataRepository implements Serializable,DataEntity<DataRepository> {
     }
 
 
-	
     public UUID getId() {
         return id;
     }

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\"")

dmp-backend/src/main/java/eu/eudat/entities/DatasetExternalDataset.java

@@ -7,7 +7,6 @@ import javax.persistence.*;
 import java.util.UUID;
 
 
-
 @Entity
 @Table(name = "\"DatasetExternalDataset\"")
 public class DatasetExternalDataset {

dmp-backend/src/main/java/eu/eudat/entities/DatasetProfile.java

@@ -1,26 +1,14 @@
 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.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;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
 
 
 @Entity
@@ -98,7 +86,6 @@ public class DatasetProfile implements Serializable,DataEntity<DatasetProfile> {
     }
 
 
-	
     public UUID getId() {
         return id;
     }
@@ -116,7 +103,6 @@ public class DatasetProfile implements Serializable,DataEntity<DatasetProfile> {
     }
 
 
-
     public String getDefinition() {
         return definition;
     }
@@ -126,7 +112,6 @@ public class DatasetProfile implements Serializable,DataEntity<DatasetProfile> {
     }
 
 
-
     public Set<Dataset> getDataset() {
         return dataset;
     }

dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java

@@ -1,22 +1,12 @@
 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
@@ -64,5 +54,4 @@ public class DatasetProfileRuleset implements Serializable {
     }
 
 
-
 }

dmp-backend/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java

@@ -1,22 +1,11 @@
 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
@@ -24,7 +13,6 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 public class DatasetProfileViewstyle {
 
 
-	
     @Id
     @GeneratedValue
     @GenericGenerator(name = "uuid2", strategy = "uuid2")

dmp-backend/src/main/java/eu/eudat/entities/DatasetRegistry.java

@@ -1,20 +1,12 @@
 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

dmp-backend/src/main/java/eu/eudat/entities/DatasetService.java

@@ -1,20 +1,12 @@
 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

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.*;

dmp-backend/src/main/java/eu/eudat/entities/Invitation.java

@@ -4,7 +4,6 @@ import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
-import java.util.Date;
 import java.util.UUID;
 
 

dmp-backend/src/main/java/eu/eudat/entities/Organisation.java

@@ -1,26 +1,14 @@
 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.io.Serializable;
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
 
 
 @Entity
@@ -59,7 +47,6 @@ public class Organisation implements Serializable,DataEntity<Organisation> {
     private Set<DMP> dMPs;
 
 
-	
     @Column(name = "\"Status\"", nullable = false)
     private Short status;
 

dmp-backend/src/main/java/eu/eudat/entities/Project.java

@@ -1,29 +1,16 @@
 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.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;
+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;
 
 
 @Entity

dmp-backend/src/main/java/eu/eudat/entities/Registry.java

@@ -1,26 +1,13 @@
 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
@@ -59,7 +46,6 @@ public class Registry implements DataEntity<Registry> {
     private Set<Dataset> datasets;
 
 
-	
     @Column(name = "\"Status\"", nullable = false)
     private Short status;
 

dmp-backend/src/main/java/eu/eudat/entities/Researcher.java

@@ -1,26 +1,13 @@
 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

dmp-backend/src/main/java/eu/eudat/entities/Service.java

@@ -1,26 +1,13 @@
 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

dmp-backend/src/main/java/eu/eudat/entities/UserDMP.java

@@ -1,16 +1,9 @@
 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\"")

dmp-backend/src/main/java/eu/eudat/entities/UserInfo.java

@@ -1,18 +1,13 @@
 package eu.eudat.entities;
 
-import java.io.Serializable;
-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;
+import javax.persistence.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
 
 
 @Entity

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;
 
 

dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Field.java

@@ -1,14 +1,14 @@
 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;
 
@@ -27,18 +27,23 @@ public class Field implements DatabaseViewStyleDefinition,XmlSerializable<Field>
     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;
     }
@@ -46,6 +51,7 @@ public class Field implements DatabaseViewStyleDefinition,XmlSerializable<Field>
     public FieldData getData() {
         return data;
     }
+
     public void setData(FieldData data) {
         this.data = data;
     }
@@ -61,6 +67,7 @@ public class Field implements DatabaseViewStyleDefinition,XmlSerializable<Field>
     public Visibility getVisible() {
         return visible;
     }
+
     public void setVisible(Visibility visible) {
         this.visible = visible;
     }
@@ -103,6 +110,7 @@ public class Field implements DatabaseViewStyleDefinition,XmlSerializable<Field>
         if (this.data != null) rootElement.appendChild(this.data.toXml(doc));
         return rootElement;
     }
+
     @Override
     public Field fromXml(Element element) {
         this.id = element.getAttribute("id");

dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/FieldSet.java

@@ -1,16 +1,15 @@
 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<FieldSet> {
     private String id;
@@ -22,6 +21,7 @@ public class FieldSet implements DatabaseViewStyleDefinition,XmlSerializable<Fie
     private Multiplicity multiplicity;
     private boolean hasCommentField;
     private String commentFieldValue;
+
     public List<Field> getFields() {
         return fields;
     }
@@ -117,7 +117,6 @@ public class FieldSet implements DatabaseViewStyleDefinition,XmlSerializable<Fie
         commentField.setAttribute("commentFieldValue", this.commentFieldValue);
 
 
-
         Element fieldsElement = doc.createElement("fields");
         for (Field field : fields) {
             fieldsElement.appendChild(field.toXml(doc));

dmp-backend/src/main/java/eu/eudat/entities/xmlmodels/datasetprofiledefinition/Section.java

@@ -1,15 +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 Section implements DatabaseViewStyleDefinition, XmlSerializable<Section> {
     private String id;
@@ -21,45 +20,59 @@ public class Section implements DatabaseViewStyleDefinition,XmlSerializable<Sect
     private String extendedDescription;
     private List<Section> sections;
     private List<FieldSet> 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<Section> getSections() {
         return sections;
     }
+
     public void setSections(List<Section> sections) {
         this.sections = sections;
     }
@@ -75,6 +88,7 @@ public class Section implements DatabaseViewStyleDefinition,XmlSerializable<Sect
     public String getExtendedDescription() {
         return extendedDescription;
     }
+
     public void setExtendedDescription(String extendedDescription) {
         this.extendedDescription = extendedDescription;
     }
@@ -118,6 +132,7 @@ public class Section implements DatabaseViewStyleDefinition,XmlSerializable<Sect
 
         return rootElement;
     }
+
     @Override
     public Section fromXml(Element element) {
 

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<ViewStyleModel> {
     private List<Section> sections;

dmp-backend/src/main/java/eu/eudat/exceptions/security/UnauthorisedException.java

@@ -9,12 +9,15 @@ 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);
     }

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;
     }