From e103f40763b1c322e20ca080be546d50bcc27a07 Mon Sep 17 00:00:00 2001
From: sgiannopoulos <sgiannopoulos@cite.gr>
Date: Tue, 14 Nov 2023 16:27:46 +0200
Subject: [PATCH] change queryable dependencies

---
 dmp-backend/core/pom.xml                                   | 6 ------
 .../core/src/main/java/eu/eudat/data/CredentialEntity.java | 2 +-
 .../src/main/java/eu/eudat/data/DescriptionEntity.java     | 2 +-
 .../main/java/eu/eudat/data/DescriptionTemplateEntity.java | 2 +-
 .../java/eu/eudat/data/UserDescriptionTemplateEntity.java  | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Content.java      | 2 +-
 dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java  | 2 +-
 .../src/main/java/eu/eudat/data/old/DMPDatasetProfile.java | 2 +-
 .../src/main/java/eu/eudat/data/old/DataRepository.java    | 2 +-
 .../src/main/java/eu/eudat/data/old/EmailConfirmation.java | 2 +-
 .../src/main/java/eu/eudat/data/old/ExternalDataset.java   | 3 +--
 .../core/src/main/java/eu/eudat/data/old/FileUpload.java   | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Funder.java       | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Grant.java        | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Invitation.java   | 2 +-
 dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Notification.java | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Organisation.java | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Project.java      | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Registry.java     | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Researcher.java   | 2 +-
 .../core/src/main/java/eu/eudat/data/old/Service.java      | 3 +--
 .../core/src/main/java/eu/eudat/data/old/UserDMP.java      | 2 +-
 .../core/src/main/java/eu/eudat/data/old/UserInfo.java     | 2 +-
 .../core/src/main/java/eu/eudat/data/old/UserRole.java     | 2 +-
 .../eu/eudat/data/old}/queryableentity/DataEntity.java     | 2 +-
 .../src/main/java/eu/eudat/data/dao/DatabaseAccess.java    | 2 +-
 .../main/java/eu/eudat/data/dao/DatabaseAccessLayer.java   | 2 +-
 .../data/dao/databaselayer/context/DatabaseContext.java    | 3 +--
 .../data/dao/databaselayer/service/DatabaseService.java    | 2 +-
 .../main/java/eu/eudat/data/query/PaginationService.java   | 2 +-
 .../java/eu/eudat/data/query/definition/Collector.java     | 2 +-
 .../java/eu/eudat/data/query/definition/CriteriaQuery.java | 2 +-
 .../main/java/eu/eudat/data/query/definition/Query.java    | 2 +-
 .../eu/eudat/data/query/definition/TableCriteriaQuery.java | 2 +-
 .../java/eu/eudat/data/query/definition/TableQuery.java    | 2 +-
 dmp-backend/data/src/main/java/eu/eudat/query/Query.java   | 2 +-
 dmp-backend/queryable/pom.xml                              | 7 +++++++
 .../src/main/java/eu/eudat/queryable/QueryableList.java    | 2 +-
 .../jpa/hibernatequeryablelist/QueryableHibernateList.java | 2 +-
 .../java/eu/eudat/logic/managers/PaginationManager.java    | 2 +-
 .../web/src/main/java/eu/eudat/models/DataModel.java       | 2 +-
 .../data/dashboard/recent/model/RecentActivityModel.java   | 2 +-
 .../main/java/eu/eudat/models/data/urls/UrlListing.java    | 2 +-
 44 files changed, 49 insertions(+), 51 deletions(-)
 rename dmp-backend/{queryable/src/main/java/eu/eudat/queryable => core/src/main/java/eu/eudat/data/old}/queryableentity/DataEntity.java (82%)

diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index 3f5dff069..ccd2a632e 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -15,12 +15,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>dmp-backend</groupId>
-            <artifactId>queryable</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/CredentialEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/CredentialEntity.java
index a95d73200..062ac9029 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/CredentialEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/CredentialEntity.java
@@ -7,7 +7,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.converters.enums.ProviderTypeConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java
index b0885e040..089d6e0f7 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionEntity.java
@@ -7,7 +7,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.converters.enums.DescriptionStatusConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
index d8166558c..fb3ad14b3 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/DescriptionTemplateEntity.java
@@ -5,7 +5,7 @@ import eu.eudat.commons.enums.DescriptionTemplateStatus;
 import eu.eudat.commons.enums.IsActive;
 import eu.eudat.data.converters.enums.DescriptionTemplateStatusConverter;
 import eu.eudat.data.converters.enums.IsActiveConverter;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import jakarta.persistence.*;
 
 import java.time.Instant;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java
