no message

.gitignore

@@ -20,3 +20,4 @@ dmp-backend/src/main/ui-resources/static/assets/lang/en.json
 dmp-frontend/new  3.xml
 dmp-backend/src/main/ui-resources/static/
 dmp-backend/web/target/
+*.class

dmp-backend/data/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>eu.eudat</groupId>
+    <artifactId>data</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>dmp-backend</groupId>
+            <artifactId>queryable</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java

@@ -1,6 +1,6 @@
-package eu.eudat.dao;
+package eu.eudat.data.dao;
 
-import eu.eudat.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
 import eu.eudat.queryable.queryableentity.DataEntity;
 
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java

@@ -1,4 +1,4 @@
-package eu.eudat.dao;
+package eu.eudat.data.dao;
 
 
 import eu.eudat.queryable.QueryableList;

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/Criteria.java

@@ -1,4 +1,4 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java

@@ -1,13 +1,11 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.DMP;
-import eu.eudat.models.project.ProjectCriteriaModel;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.Project;
 
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 
 public class DataManagementPlanCriteria extends Criteria<DMP> {
     private Date periodStart;
@@ -15,6 +13,8 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
     private boolean allVersions;
     private List<UUID> groupIds;
 
+    private List<eu.eudat.data.entities.Project> projects;
+
     public boolean getAllVersions() {
         return allVersions;
     }
@@ -31,12 +31,18 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
         this.groupIds = groupIds;
     }
 
-    private List<ProjectCriteriaModel> projects;
-
     public Date getPeriodStart() {
         return periodStart;
     }
 
+    public List<Project> getProjects() {
+        return projects;
+    }
+
+    public void setProjects(List<Project> projects) {
+        this.projects = projects;
+    }
+
     public void setPeriodStart(Date periodStart) {
         this.periodStart = periodStart;
     }
@@ -49,20 +55,4 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
         this.periodEnd = periodEnd;
     }
 
-    public List<ProjectCriteriaModel> getProjects() {
-        return projects;
-    }
-
-    public void setProjects(List<ProjectCriteriaModel> projects) {
-        this.projects = projects;
-    }
-
-    public List<eu.eudat.entities.Project> getProjectEntities() {
-        try {
-            return this.projects.stream().map(item -> item.toDataModel()).collect(Collectors.toList());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new LinkedList<>();
-        }
-    }
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java

