Updating Spring to version 6, adding service stack for DescriptionType entity

dmp-backend/core/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>eu.eudat</groupId>
+        <artifactId>dmp-backend</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>core</artifactId>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

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

@@ -0,0 +1,43 @@
+package eu.eudat.commons.enums;
+
+public enum DescriptionTemplateTypeStatus {
+
+    SAVED((short) 0), FINALIZED((short) 1), DELETED((short) 99);
+
+    private final short value;
+
+    DescriptionTemplateTypeStatus(short value) {
+        this.value = value;
+    }
+
+    public short getValue() {
+        return value;
+    }
+
+    public static DescriptionTemplateTypeStatus fromInteger(int value) {
+        switch (value) {
+            case 0:
+                return SAVED;
+            case 1:
+                return FINALIZED;
+            case 99:
+                return DELETED;
+            default:
+                throw new RuntimeException("Unsupported Description Template Type Status");
+        }
+    }
+
+    public static DescriptionTemplateTypeStatus fromLabel(String value) {
+        switch (value) {
+            case "SAVED":
+                return SAVED;
+            case "FINALISED":
+                return FINALIZED;
+            case "DELETED":
+                return DELETED;
+            default:
+                throw new RuntimeException("Unsupported Description Template Type Status");
+        }
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/configurations/typedefinition/UUIDType.java

@@ -14,7 +14,7 @@ import java.util.UUID;
 /**
  * Currently not used
  */
-public class UUIDType implements UserType {
+public class UUIDType implements UserType<UUID> {
     private final int[] sqlTypesSupported = new int[]{Types.NUMERIC};
     private final String CAST_EXCEPTION_TEXT = " cannot be cast to a java.util.UUID";
 
@@ -22,18 +22,27 @@ public class UUIDType implements UserType {
         return sqlTypesSupported;
     }
 
-    @SuppressWarnings("rawtypes")
+    @Override
-    public Class returnedClass() {
+    public int getSqlType() {
+        return sqlTypesSupported[0];
+    }
+
+    public Class<UUID> returnedClass() {
         return UUID.class;
     }
 
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public boolean equals(UUID x, UUID y) throws HibernateException {
         if (x == null) return y == null;
         else return x.equals(y);
     }
 
-    public int hashCode(Object x) throws HibernateException {
+    public int hashCode(UUID x) throws HibernateException {
-        return x == null ? null : x.hashCode();
+        return x == null ? -1 : x.hashCode();
+    }
+
+    @Override
+    public UUID nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException {
+        return null;
     }
 
     public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException {
@@ -58,25 +67,24 @@ public class UUIDType implements UserType {
         st.setObject(index, uuid, Types.OTHER);
     }
 
-    public Object deepCopy(Object value) throws HibernateException {
+    public UUID deepCopy(UUID value) throws HibernateException {
         if (value == null) return null;
-        UUID uuid = (UUID) value;
+        return new UUID(value.getMostSignificantBits(), value.getLeastSignificantBits());
-        return new UUID(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
     }
 
     public boolean isMutable() {
         return false;
     }
 
-    public Serializable disassemble(Object value) throws HibernateException {
+    public Serializable disassemble(UUID value) throws HibernateException {
-        return (Serializable) value;
+        return value;
     }
 
-    public Object assemble(Serializable cached, Object owner) throws HibernateException {
+    public UUID assemble(Serializable cached, Object owner) throws HibernateException {
-        return cached;
+        return (UUID) cached;
     }
 
-    public Object replace(Object original, Object target, Object owner) throws HibernateException {
+    public UUID replace(UUID original, Object target, Object owner) throws HibernateException {
         return original;
     }
 
@@ -98,7 +106,7 @@ public class UUIDType implements UserType {
         return nullSafeGet(rs, names, owner);
     }
 
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session)
+    public void nullSafeSet(PreparedStatement st, UUID value, int index, SharedSessionContractImplementor session)
             throws HibernateException, SQLException {
         nullSafeSet(st, value, index);
     }

dmp-backend/core/src/main/java/eu/eudat/configurations/typedefinition/XMLType.java

@@ -13,7 +13,7 @@ import java.sql.Types;
 /**
  * Store and retrieve a PostgreSQL "xml" column as a Java string.
  */
-public class XMLType implements UserType {
+public class XMLType implements UserType<String> {
 
     private final int[] sqlTypesSupported = new int[]{Types.VARCHAR};
 
@@ -21,11 +21,16 @@ public class XMLType implements UserType {
         return sqlTypesSupported;
     }
 
-    public Class returnedClass() {
+    @Override
+    public int getSqlType() {
+        return sqlTypesSupported[0];
+    }
+
+    public Class<String> returnedClass() {
         return String.class;
     }
 
-    public boolean equals(Object x, Object y) throws HibernateException {
+    public boolean equals(String x, String y) throws HibernateException {
         if (x == null) {
             return y == null;
         } else {
@@ -33,8 +38,13 @@ public class XMLType implements UserType {
         }
     }
 
-    public int hashCode(Object x) throws HibernateException {
+    public int hashCode(String x) throws HibernateException {
-        return x == null ? null : x.hashCode();
+        return x == null ? -1 : x.hashCode();
+    }
+
+    @Override
+    public String nullSafeGet(ResultSet resultSet, int i, SharedSessionContractImplementor sharedSessionContractImplementor, Object o) throws SQLException {
+        return null;
     }
 
     public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException {
@@ -51,25 +61,23 @@ public class XMLType implements UserType {
         }
     }
 
-    public Object deepCopy(Object value) throws HibernateException {
+    public String deepCopy(String value) throws HibernateException {
-        if (value == null)
+        return value;
-            return null;
-        return new String((String) value);
     }
 
     public boolean isMutable() {
         return false;
     }
 
-    public Serializable disassemble(Object value) throws HibernateException {
+    public Serializable disassemble(String value) throws HibernateException {
-        return (String) value;
+        return value;
     }
 
-    public Object assemble(Serializable cached, Object owner) throws HibernateException {
+    public String assemble(Serializable cached, Object owner) throws HibernateException {
         return (String) cached;
     }
 
-    public Object replace(Object original, Object target, Object owner) throws HibernateException {
+    public String replace(String original, String target, Object owner) throws HibernateException {
         return original;
     }
 
@@ -78,9 +86,8 @@ public class XMLType implements UserType {
         return nullSafeGet(rs, names, owner);
     }
 
-    public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
+    public void nullSafeSet(PreparedStatement st, String value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException {
         nullSafeSet(st, value, index);
-
     }
 
 }

dmp-backend/core/src/main/java/eu/eudat/convention/ConventionService.java

@@ -0,0 +1,40 @@
+package eu.eudat.convention;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
+
+public interface ConventionService {
+
+    Boolean isValidId(Integer id);
+
+    Boolean isValidGuid(UUID guid);
+
+    Boolean isValidUUID(String str);
+    UUID parseUUIDSafe(String str);
+
+    Boolean isValidHash(String hash);
+
+    String hashValue(Object value);
+
+    String limit(String text, int maxLength);
+
+    String truncate(String text, int maxLength);
+
+    UUID getEmptyUUID();
+
+    boolean isNullOrEmpty(String value);
+
+    boolean isListNullOrEmpty(List<?> value);
+
+    String stringEmpty();
+
+    String asPrefix(String name);
+
+    String asIndexerPrefix(String part);
+
+    String asIndexer(String... names);
+
+    <K, V> Map<K, List<V>> toDictionaryOfList(List<V> items, Function<V, K> keySelector);
+}

dmp-backend/core/src/main/java/eu/eudat/convention/ConventionServiceImpl.java

@@ -0,0 +1,150 @@
+package eu.eudat.convention;
+
+import eu.eudat.errorcode.ErrorThesaurusProperties;
+import gr.cite.tools.exception.MyApplicationException;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_SINGLETON)
+public class ConventionServiceImpl implements ConventionService {
+    private final static Pattern UUID_REGEX_PATTERN = Pattern.compile("^[{]?[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}[}]?$");
+
+    private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(ConventionServiceImpl.class));
+    private final ErrorThesaurusProperties errors;
+
+    @Autowired
+    public ConventionServiceImpl(ErrorThesaurusProperties errors) {
+        this.errors = errors;
+    }
+
+    @Override
+    public Boolean isValidId(Integer id) {
+        return id != null && id > 0;
+    }
+
+    @Override
+    public Boolean isValidGuid(UUID guid) {
+        return guid != null && !guid.equals(this.getEmptyUUID());
+    }
+
+    @Override
+    public Boolean isValidUUID(String str) {
+        if (this.isNullOrEmpty(str)) {
+            return false;
+        }
+        return UUID_REGEX_PATTERN.matcher(str).matches();
+    }
+
+    @Override
+    public UUID parseUUIDSafe(String str) {
+        if (!this.isValidUUID(str)) {
+            return null;
+        }
+        try {
+            return UUID.fromString(str);
+        } catch (Exception ex){
+            logger.warn("invalid uuid" + str, ex);
+            return null;
+        }
+    }
+
+    @Override
+    public Boolean isValidHash(String hash) {
+        return !this.isNullOrEmpty(hash);
+    }
+
+    @Override
+    public String hashValue(Object value) throws MyApplicationException {
+        if (value == null) return this.stringEmpty();
+        if (value instanceof Instant) return String.format("%ts", (Instant) value);
+        throw new MyApplicationException(this.errors.getSystemError().getCode(), this.errors.getSystemError().getMessage());
+    }
+
+    @Override
+    public String limit(String text, int maxLength) {
+        if (this.isNullOrEmpty(text)) return text;
+        if (text.length() > maxLength) return String.format("%s...", text.substring(0, maxLength));
+        else return text;
+    }
+
+    @Override
+    public String truncate(String text, int maxLength) {
+        String truncated = text;
+        if (text.length() < maxLength) return text;
+
+        truncated = truncated.trim();
+        truncated = truncated.replaceAll("\\s+", " ");//remove multiple spaces
+        if (truncated.length() < maxLength) return truncated;
+        truncated = truncated.replaceAll("([.!@#$%^&-=':;,<>?*\"/|])+", "");//remove multiple spaces
+        if (truncated.length() < maxLength) return truncated;
+        truncated = truncated.replaceAll("([aeiou])+", "");//remove multiple spaces
+        if (truncated.length() < maxLength) return truncated;
+        truncated = truncated.replaceAll("([AEIOU])+", "");//remove multiple spaces
+        if (truncated.length() < maxLength) return truncated;
+
+        if (text.length() > maxLength) return String.format("%s...", text.substring(0, maxLength));
+        return text;
+
+    }
+
+    @Override
+    public UUID getEmptyUUID() {
+        return new UUID(0L, 0L);
+    }
+
+    @Override
+    public boolean isNullOrEmpty(String value) {
+        return value == null || value.isEmpty();
+    }
+
+    @Override
+    public boolean isListNullOrEmpty(List<?> value) {
+        if(value == null) return true;
+        return value.isEmpty();
+    }
+
+    @Override
+    public String stringEmpty() {
+        return "";
+    }
+
+    @Override
+    public String asPrefix(String name) {
+        if (name == null) return null;
+        return name + ".";
+    }
+
+    @Override
+    public String asIndexer(String... names) {
+        if (names == null) return null;
+        return String.join(".", Arrays.stream(names).filter(x -> !this.isNullOrEmpty(x)).collect(Collectors.toList()));
+    }
+
+    @Override
+    public String asIndexerPrefix(String part) {
+        if (part == null) return null;
+        return part + ".";
+    }
+
+    @Override
+    public <K, V> Map<K, List<V>> toDictionaryOfList(List<V> items, Function<V, K> keySelector) {
+        Map<K, List<V>> map = new HashMap<>();
+        for (V model : items) {
+            K key = keySelector.apply(model);
+            if (!map.containsKey(key)) map.put(key, new ArrayList<V>());
+            map.get(key).add(model);
+        }
+        return map;
+    }
+}

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

@@ -0,0 +1,5 @@
+package eu.eudat.data;
+
+public interface BaseEntity {
+
+}

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

@@ -0,0 +1,54 @@
+package eu.eudat.data;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import jakarta.persistence.*;
+import java.util.UUID;
+
+@Entity
+@Table(name = "DescriptionTemplateType")
+public class DescriptionTemplateTypeEntity implements BaseEntity {
+
+    @Id
+    @GeneratedValue
+    @GenericGenerator(name = "uuid2", strategy = "uuid2")
+    @Column(name = "ID", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
+    private UUID id;
+
+    public static final String _id = "ID";
+
+    @Column(name = "Name", nullable = false)
+    private String name;
+
+    public static final String _name = "Name";
+
+    @Column(name = "Status", nullable = false)
+    private Short status;
+
+    public static final String _status = "Status";
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/errorcode/ErrorDescription.java

@@ -0,0 +1,25 @@
+package eu.eudat.errorcode;
+
+public class ErrorDescription {
+
+    private int code;
+
+    private String message;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/errorcode/ErrorThesaurusConfiguration.java

@@ -0,0 +1,12 @@
+package eu.eudat.errorcode;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(ErrorThesaurusProperties.class)
+public class ErrorThesaurusConfiguration {
+
+
+
+}

dmp-backend/core/src/main/java/eu/eudat/errorcode/ErrorThesaurusProperties.java

@@ -0,0 +1,48 @@
+package eu.eudat.errorcode;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "error-thesaurus")
+public class ErrorThesaurusProperties {
+
+    private ErrorDescription systemError;
+
+    public ErrorDescription getSystemError() {
+        return systemError;
+    }
+
+    public void setSystemError(ErrorDescription systemError) {
+        this.systemError = systemError;
+    }
+
+    private ErrorDescription forbidden;
+
+    public ErrorDescription getForbidden() {
+        return forbidden;
+    }
+
+    public void setForbidden(ErrorDescription forbidden) {
+        this.forbidden = forbidden;
+    }
+
+    private ErrorDescription hashConflict;
+
+    public ErrorDescription getHashConflict() {
+        return hashConflict;
+    }
+
+    public void setHashConflict(ErrorDescription hashConflict) {
+        this.hashConflict = hashConflict;
+    }
+
+    private ErrorDescription modelValidation;
+
+    public ErrorDescription getModelValidation() {
+        return modelValidation;
+    }
+
+    public void setModelValidation(ErrorDescription modelValidation) {
+        this.modelValidation = modelValidation;
+    }
+
+}

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

@@ -0,0 +1,37 @@
+package eu.eudat.model;
+
+import java.util.UUID;
+
+public class DescriptionTemplateType {
+
+    private UUID id;
+
+    private String name;
+
+    private short status;
+
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public short getStatus() {
+        return status;
+    }
+
+    public void setStatus(short status) {
+        this.status = status;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/model/builder/BaseBuilder.java

@@ -0,0 +1,97 @@
+package eu.eudat.model.builder;
+
+import eu.eudat.convention.ConventionService;
+import gr.cite.tools.data.builder.Builder;
+import gr.cite.tools.data.query.QueryBase;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public abstract class BaseBuilder<M, D> implements Builder {
+
+    protected final LoggerService logger;
+
+    protected final ConventionService conventionService;
+
+    public BaseBuilder(
+            ConventionService conventionService,
+            LoggerService logger
+    ) {
+        this.conventionService = conventionService;
+        this.logger = logger;
+    }
+
+    public M build(FieldSet directives, D data) {
+        if (data == null) {
+            return null;
+        }
+        List<M> models = this.build(directives == null ? getFullFieldSet() : directives, List.of(data));
+        return models.stream().findFirst().orElse(null);
+    }
+
+    public abstract List<M> build(FieldSet directives, List<D> data);
+
+    public abstract FieldSet getFullFieldSet();
+
+    public <K> Map<K, M> asForeignKey(QueryBase<D> query, FieldSet directives, Function<M, K> keySelector) {
+        this.logger.trace("Building references from query");
+        List<D> data = query.collectAs(directives);
+        this.logger.trace("collected {} items to build", Optional.ofNullable(data).map(List::size).orElse(0));
+        return this.asForeignKey(data, directives, keySelector);
+    }
+
+    public <K> Map<K, M> asForeignKey(List<D> data, FieldSet directives, Function<M, K> keySelector) {
+        this.logger.trace("building references");
+        List<M> models = this.build(directives, data);
+        this.logger.trace("mapping {} build items from {} requested", Optional.ofNullable(models).map(List::size).orElse(0), Optional.ofNullable(data).map(List::size).orElse(0));
+        assert models != null;
+        return models.stream().collect(Collectors.toMap(keySelector, o -> o));
+    }
+
+    public <K> Map<K, List<M>> asMasterKey(QueryBase<D> query, FieldSet directives, Function<M, K> keySelector) {
+        this.logger.trace("Building details from query");
+        List<D> data = query.collectAs(directives);
+        this.logger.trace("collected {} items to build", Optional.ofNullable(data).map(List::size).orElse(0));
+        return this.asMasterKey(data, directives, keySelector);
+    }
+
+    public <K> Map<K, List<M>> asMasterKey(List<D> data, FieldSet directives, Function<M, K> keySelector) {
+        this.logger.trace("building details");
+        List<M> models = this.build(directives, data);
+        this.logger.trace("mapping {} build items from {} requested", Optional.ofNullable(models).map(List::size).orElse(0), Optional.ofNullable(data).map(List::size).orElse(0));
+        Map<K, List<M>> map = new HashMap<>();
+        assert models != null;
+        for (M model : models) {
+            K key = keySelector.apply(model);
+            if (!map.containsKey(key))
+                map.put(key, new ArrayList<M>());
+            map.get(key).add(model);
+        }
+        return map;
+    }
+
+    public <FK, FM> Map<FK, FM> asEmpty(List<FK> keys, Function<FK, FM> mapper, Function<FM, FK> keySelector) {
+        this.logger.trace("building static references");
+        List<FM> models = keys.stream().map(mapper).collect(Collectors.toList());
+        this.logger.trace("mapping {} build items from {} requested", Optional.of(models).map(List::size).orElse(0), Optional.of(keys).map(List::size));
+        return models.stream().collect(Collectors.toMap(keySelector, o -> o));
+    }
+
+    protected String hashValue(Instant value) {
+        return this.conventionService.hashValue(value);
+    }
+
+    protected String asPrefix(String name) {
+        return this.conventionService.asPrefix(name);
+    }
+
+    protected String asIndexer(String... names) {
+        return this.conventionService.asIndexer(names);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/model/builder/DescriptionTemplateTypeBuilder.java

@@ -0,0 +1,56 @@
+package eu.eudat.model.builder;
+
+import eu.eudat.convention.ConventionService;
+import eu.eudat.data.DescriptionTemplateTypeEntity;
+import eu.eudat.model.DescriptionTemplateType;
+import gr.cite.tools.fieldset.BaseFieldSet;
+import gr.cite.tools.fieldset.FieldSet;
+import gr.cite.tools.logging.LoggerService;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+@Component
+public class DescriptionTemplateTypeBuilder extends BaseBuilder<DescriptionTemplateType, DescriptionTemplateTypeEntity> {
+
+    public DescriptionTemplateTypeBuilder(ConventionService conventionService) {
+        super(conventionService, new LoggerService(LoggerFactory.getLogger(DescriptionTemplateTypeBuilder.class)));
+    }
+
+    @Override
+    public List<DescriptionTemplateType> build(FieldSet directives, List<DescriptionTemplateTypeEntity> data) {
+        if (directives == null || directives.isEmpty())
+            return new ArrayList<>();
+
+        List<DescriptionTemplateType> models = new ArrayList<>(100);
+
+        if (data == null)
+            return models;
+        for (DescriptionTemplateTypeEntity d : data) {
+            DescriptionTemplateType m = new DescriptionTemplateType();
+            if (directives.hasField(this.asIndexer(DescriptionTemplateTypeEntity._id)))
+                m.setId(d.getId());
+            if (directives.hasField(this.asIndexer(DescriptionTemplateTypeEntity._name)))
+                m.setName(d.getName());
+            if (directives.hasField(this.asIndexer(DescriptionTemplateTypeEntity._status)))
+                m.setStatus(d.getStatus());
+            models.add(m);
+        }
+
+        return models;
+    }
+
+    @Override
+    public FieldSet getFullFieldSet() {
+        BaseFieldSet fieldSet = new BaseFieldSet();
+        fieldSet.setFields(Set.of(
+                DescriptionTemplateTypeEntity._id,
+                DescriptionTemplateTypeEntity._name,
+                DescriptionTemplateTypeEntity._status
+        ));
+        return fieldSet;
+    }
+}

dmp-backend/core/src/main/java/eu/eudat/model/result/QueryResult.java

@@ -0,0 +1,71 @@
+package eu.eudat.model.result;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QueryResult<M> {
+
+    public QueryResult() {
+    }
+
+    public QueryResult(List<M> items, long count, long countOverride) {
+        this.items = items;
+        this.count = count;
+        this.countOverride = countOverride;
+    }
+
+    public QueryResult(List<M> items, long count) {
+        this.items = items;
+        this.count = count;
+        this.countOverride = 0;
+    }
+
+    public QueryResult(M item) {
+        this.items = List.of(item);
+        this.count = 1;
+        this.countOverride = 0;
+    }
+
+    public QueryResult(List<M> items) {
+        this.items = items;
+        if (items != null)
+            this.count = items.size();
+        else
+            this.count = 0;
+    }
+
+    private List<M> items;
+
+    private long count;
+
+    private long countOverride;
+
+    public List<M> getItems() {
+        return items;
+    }
+
+    public void setItems(List<M> items) {
+        this.items = items;
+    }
+
+    public long getCount() {
+        return count;
+    }
+
+    public void setCount(long count) {
+        this.count = count;
+    }
+
+    public long getCountOverride() {
+        return countOverride;
+    }
+
+    public void setCountOverride(long countOverride) {
+        this.countOverride = countOverride;
+    }
+
+    public static QueryResult<?> empty() {
+        return new QueryResult<>(new ArrayList<>(), 0L);
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/query/DescriptionTemplateTypeQuery.java

@@ -0,0 +1,132 @@
+package eu.eudat.query;
+
+import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
+import eu.eudat.data.DescriptionTemplateTypeEntity;
+import eu.eudat.query.lookup.DescriptionTemplateTypeLookup;
+import eu.eudat.query.lookup.LookupAware;
+import gr.cite.tools.data.query.FieldResolver;
+import gr.cite.tools.data.query.QueryBase;
+import gr.cite.tools.data.query.QueryContext;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class DescriptionTemplateTypeQuery extends QueryBase<DescriptionTemplateTypeEntity> implements LookupAware<DescriptionTemplateTypeQuery, DescriptionTemplateTypeLookup> {
+
+    private Collection<UUID> ids;
+
+    private Collection<String> names;
+
+    private Collection<Short> statuses;
+
+    public DescriptionTemplateTypeQuery ids(UUID value) {
+        this.ids = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery ids(UUID... value) {
+        this.ids = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery ids(List<UUID> value) {
+        this.ids = value;
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery names(String value) {
+        this.names = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery names(String... value) {
+        this.names = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery names(List<String> value) {
+        this.names = value;
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery statuses(Short value) {
+        this.statuses = List.of(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery statuses(Short... value) {
+        this.statuses = Arrays.asList(value);
+        return this;
+    }
+
+    public DescriptionTemplateTypeQuery statuses(List<Short> value) {
+        this.statuses = value;
+        return this;
+    }
+
+    @Override
+    public DescriptionTemplateTypeQuery fromLookup(DescriptionTemplateTypeLookup lookup) {
+        if (lookup == null) return this;
+        if (lookup.getName() != null) names(lookup.getName());
+        if (lookup.getStatus() != null) statuses(DescriptionTemplateTypeStatus.fromLabel(lookup.getStatus()).getValue());
+        return this;
+    }
+
+    @Override
+    protected Boolean isFalseQuery() {
+        return Boolean.FALSE;
+    }
+
+    @Override
+    protected Class<DescriptionTemplateTypeEntity> entityClass() {
+        return DescriptionTemplateTypeEntity.class;
+    }
+
+    @Override
+    protected <X, Y> Predicate applyFilters(QueryContext<X, Y> queryContext) {
+        List<Predicate> predicates = new ArrayList<>();
+
+        if (this.ids != null) {
+            CriteriaBuilder.In<UUID> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateTypeEntity._id));
+            for (UUID item : this.ids) inClause.value(item);
+            predicates.add(inClause);
+        }
+
+        if (this.names != null) {
+            CriteriaBuilder.In<String> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateTypeEntity._name));
+            for (String item : this.names) inClause.value(item);
+            predicates.add(inClause);
+        }
+
+        if (this.statuses != null) {
+            CriteriaBuilder.In<Short> inClause = queryContext.CriteriaBuilder.in(queryContext.Root.get(DescriptionTemplateTypeEntity._status));
+            for (Short item : this.statuses) inClause.value(item);
+            predicates.add(inClause);
+        }
+
+        if (!predicates.isEmpty()) {
+            Predicate[] predicatesArray = predicates.toArray(new Predicate[0]);
+            return queryContext.CriteriaBuilder.and(predicatesArray);
+        } else {
+            return queryContext.CriteriaBuilder.and();
+        }
+    }
+
+    @Override
+    protected String fieldNameOf(FieldResolver item) {
+        return null;
+    }
+
+    @Override
+    protected DescriptionTemplateTypeEntity convert(Tuple tuple, Set<String> columns) {
+        return null;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/query/lookup/DescriptionTemplateTypeLookup.java

@@ -0,0 +1,25 @@
+package eu.eudat.query.lookup;
+
+import gr.cite.tools.data.query.Lookup;
+
+public class DescriptionTemplateTypeLookup extends Lookup {
+
+    private String name, status;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+}

dmp-backend/core/src/main/java/eu/eudat/query/lookup/LookupAware.java

@@ -0,0 +1,12 @@
+package eu.eudat.query.lookup;
+
+public interface LookupAware<Q, L> {
+
+    /**
+     * Every query that supports building from a lookup object should implement this interface
+     * @param lookup The object containing all the lookup options
+     * @return The query built from all the set options
+     */
+    Q fromLookup(L lookup);
+
+}

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

@@ -0,0 +1,101 @@
+package eu.eudat.service;
+
+import eu.eudat.commons.enums.DescriptionTemplateTypeStatus;
+import eu.eudat.data.DescriptionTemplateTypeEntity;
+import eu.eudat.model.DescriptionTemplateType;
+import eu.eudat.model.builder.DescriptionTemplateTypeBuilder;
+import eu.eudat.query.DescriptionTemplateTypeQuery;
+import eu.eudat.query.lookup.DescriptionTemplateTypeLookup;
+import gr.cite.tools.data.builder.BuilderFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import java.util.List;
+import java.util.UUID;
+
+@Service
+public class DescriptionTemplateTypeService {
+
+    private final ApplicationContext applicationContext;
+
+    private final BuilderFactory builderFactory;
+
+    private final PlatformTransactionManager transactionManager;
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    public DescriptionTemplateTypeService(ApplicationContext applicationContext, BuilderFactory builderFactory, PlatformTransactionManager platformTransactionManager) {
+        this.applicationContext = applicationContext;
+        this.builderFactory = builderFactory;
+        this.transactionManager = platformTransactionManager;
+    }
+
+    public List<DescriptionTemplateType> getAll(DescriptionTemplateTypeLookup lookup) {
+        DescriptionTemplateTypeQuery query = applicationContext.getBean(DescriptionTemplateTypeQuery.class);
+        return builderFactory
+                .builder(DescriptionTemplateTypeBuilder.class)
+                .build(lookup.getProject(), query.fromLookup(lookup).collect());
+    }
+
+    public DescriptionTemplateType getById(UUID id) {
+        DescriptionTemplateTypeQuery query = applicationContext.getBean(DescriptionTemplateTypeQuery.class);
+        return builderFactory
+                .builder(DescriptionTemplateTypeBuilder.class)
+                .build(null, query.ids(id).first());
+    }
+
+    public DescriptionTemplateType create(DescriptionTemplateType payload) {
+        DescriptionTemplateTypeEntity created = new DescriptionTemplateTypeEntity();
+        created.setId(UUID.randomUUID());
+        created.setName(payload.getName());
+        created.setStatus(DescriptionTemplateTypeStatus.SAVED.getValue());
+
+        DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+        definition.setName(UUID.randomUUID().toString());
+        definition.setIsolationLevel(TransactionDefinition.ISOLATION_READ_COMMITTED);
+        definition.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = null;
+        try {
+            status = transactionManager.getTransaction(definition);
+            entityManager.persist(created);
+
+            entityManager.flush();
+            transactionManager.commit(status);
+        } catch (Exception ex) {
+            if (status != null)
+                transactionManager.rollback(status);
+            throw ex;
+        }
+
+        DescriptionTemplateTypeQuery query = applicationContext.getBean(DescriptionTemplateTypeQuery.class);
+        return builderFactory
+                .builder(DescriptionTemplateTypeBuilder.class)
+                .build(null, query.ids(created.getId()).first());
+    }
+
+    public DescriptionTemplateType update(DescriptionTemplateType payload) {
+        DescriptionTemplateTypeEntity entity = entityManager.find(DescriptionTemplateTypeEntity.class, payload.getId());
+        entity.setName(payload.getName());
+        entity.setStatus(payload.getStatus());
+        entityManager.merge(entity);
+        entityManager.flush();
+        return builderFactory.builder(DescriptionTemplateTypeBuilder.class).build(null, entity);
+    }
+
+    public boolean delete (UUID id) {
+        DescriptionTemplateTypeEntity entity = entityManager.find(DescriptionTemplateTypeEntity.class, id);
+        if (entity == null) return false;
+        entity.setStatus(DescriptionTemplateTypeStatus.DELETED.getValue());
+        entityManager.merge(entity);
+        entityManager.flush();
+        return true;
+    }
+
+}

dmp-backend/data/pom.xml

@@ -15,6 +15,13 @@
     </parent>
 
     <dependencies>
+
+        <dependency>
+            <groupId>eu.eudat</groupId>
+            <artifactId>core</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>dmp-backend</groupId>
             <artifactId>queryable</artifactId>

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

@@ -4,8 +4,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.format.datetime.DateFormatter;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.Converter;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

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

@@ -8,9 +8,9 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceContext;
+import jakarta.persistence.PersistenceContext;
 
 
 @Repository("databaseCtx")

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

@@ -7,7 +7,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.Set;
 
 

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

@@ -10,13 +10,13 @@ import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 import eu.eudat.types.grant.GrantStateType;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.JoinType;
+import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.transaction.Transactional;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -26,41 +26,41 @@ import java.util.concurrent.CompletableFuture;
 @Component("dMPDao")
 public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
 
-	@Autowired
+    @Autowired
-	public DMPDaoImpl(DatabaseService<DMP> databaseService) {
+    public DMPDaoImpl(DatabaseService<DMP> databaseService) {
-		super(databaseService);
+        super(databaseService);
-	}
+    }
 
-	@Override
+    @Override
-	public QueryableList<DMP> getWithCriteria(DataManagementPlanCriteria criteria) {
+    public QueryableList<DMP> getWithCriteria(DataManagementPlanCriteria criteria) {
-		QueryableList<DMP> query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class);
+        QueryableList<DMP> query = getDatabaseService().getQueryable(DMP.getHints(), DMP.class);
-		if (criteria.getLike() != null && !criteria.getLike().isEmpty())
+        if (criteria.getLike() != null && !criteria.getLike().isEmpty())
-			query.where((builder, root) -> builder.or(
+            query.where((builder, root) -> builder.or(
-					builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"),
+                    builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"),
-					builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%")));
+                    builder.like(builder.upper(root.get("description")), "%" + criteria.getLike().toUpperCase() + "%")));
-		if (criteria.getPeriodEnd() != null)
+        if (criteria.getPeriodEnd() != null)
-			query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd()));
+            query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd()));
-		if (criteria.getPeriodStart() != null)
+        if (criteria.getPeriodStart() != null)
-			query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart()));
+            query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart()));
-		if (criteria.getGrants() != null && !criteria.getGrants().isEmpty())
+        if (criteria.getGrants() != null && !criteria.getGrants().isEmpty())
-			query.where(((builder, root) -> root.get("grant").in(criteria.getGrants())));
+            query.where(((builder, root) -> root.get("grant").in(criteria.getGrants())));
-		if (!criteria.getAllVersions())
+        if (!criteria.getAllVersions())
-			query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"),
+            query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"),
-					query.<String>subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.and(
+                    query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.and(
-							builder1.equal(externalRoot.get("groupId"), nestedRoot.get("groupId")),
+                            builder1.equal(externalRoot.get("groupId"), nestedRoot.get("groupId")),
-							builder1.notEqual(nestedRoot.get("status"), DMP.DMPStatus.DELETED.getValue())), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class)));
+                            builder1.notEqual(nestedRoot.get("status"), DMP.DMPStatus.DELETED.getValue())), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), Integer.class)));
-		if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
+        if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
-			query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
+            query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
-		if (criteria.getStatus() != null) {
+        if (criteria.getStatus() != null) {
-			if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) {
+            if (criteria.getStatus() == DMP.DMPStatus.FINALISED.getValue()) {
-				query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()));
+                query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.FINALISED.getValue()));
-			} else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) {
+            } else if (criteria.getStatus() == DMP.DMPStatus.ACTIVE.getValue()) {
-				query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue()));
+                query.where((builder, root) -> builder.equal(root.get("status"), DMP.DMPStatus.ACTIVE.getValue()));
-			}
+            }
-		}
+        }
-		if (criteria.getIsPublic()) {
+        if (criteria.getIsPublic()) {
-			query.where(((builder, root) -> builder.equal(root.get("isPublic"), criteria.getIsPublic())));
+            query.where(((builder, root) -> builder.equal(root.get("isPublic"), criteria.getIsPublic())));
-		}
+        }
         /*if (criteria.getRole() != null) {
             if (criteria.getRole().equals(UserDMP.UserDMPRoles.OWNER.getValue())) {
                 query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.OWNER.getValue()));
@@ -68,82 +68,82 @@ public class DMPDaoImpl extends DatabaseAccess<DMP> implements DMPDao {
                 query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).get("role"), UserDMP.UserDMPRoles.USER.getValue()));
             }
         }*/
-		if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) {
+        if (criteria.getOrganisations() != null && !criteria.getOrganisations().isEmpty()) {
-			query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations()));
+            query.where((builder, root) -> root.join("organisations").get("reference").in(criteria.getOrganisations()));
-		}
+        }
-		if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) {
+        if (criteria.getCollaborators() != null && !criteria.getCollaborators().isEmpty()) {
-			query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators()));
+            query.where((builder, root) -> root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id").in(criteria.getCollaborators()));
-		}
+        }
-		if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) {
+        if (criteria.getDatasetTemplates() != null && !criteria.getDatasetTemplates().isEmpty()) {
-			query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()));
+            query.where((builder, root) -> root.join("associatedDmps", JoinType.LEFT).get("id").in(criteria.getDatasetTemplates()));
-		}
+        }
-		if (criteria.getGrantStatus() != null) {
+        if (criteria.getGrantStatus() != null) {
-			if (criteria.getGrantStatus().equals(GrantStateType.FINISHED.getValue().shortValue()))
+            if (criteria.getGrantStatus().equals(GrantStateType.FINISHED.getValue().shortValue()))
-				query.where((builder, root) -> builder.lessThan(root.get("grant").get("enddate"), new Date()));
+                query.where((builder, root) -> builder.lessThan(root.get("grant").get("enddate"), new Date()));
-			if (criteria.getGrantStatus().equals(GrantStateType.ONGOING.getValue().shortValue()))
+            if (criteria.getGrantStatus().equals(GrantStateType.ONGOING.getValue().shortValue()))
-				query.where((builder, root) ->
+                query.where((builder, root) ->
-						builder.or(builder.greaterThan(root.get("grant").get("enddate"), new Date())
+                        builder.or(builder.greaterThan(root.get("grant").get("enddate"), new Date())
-								, builder.isNull(root.get("grant").get("enddate"))));
+                                , builder.isNull(root.get("grant").get("enddate"))));
-		}
+        }
 
-		if (criteria.hasDoi()) {
+        if (criteria.hasDoi()) {
-			query.where((builder, root) -> builder.not(builder.isNull(root.join("dois").get("id"))));
+            query.where((builder, root) -> builder.not(builder.isNull(root.join("dois").get("id"))));
-		}
+        }
-		query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue()));
+        query.where((builder, root) -> builder.notEqual(root.get("status"), DMP.DMPStatus.DELETED.getValue()));
-		return query;
+        return query;
-	}
+    }
 
-	public QueryableList<DMP> getAuthenticated(QueryableList<DMP> query, UUID principal, List<Integer> roles) {
+    public QueryableList<DMP> getAuthenticated(QueryableList<DMP> query, UUID principal, List<Integer> roles) {
-		if (roles != null && !roles.isEmpty()) {
+        if (roles != null && !roles.isEmpty()) {
-			query.where((builder, root) -> {
+            query.where((builder, root) -> {
-				Join userJoin = root.join("users", JoinType.LEFT);
+                Join userJoin = root.join("users", JoinType.LEFT);
-				return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal), userJoin.get("role").in(roles));
+                return builder.and(builder.equal(userJoin.join("user", JoinType.LEFT).get("id"), principal), userJoin.get("role").in(roles));
-			});
+            });
-		} else {
+        } else {
-			query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal));
+            query.where((builder, root) -> builder.equal(root.join("users", JoinType.LEFT).join("user", JoinType.LEFT).get("id"), principal));
-		}
+        }
 