index c7d0928cc..41c56bd93 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/UserDescriptionTemplateEntity.java
@@ -5,7 +5,7 @@ import eu.eudat.commons.enums.UserDescriptionTemplateRole;
 import eu.eudat.data.converters.enums.IsActiveConverter;
 import eu.eudat.data.converters.enums.UserDescriptionTemplateRoleConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import jakarta.persistence.*;
 
 import java.time.Instant;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java
index 03509bb08..2528a14df 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Content.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.List;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
index af9249e04..abcea40b5 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMP.java
@@ -5,7 +5,7 @@ import eu.eudat.data.DescriptionEntity;
 import eu.eudat.data.DmpBlueprintEntity;
 import eu.eudat.data.EntityDoiEntity;
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.*;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
index 2342cc1d9..db0204d66 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.DescriptionTemplateEntity;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.List;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java
index db1182e29..1ebe24bad 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/DataRepository.java
@@ -2,7 +2,7 @@ package eu.eudat.data.old;
 
 
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java
index 1699a2ffb..245e5fc3c 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java
index 87dafd05c..71f551d75 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/ExternalDataset.java
@@ -2,12 +2,11 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java
index 275421361..524c9b804 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java
@@ -2,7 +2,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java
index 3a64acfb8..b99a0eeb9 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java
@@ -1,6 +1,6 @@
 package eu.eudat.data.old;
 
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java
index 2766087b0..ab653339a 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java
@@ -3,7 +3,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.*;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java
index 4bce27cf9..fd0f3f416 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Invitation.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.List;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java
index 526e1b467..84c397d3c 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java
@@ -2,7 +2,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java
index 3c68e4953..2131ec35d 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java
@@ -4,7 +4,7 @@ import eu.eudat.commons.enums.old.notification.ActiveStatus;
 import eu.eudat.commons.enums.old.notification.ContactType;
 import eu.eudat.commons.enums.old.notification.NotificationType;
 import eu.eudat.commons.enums.old.notification.NotifyState;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java
index a14b39fd7..9ad772b76 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Organisation.java
@@ -2,7 +2,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.io.Serializable;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java
index 90dd6b193..a7b9fde41 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Project.java
@@ -2,7 +2,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.*;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java
index 3fcf00878..2ef591896 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Registry.java
@@ -4,7 +4,7 @@ package eu.eudat.data.old;
 import eu.eudat.data.DescriptionEntity;
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java
index e59ef9481..d5d35adef 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Researcher.java
@@ -3,7 +3,7 @@ package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java
index 8ade40d65..61fa36e1e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/Service.java
@@ -2,12 +2,11 @@ package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java
index 688f1e096..dce89e3ce 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserDMP.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.LinkedList;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java
index a7b615108..f39657f36 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserInfo.java
@@ -3,7 +3,7 @@ package eu.eudat.data.old;
 import eu.eudat.data.CredentialEntity;
 import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.*;
diff --git a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java
index bf8b58ace..719556c1e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/UserRole.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.old;
 
 import eu.eudat.data.old.helpers.EntityBinder;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import jakarta.persistence.*;
 import java.util.List;
diff --git a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java b/dmp-backend/core/src/main/java/eu/eudat/data/old/queryableentity/DataEntity.java
similarity index 82%
rename from dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java
rename to dmp-backend/core/src/main/java/eu/eudat/data/old/queryableentity/DataEntity.java
index 0eca2836d..035d25698 100644
--- a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/data/old/queryableentity/DataEntity.java
@@ -1,4 +1,4 @@
-package eu.eudat.queryable.queryableentity;
+package eu.eudat.data.old.queryableentity;
 
 import jakarta.persistence.Tuple;
 import java.util.List;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
