diff --git a/.gitignore b/.gitignore
index 0d06a2439..5444b8da9 100644
--- a/.gitignore
+++ b/.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
diff --git a/dmp-backend/data/pom.xml b/dmp-backend/data/pom.xml
new file mode 100644
index 000000000..b82e2e1bb
--- /dev/null
+++ b/dmp-backend/data/pom.xml
@@ -0,0 +1,24 @@
+
+
+ 4.0.0
+
+ eu.eudat
+ data
+ 1.0-SNAPSHOT
+
+
+ eu.eudat
+ dmp-backend
+ 1.0.0-SNAPSHOT
+
+
+
+
+ dmp-backend
+ queryable
+ 1.0-SNAPSHOT
+
+
+
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
similarity index 80%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
index f5860f8ae..da687d10a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccess.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
similarity index 93%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
index d75965d74..dd6f524db 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/DatabaseAccessLayer.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/Criteria.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/Criteria.java
index bc595b509..33af20638 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/Criteria.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java
similarity index 60%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataManagementPlanCriteria.java
index 4ef9b3650..d79643daf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DataManagementPlanCriteria.java
+++ b/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 {
private Date periodStart;
@@ -15,6 +13,8 @@ public class DataManagementPlanCriteria extends Criteria {
private boolean allVersions;
private List groupIds;
+ private List projects;
+
public boolean getAllVersions() {
return allVersions;
}
@@ -31,12 +31,18 @@ public class DataManagementPlanCriteria extends Criteria {
this.groupIds = groupIds;
}
- private List projects;
-
public Date getPeriodStart() {
return periodStart;
}
+ public List getProjects() {
+ return projects;
+ }
+
+ public void setProjects(List projects) {
+ this.projects = projects;
+ }
+
public void setPeriodStart(Date periodStart) {
this.periodStart = periodStart;
}
@@ -49,20 +55,4 @@ public class DataManagementPlanCriteria extends Criteria {
this.periodEnd = periodEnd;
}
- public List getProjects() {
- return projects;
- }
-
- public void setProjects(List projects) {
- this.projects = projects;
- }
-
- public List getProjectEntities() {
- try {
- return this.projects.stream().map(item -> item.toDataModel()).collect(Collectors.toList());
- } catch (Exception e) {
- e.printStackTrace();
- return new LinkedList<>();
- }
- }
}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DataRepositoryCriteria.java
new file mode 100644
index 000000000..f66eb8b3e
--- /dev/null
+++ b/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 {
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java
similarity index 93%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetCriteria.java
index bc2b7803b..2ffabff41 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java
+++ b/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;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileCriteria.java
new file mode 100644
index 000000000..6c2624d29
--- /dev/null
+++ b/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 {
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java
similarity index 74%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetProfileWizardCriteria.java
index be0e1c15d..df4978858 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetProfileWizardCriteria.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java
similarity index 50%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/DatasetWizardUserDmpCriteria.java
index e576367f8..52f505ff0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/DatasetWizardUserDmpCriteria.java
+++ b/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 {
}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ExternalDatasetCriteria.java
new file mode 100644
index 000000000..f2e775366
--- /dev/null
+++ b/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 {
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/InvitationCriteria.java
new file mode 100644
index 000000000..50cdeb6a1
--- /dev/null
+++ b/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 {
+}
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/OrganisationCriteria.java
new file mode 100644
index 000000000..ab1890db4
--- /dev/null
+++ b/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 {
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java
similarity index 89%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ProjectCriteria.java
index 3c9cc359f..aa2d835a0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ProjectCriteria.java
+++ b/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;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/RegistryCriteria.java
new file mode 100644
index 000000000..44b890887
--- /dev/null
+++ b/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 {
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java
similarity index 74%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ResearcherCriteria.java
index 18d7f26f4..83e822bae 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/ResearcherCriteria.java
+++ b/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 {
private String name;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/ServiceCriteria.java
new file mode 100644
index 000000000..d7aeccac4
--- /dev/null
+++ b/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 {
+
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java
similarity index 85%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserInfoCriteria.java
index e9f35da97..546a2f5f6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserInfoCriteria.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java
similarity index 81%
rename from dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/criteria/UserRoleCriteria.java
index 2566a81f2..10654c0a6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/criteria/UserRoleCriteria.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
similarity index 96%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
index 0c7531ab6..37e8d8595 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/context/DatabaseContext.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
similarity index 89%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
index 6ef974399..24737bceb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/databaselayer/service/DatabaseService.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java
similarity index 54%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDao.java
index 52b123bdb..438f9b3c5 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ContentDaoImpl.java
index 4032b6fc7..88635ae5e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ContentDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDao.java
new file mode 100644
index 000000000..ff29a6b79
--- /dev/null
+++ b/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 {
+
+ QueryableList getWithCriteria(DataManagementPlanCriteria criteria);
+
+ QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardAutocompleteRequest, UserInfo userInfo);
+
+ QueryableList getAuthenticated(QueryableList query, UserInfo principal);
+
+}
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
similarity index 83%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DMPDaoImpl.java
index 37a8d6690..480e9c243 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DMPDaoImpl.java
+++ b/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 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.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 implements DMPDao {
}
@Override
- public QueryableList getUserDmps(DatasetWizardAutocompleteRequest datasetWizardAutocompleteRequest, UserInfo userInfo) {
+ public QueryableList getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) {
QueryableList 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;
}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java
similarity index 56%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDao.java
index 43755886b..68b64022b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DataRepositoryDaoImpl.java
index 2d20e6a77..772072d5e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DataRepositoryDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java
similarity index 59%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDao.java
index 66f0ab285..a4d3bf709 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java
similarity index 92%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java
index 36f085fd8..07dba9f09 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java
similarity index 60%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDao.java
index ca06b32a8..b8e480917 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
similarity index 89%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetProfileDaoImpl.java
index 9b2cc3920..e353738f4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/DatasetProfileDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java
similarity index 56%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDao.java
index 4ac24c3f3..236b430d2 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ExternalDatasetDaoImpl.java
index 6924ea09b..ac6ca4345 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ExternalDatasetDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java
similarity index 56%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDao.java
index b5ddd3705..ba91f81f1 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java
similarity index 86%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/InvitationDaoImpl.java
index 0a58a016f..75b432d34 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/InvitationDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java
similarity index 55%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDao.java
index bbafa6b88..54d8e8470 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/OrganisationDaoImpl.java
index 4ef72dbaa..7169b7abb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/OrganisationDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java
similarity index 59%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDao.java
index 0a2f9b6ac..a9cadd97f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java
similarity index 90%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ProjectDaoImpl.java
index 53d85ff5e..5944ed139 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ProjectDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java
similarity index 55%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDao.java
index 52241e197..88e741192 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/RegistryDaoImpl.java
index 65fe26a5c..88f71d39f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/RegistryDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java
similarity index 55%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDao.java
index f3ff5e0c1..18af17f2a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java
similarity index 89%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ResearcherDaoImpl.java
index 4d5979a64..1bc8d4917 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ResearcherDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java
similarity index 55%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDao.java
index c16cae23e..025185c03 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/ServiceDaoImpl.java
index 421f44cf1..3e1efa753 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/ServiceDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java
similarity index 54%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDao.java
index 9a7e4ac9b..6fe396daf 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserDmpDaoImpl.java
index 1604223cf..b987807a6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserDmpDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java
similarity index 55%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDao.java
index 5348127f5..a6f3e7b8e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java
similarity index 90%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserInfoDaoImpl.java
index 341c7cd8c..b035f5cb6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserInfoDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java
similarity index 57%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDao.java
index bd8551ba0..31ff3768e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/UserRoleDaoImpl.java
index c48a9c581..2219d553f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/UserRoleDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/CredentialDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/CredentialDao.java
new file mode 100644
index 000000000..5d8dcce11
--- /dev/null
+++ b/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 getLoggedInCredentials(String username, String secret, Integer provider);
+}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/CredentialDaoImpl.java
similarity index 71%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/CredentialDaoImpl.java
index efe1487e0..da8805328 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/CredentialDaoImpl.java
+++ b/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 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();
}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/UserTokenDao.java
similarity index 62%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/UserTokenDao.java
index 38416f5e5..55adb903a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDao.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/UserTokenDaoImpl.java
similarity index 88%
rename from dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/security/UserTokenDaoImpl.java
index a2e4f5dcf..ef8849f43 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/dao/entities/security/UserTokenDaoImpl.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Content.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Content.java
index e4d59f681..99217114a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Content.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Credential.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Credential.java
index 08d2e1d0e..91330c29e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Credential.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DMP.java
index 192142a32..becf75c3c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DMP.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPOrganisation.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPOrganisation.java
index e3fee9f24..f0c23604b 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPOrganisation.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPProfile.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPProfile.java
index 98e63bf75..37bab28b6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPProfile.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPResearcher.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DMPResearcher.java
index 83ab5730d..5c3e7e11e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DMPResearcher.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DataRepository.java
index 8724f3b2b..afb696191 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DataRepository.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Dataset.java
index 070e24359..4e8431c7f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Dataset.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetExternalDataset.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetExternalDataset.java
index 862f71548..d0b32a46d 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetExternalDataset.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfile.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfile.java
index 748cf632a..26a988962 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfile.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileRuleset.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileRuleset.java
index 223c86411..28879c861 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileRuleset.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileViewstyle.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetProfileViewstyle.java
index 38b32290d..02d27cc3f 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetProfileViewstyle.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetRegistry.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetRegistry.java
index a223c8a2f..5c4604369 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetRegistry.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetService.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/DatasetService.java
index 259589db2..1641415e9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/DatasetService.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/ExternalDataset.java
index 41b0814f4..f2e75a7ce 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/ExternalDataset.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Invitation.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Invitation.java
index c593c1572..bd8eb04e4 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Invitation.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Organisation.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Organisation.java
index 96d161591..9949dc2da 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Organisation.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Project.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Project.java
index 3cec84df1..17e7f8c7e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Project.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Registry.java
index e25d03710..098cf8ede 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Registry.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Researcher.java
index 746d613aa..eede12605 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Researcher.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/Service.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/Service.java
index 9106eb2c5..b1a484b8c 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/Service.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java
similarity index 98%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/UserDMP.java
index 3468854eb..4b3946384 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/UserDMP.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserInfo.java
similarity index 99%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/UserInfo.java
index 847f3d646..3ff456f0e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/UserInfo.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/UserRole.java
index 38d8cd9ca..dacea8581 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/UserRole.java
+++ b/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;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java b/dmp-backend/data/src/main/java/eu/eudat/data/entities/UserToken.java
similarity index 97%
rename from dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java
rename to dmp-backend/data/src/main/java/eu/eudat/data/entities/UserToken.java
index 0c25e1f02..a74e127cb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/entities/UserToken.java
+++ b/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;
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Content_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Content_.java
new file mode 100644
index 000000000..f509e1a04
--- /dev/null
+++ b/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 extension;
+ public static volatile SingularAttribute locationType;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute parentType;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Credential_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Credential_.java
new file mode 100644
index 000000000..27efb9dc9
--- /dev/null
+++ b/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 publicValue;
+ public static volatile SingularAttribute userInfo;
+ public static volatile SingularAttribute creationTime;
+ public static volatile SingularAttribute provider;
+ public static volatile SingularAttribute externalId;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute secret;
+ public static volatile SingularAttribute status;
+ public static volatile SingularAttribute lastUpdateTime;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPOrganisation_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPOrganisation_.java
new file mode 100644
index 000000000..4c72e6231
--- /dev/null
+++ b/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 role;
+ public static volatile SingularAttribute dmp;
+ public static volatile SingularAttribute organisation;
+ public static volatile SingularAttribute id;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPProfile_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPProfile_.java
new file mode 100644
index 000000000..0e605e1d8
--- /dev/null
+++ b/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 dmps;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPResearcher_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMPResearcher_.java
new file mode 100644
index 000000000..cffc11c83
--- /dev/null
+++ b/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 researcher;
+ public static volatile SingularAttribute role;
+ public static volatile SingularAttribute dmp;
+ public static volatile SingularAttribute id;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMP_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DMP_.java
new file mode 100644
index 000000000..64e8a86ba
--- /dev/null
+++ b/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 creator;
+ public static volatile SetAttribute researchers;
+ public static volatile SingularAttribute associatedDmps;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute groupId;
+ public static volatile SingularAttribute profile;
+ public static volatile SingularAttribute project;
+ public static volatile SingularAttribute description;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute version;
+ public static volatile SetAttribute users;
+ public static volatile SetAttribute organisations;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute id;
+ public static volatile SetAttribute dataset;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DataRepository_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DataRepository_.java
new file mode 100644
index 000000000..efb2645a7
--- /dev/null
+++ b/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 reference;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute datasets;
+ public static volatile SingularAttribute abbreviation;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetExternalDataset_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetExternalDataset_.java
new file mode 100644
index 000000000..de821ac35
--- /dev/null
+++ b/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 externalDataset;
+ public static volatile SingularAttribute role;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute dataset;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileRuleset_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileRuleset_.java
new file mode 100644
index 000000000..18802918e
--- /dev/null
+++ b/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 definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileViewstyle_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfileViewstyle_.java
new file mode 100644
index 000000000..d29e214fd
--- /dev/null
+++ b/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 definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfile_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetProfile_.java
new file mode 100644
index 000000000..0a27f766f
--- /dev/null
+++ b/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 created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute description;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute dataset;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetRegistry_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetRegistry_.java
new file mode 100644
index 000000000..b9e300158
--- /dev/null
+++ b/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 registry;
+ public static volatile SingularAttribute role;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute dataset;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetService_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/DatasetService_.java
new file mode 100644
index 000000000..935dd9496
--- /dev/null
+++ b/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 role;
+ public static volatile SingularAttribute service;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute dataset;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Dataset_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Dataset_.java
new file mode 100644
index 000000000..1c101f0a3
--- /dev/null
+++ b/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 creator;
+ public static volatile SingularAttribute dmp;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute profile;
+ public static volatile SingularAttribute description;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute registries;
+ public static volatile SetAttribute services;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute reference;
+ public static volatile SetAttribute externalDatasets;
+ public static volatile SetAttribute dataRepositories;
+ public static volatile SingularAttribute isPublic;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute properties;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/ExternalDataset_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/ExternalDataset_.java
new file mode 100644
index 000000000..effd0cb50
--- /dev/null
+++ b/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 reference;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute datasets;
+ public static volatile SingularAttribute abbreviation;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Invitation_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Invitation_.java
new file mode 100644
index 000000000..55c482d0c
--- /dev/null
+++ b/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 invitationEmail;
+ public static volatile SingularAttribute acceptedInvitation;
+ public static volatile SingularAttribute dmp;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute user;
+ public static volatile SingularAttribute properties;
+ public static volatile SingularAttribute token;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Organisation_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Organisation_.java
new file mode 100644
index 000000000..eff86e6d3
--- /dev/null
+++ b/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 reference;
+ public static volatile SetAttribute dMPs;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute abbreviation;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Project_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Project_.java
new file mode 100644
index 000000000..45a433890
--- /dev/null
+++ b/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 dmps;
+ public static volatile SingularAttribute creationUser;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute description;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute abbreviation;
+ public static volatile SingularAttribute startdate;
+ public static volatile SingularAttribute type;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute content;
+ public static volatile SingularAttribute reference;
+ public static volatile SingularAttribute enddate;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Registry_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Registry_.java
new file mode 100644
index 000000000..152cb9f5e
--- /dev/null
+++ b/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 reference;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute datasets;
+ public static volatile SingularAttribute abbreviation;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Researcher_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Researcher_.java
new file mode 100644
index 000000000..5f7f856fe
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Researcher_.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(Researcher.class)
+public abstract class Researcher_ {
+
+ public static volatile SingularAttribute reference;
+ public static volatile SetAttribute dMPs;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute primaryEmail;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Service_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Service_.java
new file mode 100644
index 000000000..83b3fa879
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/Service_.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(Service.class)
+public abstract class Service_ {
+
+ public static volatile SingularAttribute reference;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute modified;
+ public static volatile SingularAttribute definition;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute label;
+ public static volatile SetAttribute datasets;
+ public static volatile SingularAttribute abbreviation;
+ public static volatile SingularAttribute uri;
+ public static volatile SingularAttribute status;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserDMP_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserDMP_.java
new file mode 100644
index 000000000..7754bfad8
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserDMP_.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(UserDMP.class)
+public abstract class UserDMP_ {
+
+ public static volatile SingularAttribute role;
+ public static volatile SingularAttribute dmp;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute user;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserInfo_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserInfo_.java
new file mode 100644
index 000000000..6a9bfdb23
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserInfo_.java
@@ -0,0 +1,28 @@
+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(UserInfo.class)
+public abstract class UserInfo_ {
+
+ public static volatile SetAttribute userRoles;
+ public static volatile SetAttribute dmps;
+ public static volatile SetAttribute credentials;
+ public static volatile SingularAttribute created;
+ public static volatile SingularAttribute lastloggedin;
+ public static volatile SingularAttribute name;
+ public static volatile SingularAttribute usertype;
+ public static volatile SingularAttribute id;
+ public static volatile SingularAttribute verified_email;
+ public static volatile SingularAttribute email;
+ public static volatile SingularAttribute additionalinfo;
+ public static volatile SingularAttribute authorization_level;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserRole_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserRole_.java
new file mode 100644
index 000000000..37c490aee
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserRole_.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(UserRole.class)
+public abstract class UserRole_ {
+
+ public static volatile SingularAttribute userInfo;
+ public static volatile SingularAttribute role;
+ public static volatile SingularAttribute id;
+
+}
+
diff --git a/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserToken_.java b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserToken_.java
new file mode 100644
index 000000000..77e026e3e
--- /dev/null
+++ b/dmp-backend/data/target/generated-sources/annotations/eu/eudat/data/entities/UserToken_.java
@@ -0,0 +1,19 @@
+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(UserToken.class)
+public abstract class UserToken_ {
+
+ public static volatile SingularAttribute issuedAt;
+ public static volatile SingularAttribute user;
+ public static volatile SingularAttribute expiresAt;
+ public static volatile SingularAttribute token;
+
+}
+
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 84ef62e93..d7fe6f8a6 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -15,6 +15,11 @@
+
+ eu.eudat
+ data
+ 1.0-SNAPSHOT
+
dmp-backend
queryable
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
index 270fbf778..26345fd59 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/ContentBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.entity;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.Content;
+import eu.eudat.data.entities.Content;
import java.util.UUID;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
index b15c8d56e..146405b70 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/CredentialBuilder.java
@@ -1,8 +1,8 @@
package eu.eudat.builders.entity;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.Credential;
-import eu.eudat.entities.UserInfo;
+import eu.eudat.data.entities.Credential;
+import eu.eudat.data.entities.UserInfo;
import java.util.Date;
import java.util.UUID;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
index 3fe0f089b..e344e21e6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/DatasetProfileBuilder.java
@@ -1,8 +1,8 @@
package eu.eudat.builders.entity;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.Dataset;
-import eu.eudat.entities.DatasetProfile;
+import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.entities.DatasetProfile;
import java.util.Date;
import java.util.Set;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
index b202be682..852293632 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserInfoBuilder.java
@@ -1,10 +1,10 @@
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 eu.eudat.data.entities.Credential;
+import eu.eudat.data.entities.DMP;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserRole;
import java.util.Date;
import java.util.HashSet;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
index 15f0ca1de..c27323014 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserRoleBuilder.java
@@ -1,8 +1,8 @@
package eu.eudat.builders.entity;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.entities.UserRole;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserRole;
import java.util.UUID;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
index 24d9f4130..0d425d9a6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/entity/UserTokenBuilder.java
@@ -1,8 +1,8 @@
package eu.eudat.builders.entity;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.UserInfo;
-import eu.eudat.entities.UserToken;
+import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.entities.UserToken;
import java.util.Date;
import java.util.UUID;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
index 49eea533c..46401a036 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/DataRepositoryCriteriaBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.model.criteria;
import eu.eudat.builders.Builder;
-import eu.eudat.models.criteria.DataRepositoryCriteria;
+import eu.eudat.data.dao.criteria.DataRepositoryCriteria;
/**
* Created by ikalyvas on 2/15/2018.
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
index 66331f25c..d0ba13b78 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ExternalDatasetCriteriaBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.model.criteria;
import eu.eudat.builders.Builder;
-import eu.eudat.models.criteria.ExternalDatasetCriteria;
+import eu.eudat.data.dao.criteria.ExternalDatasetCriteria;
/**
* Created by ikalyvas on 2/15/2018.
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
index 94a0e4061..09fae4838 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/RegistryCriteriaBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.model.criteria;
import eu.eudat.builders.Builder;
-import eu.eudat.models.criteria.RegistryCriteria;
+import eu.eudat.data.dao.criteria.RegistryCriteria;
/**
* Created by ikalyvas on 2/15/2018.
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
index 7c1c7d4ea..750c814cd 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/criteria/ServiceCriteriaBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.model.criteria;
import eu.eudat.builders.Builder;
-import eu.eudat.models.criteria.ServiceCriteria;
+import eu.eudat.data.dao.criteria.ServiceCriteria;
/**
* Created by ikalyvas on 2/15/2018.
diff --git a/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
index 87d2ed01c..6de12fa5a 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/builders/model/models/ProjectBuilder.java
@@ -1,7 +1,7 @@
package eu.eudat.builders.model.models;
import eu.eudat.builders.Builder;
-import eu.eudat.entities.UserInfo;
+import eu.eudat.data.entities.UserInfo;
import eu.eudat.models.dmp.DataManagementPlan;
import eu.eudat.models.project.Project;
@@ -32,7 +32,7 @@ public class ProjectBuilder extends Builder {
private Date endDate;
- private eu.eudat.entities.Project.Status status;
+ private eu.eudat.data.entities.Project.Status status;
private UserInfo creationUser;
@@ -87,7 +87,7 @@ public class ProjectBuilder extends Builder {
return this;
}
- public ProjectBuilder status(eu.eudat.entities.Project.Status status) {
+ public ProjectBuilder status(eu.eudat.data.entities.Project.Status status) {
this.status = status;
return this;
}
diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
index 9b2731c9a..a5f334394 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
@@ -23,7 +23,7 @@ import java.util.Properties;
@Configuration
@EnableTransactionManagement
@Profile("devel")
-@ComponentScan(basePackages = {"eu.eudat.entities"})
+@ComponentScan(basePackages = {"eu.eudat.data.entities"})
public class DevelDatabaseConfiguration {
@Autowired
@@ -33,7 +33,7 @@ public class DevelDatabaseConfiguration {
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(dataSource());
- em.setPackagesToScan(new String[]{"eu.eudat.entities"});
+ em.setPackagesToScan(new String[]{"eu.eudat.data.entities"});
JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
em.setJpaProperties(additionalProperties());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
index e504e1c2f..33ad27a08 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java
@@ -25,7 +25,7 @@ import java.util.Properties;
@Configuration
@EnableTransactionManagement
@Profile("production")
-@ComponentScan(basePackages = {"eu.eudat.entities"})
+@ComponentScan(basePackages = {"eu.eudat.data.entities"})
public class ProductionDatabaseConfiguration {
@Autowired
@@ -35,7 +35,7 @@ public class ProductionDatabaseConfiguration {
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(dataSource());
- em.setPackagesToScan(new String[]{"eu.eudat.entities"});
+ em.setPackagesToScan(new String[]{"eu.eudat.data.entities"});
JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
em.setJpaProperties(additionalProperties());
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
index 51ab1c27b..71b9f2d01 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
@@ -32,7 +32,7 @@ public class Admin extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = {"/admin/addDmp"}, consumes = "application/json", produces = "application/json")
public ResponseEntity