-		return query;
+        return query;
-	}
+    }
 
-	@Override
+    @Override
-	@Transactional
+    @Transactional
-	public DMP createOrUpdate(DMP item) {
+    public DMP createOrUpdate(DMP item) {
-		return this.getDatabaseService().createOrUpdate(item, DMP.class);
+        return this.getDatabaseService().createOrUpdate(item, DMP.class);
-	}
+    }
 
-	@Override
+    @Override
-	public DMP find(UUID id) {
+    public DMP find(UUID id) {
-		return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle();
+        return getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.equal((root.get("id")), id)).getSingle();
-	}
+    }
 
-	@Override
+    @Override
-	public QueryableList<DMP> getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) {
+    public QueryableList<DMP> getUserDmps(DatasetWizardUserDmpCriteria datasetWizardUserDmpCriteria, UserInfo userInfo) {
-		QueryableList<DMP> query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users"))));
+        QueryableList<DMP> query = getDatabaseService().getQueryable(DMP.class).where((builder, root) -> builder.or(builder.equal(root.get("creator"), userInfo), builder.isMember(userInfo, root.get("users"))));
-		if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) {
+        if (datasetWizardUserDmpCriteria.getLike() != null && !datasetWizardUserDmpCriteria.getLike().isEmpty()) {
-			query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%"));
+            query.where((builder, root) -> builder.like(root.get("label"), "%" + datasetWizardUserDmpCriteria.getLike() + "%"));
-		}
+        }
-		return query;
+        return query;
-	}
+    }
 
