Merge branch 'dmp-refactoring' of code-repo.d4science.org:MaDgiK-CITE/argos into dmp-refactoring

dmp-backend/core/src/main/java/eu/eudat/commons/enums/EntityType.java

@@ -0,0 +1,4 @@
+package eu.eudat.commons.enums;
+
+public enum EntityType {
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/IsActive.java

@@ -6,8 +6,8 @@ import java.util.Map;
 
 public enum IsActive implements DatabaseEnum<Short> {
 
-    Inactive((short)0), 
-    Active( (short)1);
+    Inactive((short) 0),
+    Active((short) 1);
 
     private final Short value;
 

dmp-backend/core/src/main/java/eu/eudat/commons/enums/SupportiveMaterialFieldType.java

@@ -0,0 +1,10 @@
+package eu.eudat.commons.enums;
+
+public enum SupportiveMaterialFieldType {
+
+    faq,
+    about,
+    glossary,
+    termsofservice,
+    userguide
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ActiveStatus.java

@@ -0,0 +1,27 @@
+package eu.eudat.commons.enums.old.notification;
+
+public enum ActiveStatus {
+    ACTIVE(0),
+    INACTIVE(1);
+
+    private int status;
+
+    ActiveStatus(int status) {
+        this.status = status;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public ActiveStatus fromInteger(int status) {
+        switch (status) {
+            case 0:
+                return ACTIVE;
+            case 1:
+                return INACTIVE;
+            default:
+                throw new RuntimeException("Unsupported Active Status");
+        }
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/ContactType.java

@@ -1,4 +1,4 @@
-package eu.eudat.data.enumeration.notification;
+package eu.eudat.commons.enums.old.notification;
 
 public enum ContactType {
 	EMAIL(0);

dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotificationType.java

@@ -1,4 +1,4 @@
-package eu.eudat.data.enumeration.notification;
+package eu.eudat.commons.enums.old.notification;
 
 public enum NotificationType {
 	DMP_MODIFIED(0),

dmp-backend/core/src/main/java/eu/eudat/commons/enums/old/notification/NotifyState.java

@@ -1,4 +1,4 @@
-package eu.eudat.data.enumeration.notification;
+package eu.eudat.commons.enums.old.notification;
 
 public enum NotifyState {
 	PENDING(0),

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

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

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

@@ -1,4 +1,4 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;

dmp-backend/core/src/main/java/eu/eudat/data/old/DMPDatasetProfile.java

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

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

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

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

@@ -1,8 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

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

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

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

@@ -1,7 +1,7 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 

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

@@ -1,8 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

dmp-backend/core/src/main/java/eu/eudat/data/old/DatasetDataRepository.java

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

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

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

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

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

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

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

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

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

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

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

dmp-backend/core/src/main/java/eu/eudat/data/old/DescriptionTemplate.java

@@ -1,4 +1,4 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.DescriptionTemplateTypeEntity;

dmp-backend/core/src/main/java/eu/eudat/data/old/EmailConfirmation.java

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

dmp-backend/core/src/main/java/eu/eudat/data/old/EntityDoi.java

@@ -1,9 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;
 import java.util.Arrays;

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

@@ -1,9 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
 
 import jakarta.persistence.*;
 import java.util.Date;

dmp-backend/core/src/main/java/eu/eudat/data/old/FileUpload.java

@@ -1,9 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;
 import java.util.Date;

dmp-backend/core/src/main/java/eu/eudat/data/old/Funder.java

@@ -1,7 +1,6 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;

dmp-backend/core/src/main/java/eu/eudat/data/old/Grant.java

@@ -1,10 +1,9 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;

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

@@ -1,6 +1,6 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

dmp-backend/core/src/main/java/eu/eudat/data/old/Lock.java

@@ -1,7 +1,7 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 

dmp-backend/core/src/main/java/eu/eudat/data/old/Notification.java

@@ -1,9 +1,9 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
-import eu.eudat.data.enumeration.notification.ActiveStatus;
-import eu.eudat.data.enumeration.notification.ContactType;
-import eu.eudat.data.enumeration.notification.NotificationType;
-import eu.eudat.data.enumeration.notification.NotifyState;
+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 org.hibernate.annotations.GenericGenerator;
 

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

@@ -1,7 +1,7 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

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

@@ -1,9 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;

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

@@ -1,8 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 

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

@@ -1,10 +1,9 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
-import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
 import jakarta.persistence.*;

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

@@ -1,4 +1,4 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 
 import eu.eudat.data.converters.DateToUTCConverter;

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

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

dmp-backend/core/src/main/java/eu/eudat/data/old/UserDatasetProfile.java

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

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

@@ -1,8 +1,8 @@
-package eu.eudat.data.entities;
+package eu.eudat.data.old;
 
 import eu.eudat.data.CredentialEntity;
 import eu.eudat.data.converters.DateToUTCConverter;
-import eu.eudat.data.entities.helpers.EntityBinder;
+import eu.eudat.data.old.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;

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

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

dmp-backend/core/src/main/java/eu/eudat/data/old/helpers/EntityBinder.java

@@ -1,4 +1,4 @@
-package eu.eudat.data.entities.helpers;
+package eu.eudat.data.old.helpers;
 
 import jakarta.persistence.Tuple;
 import java.util.List;

dmp-backend/core/src/main/java/eu/eudat/model/persist/UserGuidePersist.java

@@ -0,0 +1,30 @@
+package eu.eudat.model.persist;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+public class UserGuidePersist {
+
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String name;
+	@NotNull(message = "{validation.empty}")
+	@NotEmpty(message = "{validation.empty}")
+	private String html;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getHtml() {
+		return html;
+	}
+
+	public void setHtml(String html) {
+		this.html = html;
+	}
+}

dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheOptions.java

@@ -0,0 +1,11 @@
+package eu.eudat.service.supportivematerial;
+
+
+import gr.cite.tools.cache.CacheOptions;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "cache.supportive-material")
+public class SupportiveMaterialCacheOptions extends CacheOptions {
+}

dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialCacheService.java

@@ -0,0 +1,67 @@
+package eu.eudat.service.supportivematerial;
+
+
+import gr.cite.tools.cache.CacheService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Locale;
+
+@Service
+public class SupportiveMaterialCacheService extends CacheService<SupportiveMaterialCacheService.SupportiveMaterialCacheValue> {
+
+    public static class SupportiveMaterialCacheValue {
+
+        public SupportiveMaterialCacheValue() {}
+
+        public SupportiveMaterialCacheValue(String name, byte[] content) {
+            this.name = name;
+            this.content = content;
+        }
+
+        private String name;
+
+        private byte[] content;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public byte[] getContent() {
+            return content;
+        }
+
+        public void setContent(byte[] content) {
+            this.content = content;
+        }
+    }
+
+    @Autowired
+    public SupportiveMaterialCacheService(SupportiveMaterialCacheOptions options) {
+        super(options);
+    }
+
+    @Override
+    protected Class<SupportiveMaterialCacheValue> valueClass() {return SupportiveMaterialCacheValue.class;}
+
+
+    public String keyOf(SupportiveMaterialCacheValue value) {
+        return this.buildKey(value.getName());
+    }
+
+    public String buildKey(String name) {
+        HashMap<String, String> keyParts = new HashMap<>();
+
+        keyParts.put("$material$", name.toLowerCase(Locale.ROOT));
+        //keyParts.put("$material_content$", new String(content, StandardCharsets.UTF_8).toLowerCase(Locale.ROOT));
+
+        return this.generateKey(keyParts);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/service/supportivematerial/SupportiveMaterialService.java

@@ -0,0 +1,71 @@
+package eu.eudat.service.supportivematerial;
+
+import eu.eudat.model.persist.UserGuidePersist;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+
+@Service
+public class SupportiveMaterialService {
+
+    private final SupportiveMaterialCacheService supportiveMaterialCacheService;
+
+    public SupportiveMaterialService(
+            SupportiveMaterialCacheService supportiveMaterialCacheService
+    ) {
+        this.supportiveMaterialCacheService = supportiveMaterialCacheService;
+    }
+
+    public ResponseEntity<byte[]> getResponseEntity(String lang, Stream<Path> paths) throws IOException {
+        List<String> result = paths.filter(Files::isRegularFile)
+                .map(Path::toString).collect(Collectors.toList());
+
+        String fileName = result.stream().filter(about -> about.contains("_" + lang)).findFirst().orElse(null);
+
+        if (fileName == null) {
+            fileName = result.stream().filter(about -> about.contains("_en")).findFirst().get();
+        }
+
+        SupportiveMaterialCacheService.SupportiveMaterialCacheValue supportiveMaterialCacheItem = this.supportiveMaterialCacheService.lookup(this.supportiveMaterialCacheService.buildKey(fileName));
+
+        if(supportiveMaterialCacheItem == null){
+            InputStream is = new FileInputStream(fileName);
+
+           // Path path = Paths.get(fileName);
+
+            byte[] content = new byte[is.available()];
+            is.read(content);
+            is.close();
+
+            supportiveMaterialCacheItem = new SupportiveMaterialCacheService.SupportiveMaterialCacheValue(fileName, content);
+            this.supportiveMaterialCacheService.put(supportiveMaterialCacheItem);
+        }
+
+        HttpHeaders responseHeaders = new HttpHeaders();
+        responseHeaders.setContentLength(supportiveMaterialCacheItem.getContent().length);
+        responseHeaders.setContentType(MediaType.TEXT_HTML);
+        responseHeaders.set("Content-Disposition", "attachment;filename=" + fileName);
+        responseHeaders.set("Access-Control-Expose-Headers", "Content-Disposition");
+        responseHeaders.get("Access-Control-Expose-Headers").add("Content-Type");
+
+        return new ResponseEntity<>(supportiveMaterialCacheItem.getContent(), responseHeaders, HttpStatus.OK);
+    }
+
+    public void persist(UserGuidePersist userGuidePersist, String fileName) throws IOException {
+        this.supportiveMaterialCacheService.evict(fileName);
+        OutputStream os = new FileOutputStream(fileName);
+        os.write(userGuidePersist.getHtml().getBytes());
+        os.close();
+    }
+}

dmp-backend/data/src/main/java/eu/eudat/data/converters/DateToUTCConverter.java

@@ -1,49 +0,0 @@
-package eu.eudat.data.converters;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.format.datetime.DateFormatter;
-
-import jakarta.persistence.AttributeConverter;
-import jakarta.persistence.Converter;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-/**
- * Created by ikalyvas on 9/25/2018.
- */
-@Converter
-public class DateToUTCConverter implements AttributeConverter<Date, Date> {
-    private static final Logger logger = LoggerFactory.getLogger(DateToUTCConverter.class);
-
-    @Override
-    public Date convertToDatabaseColumn(Date attribute) {
-        if(attribute == null) return null;
-        DateFormat formatterIST = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        formatterIST.setTimeZone(TimeZone.getTimeZone("UTC"));
-        try {
-            String date = formatterIST.format(attribute);
-            return formatterIST.parse(date);
-        } catch (ParseException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-    @Override
-    public Date convertToEntityAttribute(Date dbData) {
-        if(dbData == null) return null;
-        DateFormat formatterIST = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        formatterIST.setTimeZone(TimeZone.getTimeZone("UTC"));
-        try {
-            String date = formatterIST.format(dbData);
-            return formatterIST.parse(date);
-        } catch (ParseException e) {
-            logger.error(e.getMessage(), e);
-        }
-        return null;
-    }
-}

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.DMPProfile;
+import eu.eudat.data.old.DMPProfile;
 
 public class DataManagementPlanBlueprintCriteria extends Criteria<DMPProfile> {
 

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

@@ -1,8 +1,8 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.DMPProfile;
-import eu.eudat.data.entities.Grant;
+import eu.eudat.data.old.DMP;
+import eu.eudat.data.old.DMPProfile;
+import eu.eudat.data.old.Grant;
 
 import java.util.Date;
 import java.util.List;
@@ -12,7 +12,7 @@ public class DataManagementPlanCriteria extends Criteria<DMP> {
     private Date periodStart;
     private Date periodEnd;
     private DMPProfile profile;
-    private List<eu.eudat.data.entities.Grant> grants;
+    private List<Grant> grants;
     private boolean allVersions;
     private List<UUID> groupIds;
     private Integer status;

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.DMPProfile;
+import eu.eudat.data.old.DMPProfile;
 
 /**
  * Created by ikalyvas on 3/21/2018.

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.DMP;
+import eu.eudat.data.old.DMP;
 import eu.eudat.types.grant.GrantStateType;
 
 import java.util.List;

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

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

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

@@ -1,8 +1,7 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.old.Dataset;
 import eu.eudat.elastic.entities.Tag;
-import eu.eudat.types.grant.GrantStateType;
 
 import java.util.Date;
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package eu.eudat.data.dao.criteria;
 
 
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.old.DescriptionTemplate;
 
 import java.util.Date;
 import java.util.List;

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

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

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.Dataset;
+import eu.eudat.data.old.Dataset;
 import eu.eudat.elastic.entities.Tag;
 import eu.eudat.types.grant.GrantStateType;
 

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

@@ -1,8 +1,8 @@
 package eu.eudat.data.dao.criteria;
 
 
-import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.DMP;
+import eu.eudat.data.old.UserInfo;
 
 public class DatasetWizardUserDmpCriteria extends Criteria<DMP> {
     private UserInfo userInfo;

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

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

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.ExternalDataset;
+import eu.eudat.data.old.ExternalDataset;
 import java.util.UUID;
 
 public class ExternalDatasetCriteria extends Criteria<ExternalDataset> {

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

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

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

@@ -1,7 +1,6 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.Grant;
-import eu.eudat.types.grant.GrantStateType;
+import eu.eudat.data.old.Grant;
 
 import java.util.Date;
 

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

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

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

@@ -1,7 +1,7 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.entities.Lock;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.Lock;
+import eu.eudat.data.old.UserInfo;
 
 import java.util.Date;
 import java.util.UUID;

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

@@ -1,7 +1,7 @@
 package eu.eudat.data.dao.criteria;
 
-import eu.eudat.data.enumeration.notification.ActiveStatus;
-import eu.eudat.data.enumeration.notification.NotifyState;
+import eu.eudat.commons.enums.old.notification.ActiveStatus;
+import eu.eudat.commons.enums.old.notification.NotifyState;
 
 public class NotificationCriteria {
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.Content;
+import eu.eudat.data.old.Content;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -3,9 +3,8 @@ 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.UserDMP;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.DMP;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.List;

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

@@ -4,8 +4,8 @@ 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.data.old.DMP;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;

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

@@ -3,8 +3,7 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria;
 import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria;
-import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.DMPProfile;
+import eu.eudat.data.old.DMPProfile;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -4,7 +4,7 @@ import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.DataManagementPlanBlueprintCriteria;
 import eu.eudat.data.dao.criteria.DataManagementPlanProfileCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DMPProfile;
+import eu.eudat.data.old.DMPProfile;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.DataRepositoryCriteria;
-import eu.eudat.data.entities.DataRepository;
+import eu.eudat.data.old.DataRepository;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities;
 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.data.old.DataRepository;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities;
 
 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.data.old.Dataset;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.List;

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

@@ -3,10 +3,9 @@ package eu.eudat.data.dao.entities;
 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.DMP;
-import eu.eudat.data.entities.Dataset;
-import eu.eudat.data.entities.UserDMP;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.DMP;
+import eu.eudat.data.old.Dataset;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;

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

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

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DatasetExternalDataset;
+import eu.eudat.data.old.DatasetExternalDataset;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.DescriptionTemplateTypeEntity;
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
-import eu.eudat.data.entities.DescriptionTemplate;
+import eu.eudat.data.old.DescriptionTemplate;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.List;

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

@@ -4,7 +4,7 @@ import eu.eudat.data.DescriptionTemplateTypeEntity;
 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.DescriptionTemplate;
+import eu.eudat.data.old.DescriptionTemplate;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;

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

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

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DatasetService;
+import eu.eudat.data.old.DatasetService;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

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

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

@@ -2,8 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.Content;
-import eu.eudat.data.entities.DMPDatasetProfile;
+import eu.eudat.data.old.DMPDatasetProfile;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.EmailConfirmationCriteria;
-import eu.eudat.data.entities.EmailConfirmation;
+import eu.eudat.data.old.EmailConfirmation;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.EmailConfirmationCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.EmailConfirmation;
+import eu.eudat.data.old.EmailConfirmation;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

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

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.EntityDoi;
+import eu.eudat.data.old.EntityDoi;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.ExternalDatasetCriteria;
-import eu.eudat.data.entities.ExternalDataset;
+import eu.eudat.data.old.ExternalDataset;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -3,7 +3,7 @@ package eu.eudat.data.dao.entities;
 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.data.old.ExternalDataset;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

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

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

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

@@ -2,7 +2,7 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.FileUpload;
+import eu.eudat.data.old.FileUpload;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.FunderCriteria;
-import eu.eudat.data.entities.Funder;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.Funder;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -3,8 +3,8 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.FunderCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.Funder;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.Funder;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities;
 
 import eu.eudat.data.dao.DatabaseAccessLayer;
 import eu.eudat.data.dao.criteria.GrantCriteria;
-import eu.eudat.data.entities.Grant;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.Grant;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 
 import java.util.UUID;

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

@@ -3,15 +3,14 @@ package eu.eudat.data.dao.entities;
 import eu.eudat.data.dao.DatabaseAccess;
 import eu.eudat.data.dao.criteria.GrantCriteria;
 import eu.eudat.data.dao.databaselayer.service.DatabaseService;
-import eu.eudat.data.entities.DMP;
-import eu.eudat.data.entities.Grant;
-import eu.eudat.data.entities.UserInfo;
+import eu.eudat.data.old.DMP;
+import eu.eudat.data.old.Grant;
+import eu.eudat.data.old.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import eu.eudat.types.grant.GrantStateType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import schemasMicrosoftComOfficeOffice.LeftDocument;
 
 import jakarta.persistence.criteria.JoinType;
 import java.util.Date;