diff --git a/apps/dnet-is-application/src/main/resources/application.properties b/apps/dnet-is-application/src/main/resources/application.properties index f56fd65d..a2a29b36 100644 --- a/apps/dnet-is-application/src/main/resources/application.properties +++ b/apps/dnet-is-application/src/main/resources/application.properties @@ -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 = diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java index aaf488da..ff71cda7 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStore.java @@ -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 params = new LinkedHashMap<>(); @Column(name = "creation_date") - @Temporal(TemporalType.TIMESTAMP) private LocalDateTime creationDate; @Override diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java index 4ba17ffa..29e958d5 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreVersion.java @@ -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") diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java index b95133f1..ff570971 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/data/mdstore/model/MDStoreWithInfo.java @@ -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") diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/is/model/resource/SimpleResource.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/is/model/resource/SimpleResource.java index a2ec6c79..b585512f 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/is/model/resource/SimpleResource.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/is/model/resource/SimpleResource.java @@ -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; diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java index 4863e27d..4bafb574 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WfProcessExecution.java @@ -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; diff --git a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowInstance.java b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowInstance.java index a0ddca0a..53d5afd1 100644 --- a/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowInstance.java +++ b/libs/dnet-is-common/src/main/java/eu/dnetlib/manager/wf/model/WorkflowInstance.java @@ -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 systemParams = new LinkedHashMap<>(); - @Column(name = "user_params") + @Type(type = "jsonb") + @Column(name = "user_params", columnDefinition = "jsonb") private Map userParams = new LinkedHashMap<>(); public String getId() { diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java index c5396b69..4a0afec7 100644 --- a/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java +++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/notifications/mail/EmailDispatcher.java @@ -33,23 +33,23 @@ public class EmailDispatcher { private static final Log log = LogFactory.getLog(EmailDispatcher.class); private final BlockingQueue 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