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

This commit is contained in:
Efstratios Giannopoulos 2023-10-18 13:54:47 +03:00
commit 941f2d69cc
353 changed files with 1712 additions and 1245 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,9 +1,9 @@
package eu.eudat.data.entities;
package eu.eudat.data.old;
import eu.eudat.data.enumeration.notification.ActiveStatus;
import eu.eudat.data.enumeration.notification.ContactType;
import eu.eudat.data.enumeration.notification.NotificationType;
import eu.eudat.data.enumeration.notification.NotifyState;
import eu.eudat.commons.enums.old.notification.ActiveStatus;
import eu.eudat.commons.enums.old.notification.ContactType;
import eu.eudat.commons.enums.old.notification.NotificationType;
import eu.eudat.commons.enums.old.notification.NotifyState;
import eu.eudat.queryable.queryableentity.DataEntity;
import org.hibernate.annotations.GenericGenerator;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,9 +3,8 @@ package eu.eudat.data.dao.entities;
import eu.eudat.data.dao.DatabaseAccessLayer;
import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria;
import eu.eudat.data.entities.DMP;
import eu.eudat.data.entities.UserDMP;
import eu.eudat.data.entities.UserInfo;
import eu.eudat.data.old.DMP;
import eu.eudat.data.old.UserInfo;
import eu.eudat.queryable.QueryableList;
import java.util.List;

View File

@ -4,8 +4,8 @@ import eu.eudat.data.dao.DatabaseAccess;
import eu.eudat.data.dao.criteria.DataManagementPlanCriteria;
import eu.eudat.data.dao.criteria.DatasetWizardUserDmpCriteria;
import eu.eudat.data.dao.databaselayer.service.DatabaseService;
import eu.eudat.data.entities.DMP;
import eu.eudat.data.entities.UserInfo;
import eu.eudat.data.old.DMP;
import eu.eudat.data.old.UserInfo;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.types.FieldSelectionType;
import eu.eudat.queryable.types.SelectionField;

View File

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

View File

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

View File

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

View File

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

View File

@ -2,8 +2,8 @@ package eu.eudat.data.dao.entities;
import eu.eudat.data.dao.DatabaseAccessLayer;
import eu.eudat.data.dao.criteria.DatasetCriteria;
import eu.eudat.data.entities.Dataset;
import eu.eudat.data.entities.UserInfo;
import eu.eudat.data.old.Dataset;
import eu.eudat.data.old.UserInfo;
import eu.eudat.queryable.QueryableList;
import java.util.List;

View File

@ -3,10 +3,9 @@ package eu.eudat.data.dao.entities;
import eu.eudat.data.dao.DatabaseAccess;
import eu.eudat.data.dao.criteria.DatasetCriteria;
import eu.eudat.data.dao.databaselayer.service.DatabaseService;
import eu.eudat.data.entities.DMP;
import eu.eudat.data.entities.Dataset;
import eu.eudat.data.entities.UserDMP;
import eu.eudat.data.entities.UserInfo;
import eu.eudat.data.old.DMP;
import eu.eudat.data.old.Dataset;
import eu.eudat.data.old.UserInfo;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.types.FieldSelectionType;
import eu.eudat.queryable.types.SelectionField;

View File

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

View File

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

View File

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

View File

@ -4,7 +4,7 @@ import eu.eudat.data.DescriptionTemplateTypeEntity;
import eu.eudat.data.dao.DatabaseAccess;
import eu.eudat.data.dao.criteria.DatasetProfileCriteria;
import eu.eudat.data.dao.databaselayer.service.DatabaseService;
import eu.eudat.data.entities.DescriptionTemplate;
import eu.eudat.data.old.DescriptionTemplate;
import eu.eudat.queryable.QueryableList;
import eu.eudat.queryable.types.FieldSelectionType;
import eu.eudat.queryable.types.SelectionField;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More