-	@Override
+    @Override
-	public void delete(DMP item) {
+    public void delete(DMP item) {
-		this.getDatabaseService().delete(item);
+        this.getDatabaseService().delete(item);
-	}
+    }
 
-	@Override
+    @Override
-	public QueryableList<DMP> asQueryable() {
+    public QueryableList<DMP> asQueryable() {
-		return this.getDatabaseService().getQueryable(DMP.class);
+        return this.getDatabaseService().getQueryable(DMP.class);
-	}
+    }
 
-	@Async
+    @Async
-	@Override
+    @Override
-	public CompletableFuture<DMP> createOrUpdateAsync(DMP item) {
+    public CompletableFuture<DMP> createOrUpdateAsync(DMP item) {
-		return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
+        return CompletableFuture.supplyAsync(() -> this.createOrUpdate(item));
-	}
+    }
 
-	@Override
+    @Override
-	public DMP find(UUID id, String hint) {
+    public DMP find(UUID id, String hint) {
-		throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException();
-	}
+    }
 }

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

@@ -15,8 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.criteria.Join;
+import jakarta.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -52,7 +52,7 @@ public class DatasetDaoImpl extends DatabaseAccess<Dataset> implements DatasetDa
         if (criteria.getPeriodStart() != null)
             query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart()));
         if (!criteria.getAllVersions())
