D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fix

This commit is contained in:
Michele Artini 2023-02-27 13:09:58 +01:00
parent 2b2b0cad0a
commit 01b046cfb4
8 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dnet-is-application/src/main/resources/application.properties
View File

@ -3,6 +3,8 @@ server.port=8280
server.public_url =
server.public_desc = API Base URL
dnet.configuration.infrastructure = LOCAL DEV
spring.profiles.active=dev
maven.pom.path = /META-INF/maven/eu.dnetlib.dhp/dnet-is-application/effective-pom.xml
@ -57,5 +59,12 @@ dhp.mdstore-manager.hadoop.zeppelin.login =
dhp.mdstore-manager.hadoop.zeppelin.password =
dhp.mdstore-manager.hadoop.zeppelin.name-prefix = mdstoreManager
# Email Configuration
dnet.configuration.mail.sender.email =
dnet.configuration.mail.sender.name =
dnet.configuration.mail.cc =
dnet.configuration.mail.smtp.host =
dnet.configuration.mail.smtp.port = 25
dnet.configuration.mail.smtp.user =
dnet.configuration.mail.smtp.password =

3
libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java
View File

@ -12,8 +12,6 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Type;
@ -55,7 +53,6 @@ public class MDStore implements Serializable {
private Map<String, Object> params = new LinkedHashMap<>();
@Column(name = "creation_date")
@Temporal(TemporalType.TIMESTAMP)
private LocalDateTime creationDate;
@Override

3
libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java
View File

@ -10,8 +10,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Type;
@ -36,7 +34,6 @@ public class MDStoreVersion implements Serializable {
private int readCount = 0;
@Column(name = "lastupdate")
@Temporal(TemporalType.TIMESTAMP)
private LocalDateTime lastUpdate;
@Column(name = "size")

4
libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java
View File

@ -12,8 +12,6 @@ import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Type;
@ -54,11 +52,9 @@ public class MDStoreWithInfo implements Serializable {
private String currentVersion;
@Column(name = "creation_date")
@Temporal(TemporalType.TIMESTAMP)
private LocalDateTime creationDate;
@Column(name = "lastupdate")
@Temporal(TemporalType.TIMESTAMP)
private LocalDateTime lastUpdate;
@Column(name = "size")

4
libs/dnet-is-common/src/main/java/eu/dnetlib/is/model/resource/SimpleResource.java
View File

@ -7,8 +7,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@Entity
@Table(name = "resources")
@ -29,11 +27,9 @@ public class SimpleResource implements Serializable {
@Column(name = "description")
private String description;
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "creation_date")
private LocalDateTime creationDate;
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "modification_date")
private LocalDateTime modificationDate;

4
libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java
View File

@ -8,8 +8,6 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import org.hibernate.annotations.Type;
import org.hibernate.annotations.TypeDef;
@ -44,11 +42,9 @@ public class WfProcessExecution implements Serializable {
@Column(name = "status")
private String status;
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "start_date")
private LocalDateTime startDate;
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "end_date")
private LocalDateTime endDate;

6
libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowInstance.java
View File

@ -67,10 +67,12 @@ public class WorkflowInstance implements Serializable {
@Column(name = "destroy_wf")
private String destroyWf;
@Column(name = "system_params")
@Type(type = "jsonb")
@Column(name = "system_params", columnDefinition = "jsonb")
private Map<String, String> systemParams = new LinkedHashMap<>();
@Column(name = "user_params")
@Type(type = "jsonb")
@Column(name = "user_params", columnDefinition = "jsonb")
private Map<String, String> userParams = new LinkedHashMap<>();
public String getId() {

18
libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java
View File

@ -33,23 +33,23 @@ public class EmailDispatcher {
private static final Log log = LogFactory.getLog(EmailDispatcher.class);
private final BlockingQueue<Message> queue = new LinkedBlockingQueue<>();
@Value("${'dnet.configuration.mail.sender.email'}")
@Value("${dnet.configuration.mail.sender.email}")
private String from;
@Value("${'dnet.configuration.mail.sender.name'}")
@Value("${dnet.configuration.mail.sender.name}")
private String fromName;
@Value("${'dnet.configuration.mail.cc'}")
@Value("${dnet.configuration.mail.cc}")
private String cc;
@Value("${'dnet.configuration.mail.smtp.host'}")
@Value("${dnet.configuration.mail.smtp.host}")
private String smtpHost;
@Value("${'dnet.configuration.mail.smtp.port'}")
@Value("${dnet.configuration.mail.smtp.port}")
private final int smtpPort = 587;
@Value("${'dnet.configuration.mail.smtp.user'}")
@Value("${dnet.configuration.mail.smtp.user}")
private String smtpUser;
@Value("${'dnet.configuration.mail.smtp.password'}")
@Value("${dnet.configuration.mail.smtp.password}")
private String smtpPassword;
@Value("${'dnet.configuration.baseUrl'}")
@Value("${server.public_url}")
private String baseUrl;
@Value("${'dnet.configuration.infrastructure'}")
@Value("${dnet.configuration.infrastructure}")
private String infrastructure;
@Autowired