index c3b5603a4..4cf0e617b 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccess.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.dao;
 
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 
 public class DatabaseAccess<T extends DataEntity> {
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
index f44badc72..5a1428339 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/DatabaseAccessLayer.java
@@ -2,7 +2,7 @@ package eu.eudat.data.dao;
 
 
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import javax.management.InvalidApplicationException;
 import java.util.concurrent.CompletableFuture;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
index 6857e4ffd..dd2537bf8 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/context/DatabaseContext.java
@@ -2,9 +2,8 @@ package eu.eudat.data.dao.databaselayer.context;
 
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.jpa.hibernatequeryablelist.QueryableHibernateList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
index d596ee688..e215aef70 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/databaselayer/service/DatabaseService.java
@@ -3,7 +3,7 @@ package eu.eudat.data.dao.databaselayer.service;
 
 import eu.eudat.data.dao.databaselayer.context.DatabaseContext;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
index c21344140..c3cd862dd 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/PaginationService.java
@@ -4,7 +4,7 @@ import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.data.query.definition.helpers.ColumnOrderings;
 import eu.eudat.data.query.definition.helpers.Ordering;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Collector.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Collector.java
index d6a301527..a7ec74232 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Collector.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Collector.java
@@ -1,7 +1,7 @@
 package eu.eudat.data.query.definition;
 
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 /**
  * Created by ikalyvas on 3/21/2018.
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/CriteriaQuery.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/CriteriaQuery.java
index f8ec01d33..271f67b18 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/CriteriaQuery.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/CriteriaQuery.java
@@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
 
 import eu.eudat.data.dao.criteria.Criteria;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 /**
  * Created by ikalyvas on 3/21/2018.
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Query.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Query.java
index cffd09906..4360b6d15 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Query.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/Query.java
@@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
 
 import eu.eudat.data.dao.criteria.Criteria;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import io.swagger.annotations.ApiModelProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableCriteriaQuery.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableCriteriaQuery.java
index 5963e7a12..3243a91c0 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableCriteriaQuery.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableCriteriaQuery.java
@@ -2,7 +2,7 @@ package eu.eudat.data.query.definition;
 
 import eu.eudat.data.dao.criteria.Criteria;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 /**
  * Created by ikalyvas on 3/21/2018.
diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableQuery.java b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableQuery.java
index be9dd77b2..6349a0f03 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableQuery.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/query/definition/TableQuery.java
@@ -5,7 +5,7 @@ import eu.eudat.data.dao.criteria.Criteria;
 import eu.eudat.data.query.definition.helpers.ColumnOrderings;
 import eu.eudat.data.query.definition.helpers.SelectionFields;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 
diff --git a/dmp-backend/data/src/main/java/eu/eudat/query/Query.java b/dmp-backend/data/src/main/java/eu/eudat/query/Query.java
index 58bd09cbe..0a2ff2d02 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/query/Query.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/query/Query.java
@@ -2,7 +2,7 @@ package eu.eudat.query;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import javax.management.InvalidApplicationException;
 import java.util.LinkedList;
diff --git a/dmp-backend/queryable/pom.xml b/dmp-backend/queryable/pom.xml
index 7460a7129..1f36551ba 100644
--- a/dmp-backend/queryable/pom.xml
+++ b/dmp-backend/queryable/pom.xml
@@ -14,4 +14,11 @@
         <artifactId>dmp-backend</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
+    <dependencies>
+        <dependency>
+            <groupId>eu.eudat</groupId>
+            <artifactId>core</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
index cb25278f0..e928330d5 100644
--- a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java
@@ -1,7 +1,7 @@
 package eu.eudat.queryable;
 
+import eu.eudat.data.old.queryableentity.DataEntity;
 import eu.eudat.queryable.jpa.predicates.*;
-import eu.eudat.queryable.queryableentity.DataEntity;
 import eu.eudat.queryable.types.SelectionField;
 
 import jakarta.persistence.criteria.Join;
diff --git a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/hibernatequeryablelist/QueryableHibernateList.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/hibernatequeryablelist/QueryableHibernateList.java
index 5397792ca..7b26ac758 100644
--- a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/hibernatequeryablelist/QueryableHibernateList.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/hibernatequeryablelist/QueryableHibernateList.java
@@ -1,11 +1,11 @@
 package eu.eudat.queryable.jpa.hibernatequeryablelist;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import eu.eudat.data.old.queryableentity.DataEntity;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.collector.Collector;
 import eu.eudat.queryable.exceptions.NotSingleResultException;
 import eu.eudat.queryable.jpa.predicates.*;
-import eu.eudat.queryable.queryableentity.DataEntity;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 import jakarta.persistence.EntityManager;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PaginationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PaginationManager.java
index dd5bc24c2..14ade2a99 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PaginationManager.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/PaginationManager.java
@@ -4,7 +4,7 @@ import eu.eudat.data.query.definition.TableQuery;
 import eu.eudat.data.query.definition.helpers.ColumnOrderings;
 import eu.eudat.data.query.definition.helpers.Ordering;
 import eu.eudat.queryable.QueryableList;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
index 2333d33f8..0821de008 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/DataModel.java
@@ -1,7 +1,7 @@
 package eu.eudat.models;
 
 
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 public interface DataModel<T extends DataEntity, M extends DataModel> {
     M fromDataModel(T entity);
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
index 4ea17cd64..537cd675e 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java
@@ -3,7 +3,7 @@ package eu.eudat.models.data.dashboard.recent.model;
 import eu.eudat.models.DataModel;
 import eu.eudat.models.data.datasetprofile.DatasetProfileOverviewModel;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 import java.util.Date;
 import java.util.List;
diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/urls/UrlListing.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/urls/UrlListing.java
index 145466e16..319a40c39 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/urls/UrlListing.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/urls/UrlListing.java
@@ -1,6 +1,6 @@
 package eu.eudat.models.data.urls;
 import eu.eudat.models.DataModel;
-import eu.eudat.queryable.queryableentity.DataEntity;
+import eu.eudat.data.old.queryableentity.DataEntity;
 
 /**
  * Created by ikalyvas on 3/19/2018.