-            query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("dmp").get("version"), query.<String>subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.and(builder1.equal(externalRoot.get("dmp").get("groupId"), nestedRoot.get("dmp").get("groupId")), builder1.notEqual(nestedRoot.get("dmp").get("status"), DMP.DMPStatus.DELETED.getValue())), Arrays.asList(new SelectionField(FieldSelectionType.COMPOSITE_FIELD, "dmp:version")), String.class)));
+            query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("dmp").get("version"), query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.and(builder1.equal(externalRoot.get("dmp").get("groupId"), nestedRoot.get("dmp").get("groupId")), builder1.notEqual(nestedRoot.get("dmp").get("status"), DMP.DMPStatus.DELETED.getValue())), Arrays.asList(new SelectionField(FieldSelectionType.COMPOSITE_FIELD, "dmp:version")), Integer.class)));
         if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
             query.where((builder, root) -> root.get("dmp").get("groupId").in(criteria.getGroupIds()));
         if (criteria.getDmpIds() != null && !criteria.getDmpIds().isEmpty())

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

@@ -12,8 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.criteria.Join;
+import jakarta.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -35,8 +35,8 @@ public class DatasetProfileDaoImpl extends DatabaseAccess<DescriptionTemplate> i
             query.where((builder, root) -> builder.like(builder.upper(root.get("label")), "%" + criteria.getLike().toUpperCase() + "%"));
         if (!criteria.getAllVersions())
             query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("version"),