@@ -0,0 +1,7 @@
+package eu.eudat.data.dao.criteria;
+
+import eu.eudat.data.entities.DataRepository;
+
+public class DataRepositoryCriteria extends Criteria<DataRepository> {
+
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.Dataset;
+import eu.eudat.data.entities.Dataset;
 
 import java.util.Date;
 import java.util.List;

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java

@@ -0,0 +1,7 @@
+package eu.eudat.data.dao.criteria;
+
+
+import eu.eudat.data.entities.DatasetProfile;
+
+public class DatasetProfileCriteria extends Criteria<DatasetProfile> {
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.DatasetProfile;
+import eu.eudat.data.entities.DatasetProfile;
 
 import java.util.UUID;
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java

@@ -1,7 +1,7 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.DMP;
 
+import eu.eudat.data.entities.DMP;
 
 public class DatasetWizardUserDmpCriteria extends Criteria<DMP> {
 }

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java

@@ -0,0 +1,7 @@
+package eu.eudat.data.dao.criteria;
+
+
+import eu.eudat.data.entities.ExternalDataset;
+
+public class ExternalDatasetCriteria extends Criteria<ExternalDataset> {
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java

@@ -0,0 +1,6 @@
+package eu.eudat.data.dao.criteria;
+
+import eu.eudat.data.entities.Invitation;
+
+public class InvitationCriteria extends Criteria<Invitation> {
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java

@@ -0,0 +1,6 @@
+package eu.eudat.data.dao.criteria;
+
+import eu.eudat.data.entities.Organisation;
+
+public class OrganisationCriteria extends Criteria<Organisation> {
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.Project;
+import eu.eudat.data.entities.Project;
 
 import java.util.Date;
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java

@@ -0,0 +1,7 @@
+package eu.eudat.data.dao.criteria;
+
+import eu.eudat.data.entities.Registry;
+
+public class RegistryCriteria extends Criteria<Registry> {
+
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.Researcher;
+import eu.eudat.data.entities.Researcher;
 
 public class ResearcherCriteria extends Criteria<Researcher> {
     private String name;

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java

@@ -0,0 +1,7 @@
+package eu.eudat.data.dao.criteria;
+
+import eu.eudat.data.entities.Service;
+
+public class ServiceCriteria extends Criteria<Service> {
+
+}

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.UserInfo;
+import eu.eudat.data.entities.UserInfo;
 
 import java.util.List;
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java

@@ -1,6 +1,6 @@
-package eu.eudat.models.criteria;
+package eu.eudat.data.dao.criteria;
 
-import eu.eudat.entities.UserRole;
+import eu.eudat.data.entities.UserRole;
 
 import java.util.List;
 

dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java

@@ -1,4 +1,4 @@
-package eu.eudat.dao.databaselayer.context;
+package eu.eudat.data.dao.databaselayer.context;
 
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.hibernatequeryablelist.QueryableHibernateList;

dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java

@@ -1,7 +1,7 @@
-package eu.eudat.dao.databaselayer.service;
+package eu.eudat.data.dao.databaselayer.service;
 
 
-import eu.eudat.dao.databaselayer.context.DatabaseContext;
+import eu.eudat.data.dao.databaselayer.context.DatabaseContext;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Content;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.Content;
 
 import java.util.UUID;
 

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Content;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Content;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,20 @@
+package eu.eudat.data.dao.entities;
+
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
+import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.queryable.QueryableList;
+
+import java.util.UUID;
+
+public interface DMPDao extends DatabaseAccessLayer<DMP, UUID> {
+
+    QueryableList<DMP> getWithCriteria(DataManagementPlanCriteria criteria);
+
+    QueryableList<DMP> getUserDmps(DatasetWizardUserDmpCriteria datasetWizardAutocompleteRequest, UserInfo userInfo);
+
+    QueryableList<DMP> getAuthenticated(QueryableList<DMP> query, UserInfo principal);
+
+}

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

@@ -1,11 +1,11 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-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.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
+import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
@@ -35,7 +35,7 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
         if (criteria.getPeriodStart() != null)
             query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart()));
         if (criteria.getProjects() != null && !criteria.getProjects().isEmpty())
-            query.where(((builder, root) -> root.get("project").in(criteria.getProjectEntities())));
+            query.where(((builder, root) -> root.get("project").in(criteria.getProjects())));
         if (!criteria.getAllVersions())
             query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"), query.<String>subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"), nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class)));
         if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
@@ -60,10 +60,10 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
     }
 
     @Override
-    public QueryableList<DMP> getUserDmps(DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, UserInfo userInfo) {
+    public QueryableList<DMP> getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) {
         QueryableList<DMP> query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users"))));
-        if (datasetWizardAutocompleteRequest.getCriteria().getLike() != null && !datasetWizardAutocompleteRequest.getCriteria().getLike().isEmpty()) {
-            query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardAutocompleteRequest.getCriteria().getLike() + "%"));
+        if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) {
+            query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%"));
         }
         return query;
     }

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.DataRepository;
-import eu.eudat.models.criteria.DataRepositoryCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.DataRepositoryCriteria;
+import eu.eudat.data.entities.DataRepository;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-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.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.DataRepositoryCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.DataRepository;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Dataset;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.DatasetCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.DatasetCriteria;
+import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,10 +1,10 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Dataset;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.DatasetCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.DatasetCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.DatasetProfile;
-import eu.eudat.models.criteria.DatasetProfileCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.DatasetProfile;
-import eu.eudat.models.criteria.DatasetProfileCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.DatasetProfile;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.ExternalDataset;
-import eu.eudat.models.criteria.ExternalDatasetCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.ExternalDatasetCriteria;
+import eu.eudat.data.entities.ExternalDataset;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.ExternalDataset;
-import eu.eudat.models.criteria.ExternalDatasetCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.ExternalDatasetCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.ExternalDataset;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Invitation;
-import eu.eudat.models.criteria.InvitationCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.InvitationCriteria;
+import eu.eudat.data.entities.Invitation;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Invitation;
-import eu.eudat.models.criteria.InvitationCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.InvitationCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Invitation;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Organisation;
-import eu.eudat.models.criteria.OrganisationCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.OrganisationCriteria;
+import eu.eudat.data.entities.Organisation;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Organisation;
-import eu.eudat.models.criteria.OrganisationCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.OrganisationCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Organisation;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Project;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.ProjectCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.ProjectCriteria;
+import eu.eudat.data.entities.Project;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,10 +1,10 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Project;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.ProjectCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.ProjectCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Project;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Registry;
-import eu.eudat.models.criteria.RegistryCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.RegistryCriteria;
+import eu.eudat.data.entities.Registry;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Registry;
-import eu.eudat.models.criteria.RegistryCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.RegistryCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Registry;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Researcher;
-import eu.eudat.models.criteria.ResearcherCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.ResearcherCriteria;
+import eu.eudat.data.entities.Researcher;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Researcher;
-import eu.eudat.models.criteria.ResearcherCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.ResearcherCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Researcher;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.Service;
-import eu.eudat.models.criteria.ServiceCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.ServiceCriteria;
+import eu.eudat.data.entities.Service;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Service;
-import eu.eudat.models.criteria.ServiceCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.ServiceCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Service;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,7 +1,7 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.UserDMP;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.UserDMP;
 
 import java.util.UUID;
 

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.UserDMP;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.UserDMP;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.UserInfoCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.UserInfoCriteria;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.models.criteria.UserInfoCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.UserInfoCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,9 +1,9 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.entities.UserRole;
-import eu.eudat.models.criteria.UserRoleCriteria;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.dao.criteria.UserRoleCriteria;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserRole;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.List;

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