-                    query.<String>subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"),
+                    query.subQueryMax((builder1, externalRoot, nestedRoot) -> builder1.equal(externalRoot.get("groupId"),
-                            nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), String.class)));
+                            nestedRoot.get("groupId")), Arrays.asList(new SelectionField(FieldSelectionType.FIELD, "version")), Integer.class)));
         if (criteria.getGroupIds() != null && !criteria.getGroupIds().isEmpty())
             query.where((builder, root) -> root.get("groupId").in(criteria.getGroupIds()));
         if (criteria.getFilter() != null && criteria.getUserId() != null) {

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

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 

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

@@ -13,7 +13,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import schemasMicrosoftComOfficeOffice.LeftDocument;
 
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 import java.util.Date;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;

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

@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 

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

@@ -8,7 +8,7 @@ import eu.eudat.data.entities.UserInfo;
 import eu.eudat.queryable.QueryableList;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

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

@@ -5,7 +5,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

@@ -3,7 +3,7 @@ package eu.eudat.data.entities;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -3,7 +3,7 @@ package eu.eudat.data.entities;
 
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.UUID;
 

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

@@ -7,7 +7,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -59,7 +59,7 @@ public class DMPProfile implements DataEntity<DMPProfile, UUID> {
     @Column(name = "\"Label\"")
     private String label;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
     private String definition;
 

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

@@ -4,7 +4,7 @@ package eu.eudat.data.entities;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.UUID;
 
 
@@ -18,11 +18,9 @@ public class DMPResearcher {
     @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
     private UUID id;
 
-    @Type(type = "org.hibernate.type.PostgresUUIDType")
     @Column(name = "\"DMP\"")
     private UUID dmp;
 
-    @Type(type = "org.hibernate.type.PostgresUUIDType")
     @Column(name = "\"Researcher\"")
     private UUID researcher;
 

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

@@ -5,7 +5,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +32,7 @@ public class DataRepository implements Serializable, DataEntity<DataRepository,
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml")
 	private String definition;
 

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

@@ -7,7 +7,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -106,7 +106,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Properties\"", columnDefinition = "xml")
 	private String properties;
 
@@ -115,7 +115,7 @@ public class Dataset implements DataEntity<Dataset, UUID> {
 	@JoinColumn(name = "\"Profile\"")
 	private DescriptionTemplate profile;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Reference\"", columnDefinition = "xml")
 	private String reference;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -4,7 +4,7 @@ package eu.eudat.data.entities;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.UUID;
 
@@ -23,7 +23,7 @@ public class DatasetProfileRuleset {
     @Column(name = "\"Label\"")
     private String label;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false)
     private String definition;
 

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

@@ -4,7 +4,7 @@ package eu.eudat.data.entities;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.UUID;
 
 
@@ -23,7 +23,7 @@ public class DatasetProfileViewstyle {
     @Column(name = "\"Label\"")
     private String label;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false)
     private String definition;
 

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

@@ -4,7 +4,7 @@ package eu.eudat.data.entities;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.UUID;
 
@@ -19,12 +19,11 @@ public class DatasetRegistry {
     @Column(name = "\"ID\"", updatable = false, nullable = false, columnDefinition = "BINARY(16)")
     private UUID id;
 
-
+    //DEPWARN dependency to Hibernate and PostgreSQL
-    @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
     @Column(name = "\"Dataset\"", nullable = false)
     private UUID dataset;
 
-    @Type(type = "org.hibernate.type.PostgresUUIDType") //DEPWARN dependency to Hibernate and PostgreSQL
+     //DEPWARN dependency to Hibernate and PostgreSQL
     @Column(name = "\"Registry\"", nullable = false)
     private UUID registry;
 

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

@@ -4,7 +4,7 @@ package eu.eudat.data.entities;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -6,7 +6,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -55,7 +55,7 @@ public class DescriptionTemplate implements DataEntity<DescriptionTemplate,UUID>
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "profile")
     private Set<Dataset> dataset;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false)
     private String definition;
 

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

@@ -3,7 +3,7 @@ package eu.eudat.data.entities;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

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

@@ -5,7 +5,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -24,7 +24,6 @@ public class EntityDoi implements DataEntity<EntityDoi, UUID> {
     private UUID id;
 
     @Enumerated(EnumType.STRING)
-    @Type(type = "eu.eudat.configurations.typedefinition.PostgreSQLEnumType")
     @Column(name = "\"EntityType\"", nullable = false)
     private EntityType entityType;
 

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

@@ -5,7 +5,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;

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

@@ -5,7 +5,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -32,7 +32,6 @@ public class FileUpload implements DataEntity<FileUpload, UUID> {
     private UUID entityId;
 
     @Enumerated(EnumType.STRING)
-    @Type(type = "eu.eudat.configurations.typedefinition.PostgreSQLEnumType")
     @Column(name = "\"EntityType\"", nullable = false)
     private EntityType entityType;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -74,11 +74,11 @@ public class Funder implements DataEntity<Funder, UUID> {
 	@Column(name = "\"Label\"")
 	private String label;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true)
 	private String reference;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
 	private String definition;
 

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

@@ -7,7 +7,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -102,7 +102,7 @@ public class Grant implements DataEntity<Grant, UUID> {
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
 	private String definition;
 

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

@@ -5,7 +5,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 
@@ -37,7 +37,7 @@ public class Invitation implements DataEntity<Invitation, UUID> {
 	@Column(name = "\"AcceptedInvitation\"", nullable = false)
 	private boolean acceptedInvitation;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Properties\"", columnDefinition = "xml", nullable = true)
 	private String properties;
 

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

@@ -5,7 +5,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

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

@@ -7,7 +7,7 @@ import eu.eudat.data.enumeration.notification.NotifyState;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

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

@@ -6,7 +6,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -35,14 +35,14 @@ public class Organisation implements Serializable, DataEntity<Organisation,UUID>
     @Column(name = "\"Abbreviation\"")
     private String abbreviation;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true)
     private String reference;
 
     @Column(name = "\"Uri\"")
     private String uri;
 
-    @Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+    @Type(eu.eudat.configurations.typedefinition.XMLType.class)
     @Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
     private String definition;
 

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

@@ -6,7 +6,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -87,7 +87,7 @@ public class Project implements DataEntity<Project, UUID> {
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
 	private String definition;
 

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

@@ -6,7 +6,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -33,7 +33,7 @@ public class Registry implements DataEntity<Registry, UUID> {
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
 	private String definition;
 

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

@@ -7,7 +7,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -33,11 +33,11 @@ public class Researcher implements DataEntity<Researcher, UUID> {
 	@Column(name = "\"PrimaryEmail\"")
 	private String primaryEmail;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = true)
 	private String definition;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Reference\"", columnDefinition = "xml", nullable = true)
 	private String reference;
 

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

@@ -5,7 +5,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
@@ -32,7 +32,7 @@ public class Service implements DataEntity<Service, UUID> {
 	@Column(name = "\"Uri\"")
 	private String uri;
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "\"Definition\"", columnDefinition = "xml", nullable = false)
 	private String definition;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -6,7 +6,7 @@ import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.*;
 
 
@@ -55,7 +55,7 @@ public class UserInfo implements DataEntity<UserInfo, UUID> {
 	private Date lastloggedin = null;
 
 
-	@Type(type = "eu.eudat.configurations.typedefinition.XMLType")
+	@Type(eu.eudat.configurations.typedefinition.XMLType.class)
 	@Column(name = "additionalinfo", nullable = true)
 	private String additionalinfo;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import org.hibernate.annotations.GenericGenerator;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.List;
 import java.util.UUID;
 

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

@@ -4,7 +4,7 @@ import eu.eudat.data.converters.DateToUTCConverter;
 import eu.eudat.data.entities.helpers.EntityBinder;
 import eu.eudat.queryable.queryableentity.DataEntity;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

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

@@ -1,6 +1,6 @@
 package eu.eudat.data.entities.helpers;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 public class EntityBinder {

dmp-backend/data/src/main/java/eu/eudat/query/DMPQuery.java

@@ -9,7 +9,7 @@ import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

dmp-backend/data/src/main/java/eu/eudat/query/DatasetQuery.java

@@ -7,7 +7,7 @@ import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;

dmp-backend/data/src/main/java/eu/eudat/query/GrantQuery.java

@@ -7,7 +7,7 @@ import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

dmp-backend/data/src/main/java/eu/eudat/query/LockQuery.java

@@ -7,7 +7,7 @@ import eu.eudat.queryable.QueryableList;
 import eu.eudat.queryable.types.FieldSelectionType;
 import eu.eudat.queryable.types.SelectionField;
 
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

dmp-backend/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.2</version>
+        <version>3.1.2</version>
     </parent>
 
     <modules>
@@ -18,36 +18,24 @@
         <module>web</module>
         <module>data</module>
         <module>elastic</module>
+        <module>core</module>
     </modules>
 
     <properties>
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>
         <project.version>0.2.0</project.version>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
 
         <dmp-backend-commons.version>0.0.1-SNAPSHOT</dmp-backend-commons.version>
-        <org.springframework.version>5.3.8</org.springframework.version>
-        <!-- 		<org.springframeweu.eudat.logic.securityrity.version>3.2.10.RELEASE</org.springframeweu.eudat.logic.securityrity.version> -->
-        <org.springframework.security.version>5.3.10.RELEASE</org.springframework.security.version>
-        <!--<com.sun.jersey.version>1.19.1</com.sun.jersey.version>-->
-<!--
-        <org.apache.tomcat.tomcat-jdbc.version>7.0.35</org.apache.tomcat.tomcat-jdbc.version>
--->
-        <!--<com.fasterxml.jackson>2.9.0</com.fasterxml.jackson>-->
-
-        <hibernate.version>5.5.3.Final</hibernate.version>
 
         <commons-codec.version>1.9</commons-codec.version>
         <org.junit.version>4.11</org.junit.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.15.0</log4j2.version>
-        <slf4j.version>1.7.15</slf4j.version>
+
-        <!--<jetty.version>11.0.5
+        <maven.compiler.source>17</maven.compiler.source>
-        </jetty.version>--> <!-- Adapt this to a version found on http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-maven-plugin/ -->
+        <maven.compiler.target>17</maven.compiler.target>
-        <logback.version>1.2.3</logback.version>
-       <!-- <javax.inject.version>1</javax.inject.version>-->
-        <!--<javax.servlet.servlet-api.version>3.0.1</javax.servlet.servlet-api.version>-->
     </properties>
 
     <dependencies>
@@ -55,12 +43,11 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20160810</version>
+            <version>20230227</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-support</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -89,15 +76,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient</artifactId>
+            <artifactId>httpclient5</artifactId>
-            <version>4.5.12</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore-nio</artifactId>
-            <version>4.4.13</version>
         </dependency>
 
         <dependency>
@@ -112,22 +97,20 @@
             <version>7.6.0</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-c3p0</artifactId>
-            <version>${hibernate.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.api-client/google-api-client -->
         <dependency>
             <groupId>com.google.api-client</groupId>
             <artifactId>google-api-client</artifactId>
-            <version>1.23.0</version>
+            <version>1.35.2</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.jayway.jsonpath/json-path -->
         <dependency>
@@ -141,7 +124,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.12.3</version>
         </dependency>
 
 
@@ -149,13 +131,16 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.3</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackeu.eudat.corecore/jackson-databind -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
         </dependency>
 
         <!-- g/a spring -->
@@ -173,13 +158,13 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.1.1</version>
+            <version>4.1.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.1.1</version>
+            <version>4.1.2</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/fop -->
@@ -192,7 +177,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.14.3</version>
+            <version>1.15.3</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/fr.opensagres.xdocreport/org.apache.poi.xwpf.converter.pdf -->
         <dependency>
@@ -210,7 +195,7 @@
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>fr.opensagres.xdocreport.itext.extension</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.4</version>
         </dependency>
 
         <dependency>
@@ -236,7 +221,7 @@
             <version>2.8.2</version>
         </dependency>-->
 
-        <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+        <!-- https://mvnrepository.com/artifact/jakarta.xml.bind/jaxb-api -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -247,62 +232,66 @@
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>2.3.0</version>
+            <version>4.0.3</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime -->
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
-            <version>2.3.1</version>
+            <version>4.0.3</version>
         </dependency>
 
 
-        <!-- https://mvnrepository.com/artifact/javax.annotation/javax.annotation-api -->
+        <!-- https://mvnrepository.com/artifact/jakarta.annotation/jakarta.annotation-api -->
         <dependency>
-            <groupId>javax.annotation</groupId>
+            <groupId>jakarta.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.1</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
+        <!-- https://mvnrepository.com/artifact/jakarta.validation/validation-api -->
         <dependency>
-            <groupId>javax.validation</groupId>
+            <groupId>jakarta.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <artifactId>jakarta.validation-api</artifactId>
-            <version>2.0.1.Final</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.1.0</version>
         </dependency>
 
 
-        <!-- The client -->
+<!--        &lt;!&ndash; The client &ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>io.prometheus</groupId>
+<!--            <groupId>io.prometheus</groupId>-->
-            <artifactId>simpleclient</artifactId>
+<!--            <artifactId>simpleclient</artifactId>-->
-            <version>0.11.0</version>
+<!--            <version>0.11.0</version>-->
-        </dependency>
+<!--        </dependency>-->
-        <!-- Hotspot JVM metrics-->
+<!--        &lt;!&ndash; Hotspot JVM metrics&ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>io.prometheus</groupId>
+<!--            <groupId>io.prometheus</groupId>-->
-            <artifactId>simpleclient_hotspot</artifactId>
+<!--            <artifactId>simpleclient_hotspot</artifactId>-->
-            <version>0.11.0</version>
+<!--            <version>0.11.0</version>-->
-        </dependency>
+<!--        </dependency>-->
-        <!-- Exposition HTTPServer-->
+<!--        &lt;!&ndash; Exposition HTTPServer&ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>io.prometheus</groupId>
+<!--            <groupId>io.prometheus</groupId>-->
-            <artifactId>simpleclient_httpserver</artifactId>
+<!--            <artifactId>simpleclient_httpserver</artifactId>-->
-            <version>0.11.0</version>
+<!--            <version>0.11.0</version>-->
-        </dependency>
+<!--        </dependency>-->
-        <!-- Pushgateway exposition-->
+<!--        &lt;!&ndash; Pushgateway exposition&ndash;&gt;-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>io.prometheus</groupId>
+<!--            <groupId>io.prometheus</groupId>-->
-            <artifactId>simpleclient_pushgateway</artifactId>
+<!--            <artifactId>simpleclient_pushgateway</artifactId>-->
-            <version>0.11.0</version>
+<!--            <version>0.11.0</version>-->
-        </dependency>
+<!--        </dependency>-->
 
         <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>1.7.1</version>
+            <version>1.11.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -314,8 +303,19 @@
             <artifactId>micrometer-core</artifactId>
         </dependency>
 
-    </dependencies>
+        <!--CITE DEPENDENCIES-->
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>data-tools</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>gr.cite</groupId>
+            <artifactId>exceptions</artifactId>
+            <version>2.1.0</version>
+        </dependency>
 
+    </dependencies>
 
     <profiles>
         <profile>
@@ -327,18 +327,17 @@
                 <packaging.type>jar</packaging.type>
             </properties>
         </profile>
-        <profile>
+<!--        <profile>-->
-            <id>intellij-properties-launcher</id>
+<!--            <id>intellij-properties-launcher</id>-->
 
-            <dependencies>
+<!--            <dependencies>-->
-                <dependency>
+<!--                <dependency>-->
-                    <groupId>org.springframework.boot</groupId>
+<!--                    <groupId>org.springframework.boot</groupId>-->
-                    <artifactId>spring-boot-loader</artifactId>
+<!--                    <artifactId>spring-boot-loader</artifactId>-->
-                    <version>2.5.2</version>
+<!--                </dependency>-->
-                </dependency>
+<!--            </dependencies>-->
-            </dependencies>
 
-        </profile>
+<!--        </profile>-->
         <profile>
             <id>production</id>
             <properties>

dmp-backend/queryable/src/main/java/eu/eudat/queryable/QueryableList.java

@@ -4,9 +4,9 @@ import eu.eudat.queryable.jpa.predicates.*;
 import eu.eudat.queryable.queryableentity.DataEntity;
 import eu.eudat.queryable.types.SelectionField;
 
-import javax.persistence.criteria.Join;
+import jakarta.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
+import jakarta.persistence.criteria.JoinType;
-import javax.persistence.criteria.Subquery;
+import jakarta.persistence.criteria.Subquery;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;

dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/Collector.java

@@ -2,7 +2,7 @@ package eu.eudat.queryable.collector;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;

dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/ProjectionField.java

@@ -2,7 +2,7 @@ package eu.eudat.queryable.collector;
 
 import com.google.common.collect.Lists;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.*;
 import java.util.stream.Collectors;
 

dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/predicates/EntitySelectPredicate.java

@@ -1,7 +1,7 @@
 package eu.eudat.queryable.jpa.predicates;
 
-import javax.persistence.criteria.Path;
+import jakarta.persistence.criteria.Path;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 import java.util.function.Predicate;
 
 /**

dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/predicates/GroupByPredicate.java

@@ -1,8 +1,8 @@
 package eu.eudat.queryable.jpa.predicates;
 
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Expression;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 public interface GroupByPredicate<T> {
     Expression<T> applyPredicate(CriteriaBuilder builder, Root<T> root);

dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/predicates/NestedQuerySinglePredicate.java

@@ -1,8 +1,8 @@
 package eu.eudat.queryable.jpa.predicates;
 
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 /**
  * Created by ikalyvas on 2/7/2018.

dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/predicates/OrderByPredicate.java

@@ -1,8 +1,8 @@
 package eu.eudat.queryable.jpa.predicates;
 
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Order;
+import jakarta.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 public interface OrderByPredicate<T> {
     Order applyPredicate(CriteriaBuilder builder, Root<T> root);

dmp-backend/queryable/src/main/java/eu/eudat/queryable/jpa/predicates/SinglePredicate.java

@@ -1,8 +1,8 @@
 package eu.eudat.queryable.jpa.predicates;
 
-import javax.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.Root;
 
 public interface SinglePredicate<T> {
     Predicate applyPredicate(CriteriaBuilder builder, Root<T> root);

dmp-backend/queryable/src/main/java/eu/eudat/queryable/queryableentity/DataEntity.java

@@ -1,6 +1,6 @@
 package eu.eudat.queryable.queryableentity;
 
-import javax.persistence.Tuple;
+import jakarta.persistence.Tuple;
 import java.util.List;
 
 public interface DataEntity<T, K> {

dmp-backend/web/pom.xml

@@ -16,6 +16,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>eu.eudat</groupId>
+            <artifactId>core</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>eu.eudat</groupId>
             <artifactId>data</artifactId>
@@ -53,7 +58,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.12.3</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.springframework/spring-context -->
@@ -215,8 +219,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
+                    <source>17</source>
-                    <target>1.8</target>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -262,5 +266,7 @@
     <properties>
         <start-class>eu.eudat.EuDatApplication</start-class>
         <opensaml.version>4.0.1</opensaml.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 </project>

dmp-backend/web/src/main/java/eu/eudat/EuDatApplication.java

@@ -1,17 +1,14 @@
 package eu.eudat;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-@SpringBootApplication(scanBasePackages = {"eu.eudat", "eu.eudat.depositinterface"})
+@SpringBootApplication(scanBasePackages = {"eu.eudat", "eu.eudat.depositinterface", "gr.cite"})
 @EnableAsync
 public class EuDatApplication extends SpringBootServletInitializer {
-    private static final Logger logger = LoggerFactory.getLogger(EuDatApplication.class);
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {

dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java

@@ -15,7 +15,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 
@@ -66,8 +66,8 @@ public class DevelDatabaseConfiguration {
 
     private Properties additionalProperties() {
         Properties properties = new Properties();
-        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect");
+        properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
-        properties.setProperty("hibernate.show_sql", "true");
+        properties.setProperty("hibernate.show_sql", "false");
         properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
         return properties;
     }

dmp-backend/web/src/main/java/eu/eudat/configurations/ProductionDatabaseConfiguration.java

@@ -15,7 +15,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.Properties;
 

dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java

@@ -10,14 +10,14 @@ import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.List;
 
 @EnableAsync
 @Configuration
 @EnableScheduling
-public class WebMVCConfiguration extends WebMvcConfigurerAdapter {
+public class WebMVCConfiguration implements WebMvcConfigurer {
 
 	private ApiContext apiContext;
 

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationDevelImpl.java

@@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/DynamicFunderConfigurationProdImpl.java

@@ -10,8 +10,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/entities/Configuration.java

@@ -1,8 +1,8 @@
 package eu.eudat.configurations.dynamicfunder.entities;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.List;
 
 @XmlRootElement

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/entities/Dependency.java

@@ -1,6 +1,6 @@
 package eu.eudat.configurations.dynamicfunder.entities;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 
 public class Dependency {
     private String id;

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/entities/Language.java

@@ -1,6 +1,6 @@
 package eu.eudat.configurations.dynamicfunder.entities;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
 
 public class Language {
     private String key;

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/entities/MainProperty.java

@@ -2,8 +2,8 @@ package eu.eudat.configurations.dynamicfunder.entities;
 
 import eu.eudat.logic.proxy.config.UrlConfiguration;
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
 import java.util.List;
 
 public class MainProperty {

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicfunder/entities/Property.java

@@ -1,8 +1,8 @@
 package eu.eudat.configurations.dynamicfunder.entities;
 
 
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
 import java.util.List;
 
 public class Property {

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationDevelImpl.java

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

dmp-backend/web/src/main/java/eu/eudat/configurations/dynamicgrant/DynamicGrantConfigurationProdImpl.java

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;