@@ -1,10 +1,10 @@
-package eu.eudat.dao.entities;
+package eu.eudat.data.dao.entities;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.entities.UserRole;
-import eu.eudat.models.criteria.UserRoleCriteria;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.criteria.UserRoleCriteria;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserRole;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -0,0 +1,13 @@
+package eu.eudat.data.dao.entities.security;
+
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.Credential;
+import sun.security.krb5.Credentials;
+
+import java.util.UUID;
+
+
+public interface CredentialDao extends DatabaseAccessLayer<Credential, UUID> {
+
+    Credential getLoggedInCredentials(String username, String secret, Integer provider);
+}

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

@@ -1,11 +1,9 @@
-package eu.eudat.dao.entities.security;
+package eu.eudat.data.dao.entities.security;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.Credential;
-import eu.eudat.models.login.Credentials;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.Credential;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.security.validators.TokenValidatorFactoryImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -32,12 +30,12 @@ public class CredentialDaoImpl extends DatabaseAccess<Credential> implements Cre
     }
 
     @Override
-    public Credential getLoggedInCredentials(Credentials credentials) {
+    public Credential getLoggedInCredentials(String username, String secret, Integer provider) {
         return this.getDatabaseService().getQueryable(Credential.class).where(((builder, root) ->
                 builder.and(
-                        builder.equal(root.get("publicValue"), credentials.getUsername()),
-                        builder.equal(root.get("secret"), credentials.getSecret()),
-                        builder.equal(root.get("provider"), TokenValidatorFactoryImpl.LoginProvider.NATIVELOGIN.getValue())
+                        builder.equal(root.get("publicValue"), username),
+                        builder.equal(root.get("secret"), secret),
+                        builder.equal(root.get("provider"), provider)
                 ))).getSingleOrDefault();
     }
 

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

@@ -1,7 +1,7 @@
-package eu.eudat.dao.entities.security;
+package eu.eudat.data.dao.entities.security;
 
-import eu.eudat.dao.DatabaseAccessLayer;
-import eu.eudat.entities.UserToken;
+import eu.eudat.data.dao.DatabaseAccessLayer;
+import eu.eudat.data.entities.UserToken;
 
 import java.util.UUID;
 

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

@@ -1,8 +1,8 @@
-package eu.eudat.dao.entities.security;
+package eu.eudat.data.dao.entities.security;
 
-import eu.eudat.dao.DatabaseAccess;
-import eu.eudat.dao.databaselayer.service.DatabaseService;
-import eu.eudat.entities.UserToken;
+import eu.eudat.data.dao.DatabaseAccess;
+import eu.eudat.data.dao.databaselayer.service.DatabaseService;
+import eu.eudat.data.entities.UserToken;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

dmp-backend/data/src/main/java/eu/eudat/data/entities/Credential.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 

dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import org.hibernate.annotations.GenericGenerator;

dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 
 import eu.eudat.queryable.queryableentity.DataEntity;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

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

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;

dmp-backend/data/src/main/java/eu/eudat/data/entities/UserToken.java

@@ -1,4 +1,4 @@
-package eu.eudat.entities;
+package eu.eudat.data.entities;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
 

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Content_.java

@@ -0,0 +1,20 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Content.class)
+public abstract class Content_ {
+
+	public static volatile SingularAttribute<Content, String> extension;
+	public static volatile SingularAttribute<Content, Integer> locationType;
+	public static volatile SingularAttribute<Content, UUID> id;
+	public static volatile SingularAttribute<Content, String> label;
+	public static volatile SingularAttribute<Content, String> uri;
+	public static volatile SingularAttribute<Content, Integer> parentType;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Credential_.java

@@ -0,0 +1,24 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Credential.class)
+public abstract class Credential_ {
+
+	public static volatile SingularAttribute<Credential, String> publicValue;
+	public static volatile SingularAttribute<Credential, UserInfo> userInfo;
+	public static volatile SingularAttribute<Credential, Date> creationTime;
+	public static volatile SingularAttribute<Credential, Integer> provider;
+	public static volatile SingularAttribute<Credential, String> externalId;
+	public static volatile SingularAttribute<Credential, UUID> id;
+	public static volatile SingularAttribute<Credential, String> secret;
+	public static volatile SingularAttribute<Credential, Integer> status;
+	public static volatile SingularAttribute<Credential, Date> lastUpdateTime;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPOrganisation_.java

@@ -0,0 +1,18 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DMPOrganisation.class)
+public abstract class DMPOrganisation_ {
+
+	public static volatile SingularAttribute<DMPOrganisation, Integer> role;
+	public static volatile SingularAttribute<DMPOrganisation, UUID> dmp;
+	public static volatile SingularAttribute<DMPOrganisation, UUID> organisation;
+	public static volatile SingularAttribute<DMPOrganisation, UUID> id;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPProfile_.java

@@ -0,0 +1,23 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DMPProfile.class)
+public abstract class DMPProfile_ {
+
+	public static volatile SetAttribute<DMPProfile, DMP> dmps;
+	public static volatile SingularAttribute<DMPProfile, Date> created;
+	public static volatile SingularAttribute<DMPProfile, Date> modified;
+	public static volatile SingularAttribute<DMPProfile, String> definition;
+	public static volatile SingularAttribute<DMPProfile, UUID> id;
+	public static volatile SingularAttribute<DMPProfile, String> label;
+	public static volatile SingularAttribute<DMPProfile, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPResearcher_.java

@@ -0,0 +1,18 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DMPResearcher.class)
+public abstract class DMPResearcher_ {
+
+	public static volatile SingularAttribute<DMPResearcher, UUID> researcher;
+	public static volatile SingularAttribute<DMPResearcher, Integer> role;
+	public static volatile SingularAttribute<DMPResearcher, UUID> dmp;
+	public static volatile SingularAttribute<DMPResearcher, UUID> id;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMP_.java

@@ -0,0 +1,32 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DMP.class)
+public abstract class DMP_ {
+
+	public static volatile SingularAttribute<DMP, UserInfo> creator;
+	public static volatile SetAttribute<DMP, Researcher> researchers;
+	public static volatile SingularAttribute<DMP, String> associatedDmps;
+	public static volatile SingularAttribute<DMP, Date> created;
+	public static volatile SingularAttribute<DMP, UUID> groupId;
+	public static volatile SingularAttribute<DMP, DMPProfile> profile;
+	public static volatile SingularAttribute<DMP, Project> project;
+	public static volatile SingularAttribute<DMP, String> description;
+	public static volatile SingularAttribute<DMP, String> label;
+	public static volatile SingularAttribute<DMP, Integer> version;
+	public static volatile SetAttribute<DMP, UserInfo> users;
+	public static volatile SetAttribute<DMP, Organisation> organisations;
+	public static volatile SingularAttribute<DMP, Date> modified;
+	public static volatile SingularAttribute<DMP, UUID> id;
+	public static volatile SetAttribute<DMP, Dataset> dataset;
+	public static volatile SingularAttribute<DMP, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DataRepository_.java

@@ -0,0 +1,26 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DataRepository.class)
+public abstract class DataRepository_ {
+
+	public static volatile SingularAttribute<DataRepository, String> reference;
+	public static volatile SingularAttribute<DataRepository, Date> created;
+	public static volatile SingularAttribute<DataRepository, Date> modified;
+	public static volatile SingularAttribute<DataRepository, String> definition;
+	public static volatile SingularAttribute<DataRepository, UUID> id;
+	public static volatile SingularAttribute<DataRepository, String> label;
+	public static volatile SetAttribute<DataRepository, Dataset> datasets;
+	public static volatile SingularAttribute<DataRepository, String> abbreviation;
+	public static volatile SingularAttribute<DataRepository, String> uri;
+	public static volatile SingularAttribute<DataRepository, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetExternalDataset_.java

@@ -0,0 +1,18 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetExternalDataset.class)
+public abstract class DatasetExternalDataset_ {
+
+	public static volatile SingularAttribute<DatasetExternalDataset, UUID> externalDataset;
+	public static volatile SingularAttribute<DatasetExternalDataset, Integer> role;
+	public static volatile SingularAttribute<DatasetExternalDataset, UUID> id;
+	public static volatile SingularAttribute<DatasetExternalDataset, UUID> dataset;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileRuleset_.java

@@ -0,0 +1,17 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetProfileRuleset.class)
+public abstract class DatasetProfileRuleset_ {
+
+	public static volatile SingularAttribute<DatasetProfileRuleset, String> definition;
+	public static volatile SingularAttribute<DatasetProfileRuleset, UUID> id;
+	public static volatile SingularAttribute<DatasetProfileRuleset, String> label;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileViewstyle_.java

@@ -0,0 +1,17 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetProfileViewstyle.class)
+public abstract class DatasetProfileViewstyle_ {
+
+	public static volatile SingularAttribute<DatasetProfileViewstyle, String> definition;
+	public static volatile SingularAttribute<DatasetProfileViewstyle, UUID> id;
+	public static volatile SingularAttribute<DatasetProfileViewstyle, String> label;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfile_.java

@@ -0,0 +1,24 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetProfile.class)
+public abstract class DatasetProfile_ {
+
+	public static volatile SingularAttribute<DatasetProfile, Date> created;
+	public static volatile SingularAttribute<DatasetProfile, Date> modified;
+	public static volatile SingularAttribute<DatasetProfile, String> description;
+	public static volatile SingularAttribute<DatasetProfile, String> definition;
+	public static volatile SingularAttribute<DatasetProfile, UUID> id;
+	public static volatile SingularAttribute<DatasetProfile, String> label;
+	public static volatile SetAttribute<DatasetProfile, Dataset> dataset;
+	public static volatile SingularAttribute<DatasetProfile, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetRegistry_.java

@@ -0,0 +1,18 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetRegistry.class)
+public abstract class DatasetRegistry_ {
+
+	public static volatile SingularAttribute<DatasetRegistry, UUID> registry;
+	public static volatile SingularAttribute<DatasetRegistry, Integer> role;
+	public static volatile SingularAttribute<DatasetRegistry, UUID> id;
+	public static volatile SingularAttribute<DatasetRegistry, UUID> dataset;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetService_.java

@@ -0,0 +1,18 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(DatasetService.class)
+public abstract class DatasetService_ {
+
+	public static volatile SingularAttribute<DatasetService, Integer> role;
+	public static volatile SingularAttribute<DatasetService, UUID> service;
+	public static volatile SingularAttribute<DatasetService, UUID> id;
+	public static volatile SingularAttribute<DatasetService, UUID> dataset;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Dataset_.java

@@ -0,0 +1,33 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Dataset.class)
+public abstract class Dataset_ {
+
+	public static volatile SingularAttribute<Dataset, UserInfo> creator;
+	public static volatile SingularAttribute<Dataset, DMP> dmp;
+	public static volatile SingularAttribute<Dataset, Date> created;
+	public static volatile SingularAttribute<Dataset, DatasetProfile> profile;
+	public static volatile SingularAttribute<Dataset, String> description;
+	public static volatile SingularAttribute<Dataset, String> label;
+	public static volatile SetAttribute<Dataset, Registry> registries;
+	public static volatile SetAttribute<Dataset, Service> services;
+	public static volatile SingularAttribute<Dataset, String> uri;
+	public static volatile SingularAttribute<Dataset, String> reference;
+	public static volatile SetAttribute<Dataset, ExternalDataset> externalDatasets;
+	public static volatile SetAttribute<Dataset, DataRepository> dataRepositories;
+	public static volatile SingularAttribute<Dataset, Boolean> isPublic;
+	public static volatile SingularAttribute<Dataset, Date> modified;
+	public static volatile SingularAttribute<Dataset, UUID> id;
+	public static volatile SingularAttribute<Dataset, String> properties;
+	public static volatile SingularAttribute<Dataset, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/ExternalDataset_.java

@@ -0,0 +1,23 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(ExternalDataset.class)
+public abstract class ExternalDataset_ {
+
+	public static volatile SingularAttribute<ExternalDataset, String> reference;
+	public static volatile SingularAttribute<ExternalDataset, Date> created;
+	public static volatile SingularAttribute<ExternalDataset, Date> modified;
+	public static volatile SingularAttribute<ExternalDataset, UUID> id;
+	public static volatile SingularAttribute<ExternalDataset, String> label;
+	public static volatile SetAttribute<ExternalDataset, Dataset> datasets;
+	public static volatile SingularAttribute<ExternalDataset, String> abbreviation;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Invitation_.java

@@ -0,0 +1,21 @@
+package eu.eudat.data.entities;
+
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Invitation.class)
+public abstract class Invitation_ {
+
+	public static volatile SingularAttribute<Invitation, String> invitationEmail;
+	public static volatile SingularAttribute<Invitation, Boolean> acceptedInvitation;
+	public static volatile SingularAttribute<Invitation, DMP> dmp;
+	public static volatile SingularAttribute<Invitation, UUID> id;
+	public static volatile SingularAttribute<Invitation, UserInfo> user;
+	public static volatile SingularAttribute<Invitation, String> properties;
+	public static volatile SingularAttribute<Invitation, UUID> token;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Organisation_.java

@@ -0,0 +1,26 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Organisation.class)
+public abstract class Organisation_ {
+
+	public static volatile SingularAttribute<Organisation, String> reference;
+	public static volatile SetAttribute<Organisation, DMP> dMPs;
+	public static volatile SingularAttribute<Organisation, Date> created;
+	public static volatile SingularAttribute<Organisation, Date> modified;
+	public static volatile SingularAttribute<Organisation, String> definition;
+	public static volatile SingularAttribute<Organisation, UUID> id;
+	public static volatile SingularAttribute<Organisation, String> label;
+	public static volatile SingularAttribute<Organisation, String> abbreviation;
+	public static volatile SingularAttribute<Organisation, String> uri;
+	public static volatile SingularAttribute<Organisation, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Project_.java

@@ -0,0 +1,32 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Project.class)
+public abstract class Project_ {
+
+	public static volatile SetAttribute<Project, DMP> dmps;
+	public static volatile SingularAttribute<Project, UserInfo> creationUser;
+	public static volatile SingularAttribute<Project, Date> created;
+	public static volatile SingularAttribute<Project, String> description;
+	public static volatile SingularAttribute<Project, String> label;
+	public static volatile SingularAttribute<Project, String> abbreviation;
+	public static volatile SingularAttribute<Project, Date> startdate;
+	public static volatile SingularAttribute<Project, Integer> type;
+	public static volatile SingularAttribute<Project, String> uri;
+	public static volatile SingularAttribute<Project, Content> content;
+	public static volatile SingularAttribute<Project, String> reference;
+	public static volatile SingularAttribute<Project, Date> enddate;
+	public static volatile SingularAttribute<Project, Date> modified;
+	public static volatile SingularAttribute<Project, String> definition;
+	public static volatile SingularAttribute<Project, UUID> id;
+	public static volatile SingularAttribute<Project, Short> status;
+
+}
+

dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Registry_.java

@@ -0,0 +1,26 @@
+package eu.eudat.data.entities;
+
+import java.util.Date;
+import java.util.UUID;
+import javax.annotation.Generated;
+import javax.persistence.metamodel.SetAttribute;
+import javax.persistence.metamodel.SingularAttribute;
+import javax.persistence.metamodel.StaticMetamodel;
+
+@Generated(value = "org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor")
+@StaticMetamodel(Registry.class)
+public abstract class Registry_ {
+
+	public static volatile SingularAttribute<Registry, String> reference;
+	public static volatile SingularAttribute<Registry, Date> created;
+	public static volatile SingularAttribute<Registry, Date> modified;
+	public static volatile SingularAttribute<Registry, String> definition;
+	public static volatile SingularAttribute<Registry, UUID> id;
+	public static volatile SingularAttribute<Registry, String> label;
+	public static volatile SetAttribute<Registry, Dataset> datasets;
+	public static volatile SingularAttribute<Registry, String> abbreviation;
+	public static volatile SingularAttribute<Registry, String> uri;
+	public static volatile SingularAttribute<Registry, Short> status;
+
+}
+