imported first apps

apps/collector/src/main/java/eu/dnetlib/services/collector/CollectorApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.services.collector;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class CollectorApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(CollectorApplication.class, args);
+	}
+
+}

apps/dsm/src/main/java/eu/dnetlib/services/dsm/DsmApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.services.dsm;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class DsmApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(DsmApplication.class, args);
+	}
+
+}

apps/email/pom.xml

@@ -0,0 +1,98 @@
+<?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">
+
+	<parent>
+		<groupId>eu.dnetlib.docker</groupId>
+		<artifactId>apps</artifactId>
+		<version>7.0.0-SNAPSHOT</version>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>dnet-email</artifactId>
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-json</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.vladmihalcea</groupId>
+			<artifactId>hibernate-types-52</artifactId>
+		</dependency>
+
+		<!-- JAXB API, java.xml.bind module -->
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+
+		<!-- JAXB Runtime, com.sun.xml.bind module -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+		</dependency>
+
+		<!-- CSV -->
+		<dependency>
+			<groupId>com.opencsv</groupId>
+			<artifactId>opencsv</artifactId>
+			<version>5.4</version>
+		</dependency>
+
+		<!-- hot swapping, disable cache for template, enable live reload -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<!-- Tests -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-help-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

apps/email/src/main/java/eu/dnetlib/utils/mail/EmailConfiguration.java

@@ -0,0 +1,45 @@
+package eu.dnetlib.utils.mail;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "mail")
+public class EmailConfiguration {
+
+	private String smtpHost;
+	private int smtpPort;
+	private String smtpUser;
+	private String smtpPassword;
+
+	public String getSmtpHost() {
+		return smtpHost;
+	}
+
+	public void setSmtpHost(final String smtpHost) {
+		this.smtpHost = smtpHost;
+	}
+
+	public int getSmtpPort() {
+		return smtpPort;
+	}
+
+	public void setSmtpPort(final int smtpPort) {
+		this.smtpPort = smtpPort;
+	}
+
+	public String getSmtpUser() {
+		return smtpUser;
+	}
+
+	public void setSmtpUser(final String smtpUser) {
+		this.smtpUser = smtpUser;
+	}
+
+	public String getSmtpPassword() {
+		return smtpPassword;
+	}
+
+	public void setSmtpPassword(final String smtpPassword) {
+		this.smtpPassword = smtpPassword;
+	}
+
+}

apps/email/src/main/java/eu/dnetlib/utils/mail/EmailSenderApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.utils.mail;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class EmailSenderApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(EmailSenderApplication.class, args);
+	}
+
+}

apps/email/src/main/java/eu/dnetlib/utils/mail/EmailSenderController.java

@@ -0,0 +1,24 @@
+package eu.dnetlib.utils.mail;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import eu.dnetlib.common.controller.AbstractDnetController;
+import eu.dnetlib.common.exceptions.DnetException;
+import eu.dnetlib.data.mail.EmailMessage;
+
+@RestController("/mail")
+public class EmailSenderController extends AbstractDnetController {
+
+	@Autowired
+	private EmailService emailService;
+
+	@PostMapping("/send")
+	public String sendMail(@RequestBody final EmailMessage email) throws DnetException {
+		emailService.sendMail(email, true);
+		return "Sending mail to " + email.getTo();
+	}
+
+}

apps/email/src/main/java/eu/dnetlib/utils/mail/EmailService.java

@@ -0,0 +1,102 @@
+package eu.dnetlib.utils.mail;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Properties;
+
+import javax.mail.Authenticator;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.PasswordAuthentication;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import eu.dnetlib.common.exceptions.DnetException;
+import eu.dnetlib.common.exceptions.DnetRuntimeException;
+import eu.dnetlib.data.mail.EmailMessage;
+
+@Component
+public class EmailService {
+
+	private static final Logger log = LoggerFactory.getLogger(EmailService.class);
+
+	@Autowired
+	private EmailConfiguration conf;
+
+	public void sendMail(final EmailMessage email, final boolean async) throws DnetException {
+		try {
+			final Session session = Session.getInstance(obtainProperties(), obtainAuthenticator());
+
+			final MimeMessage mimeMessage = new MimeMessage(session);
+
+			mimeMessage.setFrom(new InternetAddress(email.getFromMail(), email.getFromName()));
+			mimeMessage.setSubject(email.getSubject());
+			mimeMessage.setContent(email.getContent(), "text/html; charset=utf-8");
+			mimeMessage.setSentDate(new Date());
+			mimeMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(email.getTo()));
+
+			if (email.getCcs() != null) {
+				for (final String cc : email.getCcs()) {
+					mimeMessage.addRecipient(Message.RecipientType.CC, new InternetAddress(cc));
+				}
+			}
+
+			if (async) {
+				final Thread t = new Thread(() -> {
+					try {
+						sendMail(mimeMessage);
+					} catch (final MessagingException e) {
+						log.error("Error sending mail", e);
+						throw new DnetRuntimeException("Error sending mail", e);
+					}
+				});
+				t.start();
+			} else {
+				sendMail(mimeMessage);
+			}
+		} catch (final Exception e) {
+			log.error("Error sending mail", e);
+			throw new DnetRuntimeException("Error sending mail", e);
+		}
+	}
+
+	public void sendMail(final MimeMessage mimeMessage) throws MessagingException {
+		log.info("Sending mail to " + Arrays.toString(mimeMessage.getAllRecipients()) + "...");
+		Transport.send(mimeMessage);
+		log.info("...sent");
+	}
+
+	private Properties obtainProperties() {
+		final Properties p = new Properties();
+		p.put("mail.transport.protocol", "smtp");
+		p.put("mail.smtp.host", conf.getSmtpHost());
+		p.put("mail.smtp.port", conf.getSmtpPort());
+		p.put("mail.smtp.auth", Boolean.toString(StringUtils.isNotBlank(conf.getSmtpUser())));
+		return p;
+	}
+
+	private Authenticator obtainAuthenticator() {
+		if (StringUtils.isBlank(conf.getSmtpUser())) { return null; }
+
+		return new Authenticator() {
+
+			private final PasswordAuthentication authentication =
+				new PasswordAuthentication(conf.getSmtpUser(), conf.getSmtpPassword());
+
+			@Override
+			protected PasswordAuthentication getPasswordAuthentication() {
+				return authentication;
+			}
+
+		};
+	}
+
+}

apps/email/src/main/resources/application.properties

@@ -0,0 +1,10 @@
+server.title       = D-NET Mail Sender API
+server.description = Simple service that sends mails 
+server.public_url = 
+
+maven.pom.path = /META-INF/maven/eu.dnetlib.docker/dnet-email/effective-pom.xml
+
+mail.smtpHost     = localhost
+mail.smtpPort     = 587
+mail.smtpUser     =
+mail.smtpPassword = 

apps/oaiExporter/src/main/java/eu/dnetlib/services/oai/OaiApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.services.oai;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class OaiApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(OaiApplication.class, args);
+	}
+
+}

apps/pom.xml

@@ -19,6 +19,7 @@
     <module>solrIndexer</module>
     <module>wfManager</module>
     <module>xsltTransformer</module>
+    <module>email</module>
   </modules>
 
   <dependencies>

apps/publicApi/src/main/java/eu/dnetlib/ui/api/PublicApiApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.ui.api;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class PublicApiApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(PublicApiApplication.class, args);
+	}
+
+}

apps/solrIndexer/src/main/java/eu/dnetlib/services/solr/SolrIndexApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.services.solr;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class SolrIndexApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(SolrIndexApplication.class, args);
+	}
+
+}

apps/wfManager/src/main/java/eu/dnetlib/services/wfs/WfManagerApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.services.wfs;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class WfManagerApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(WfManagerApplication.class, args);
+	}
+
+}

apps/xsltTransformer/src/main/java/eu/dnetlib/utils/xslt/XsltTransformerApplication.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.utils.xslt;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import eu.dnetlib.common.app.AbstractDnetApp;
+
+@SpringBootApplication
+public class XsltTransformerApplication extends AbstractDnetApp {
+
+	public static void main(final String[] args) {
+		SpringApplication.run(XsltTransformerApplication.class, args);
+	}
+
+}

libs/dnet-common/pom.xml~

@@ -1,108 +0,0 @@
-<?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">
-
-	<parent>
-		<groupId>eu.dnetlib.docker</groupId>
-		<artifactId>libs</artifactId>
-		<version>7.0.0-SNAPSHOT</version>
-	</parent>
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<artifactId>dnet-apps-common</artifactId>
-	<packaging>jar</packaging>
-
-	<name>dnet-apps-common</name>
-	<description>D-Net Apps common library</description>
-
-	<dependencies>
-	  <!--
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	-->	
-		<!-- Mail -->
-		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
-		</dependency>
-
-		<!-- for /metrics and /health controllers -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-model</artifactId>
-		</dependency>
-
-		<!-- Swagger -->
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-ui</artifactId>
-		</dependency>
-
-		<!-- for /metrics and /health controllers -->
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_spring_boot</artifactId>
-			<version>${prometheus.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-web</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_hotspot</artifactId>
-			<version>${prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_servlet</artifactId>
-			<version>${prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_spring_web</artifactId>
-			<version>0.3.0</version>
-		</dependency>
-
-		<!-- Tests -->
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-	</dependencies>
-
-</project>

libs/dnet-common/src/main/java/eu/dnetlib/common/app/AbstractDnetApp.java

@@ -0,0 +1,115 @@
+package eu.dnetlib.common.app;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springdoc.core.GroupedOpenApi;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.io.ClassPathResource;
+
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.Metrics;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.tags.Tag;
+
+public abstract class AbstractDnetApp {
+
+	private static final String DEFAULT_VERSION = "1.1";
+
+	protected static final License APACHE_2_LICENSE = new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0");
+
+	protected static final License AGPL_3_LICENSE =
+		new License().name("GNU Affero General Public License v3.0 or later").url("https://www.gnu.org/licenses/agpl-3.0.txt");
+
+	@Value("${maven.pom.path}")
+	private ClassPathResource pom;
+
+	@Value("${server.title}")
+	private String serverTitle;
+
+	@Value("${server.description}")
+	private String serverDesc;
+
+	@Value("${server.public_url}")
+	private String serverPublicUrl;
+
+	private static final Logger log = LoggerFactory.getLogger(AbstractDnetApp.class);
+
+	@PostConstruct
+	public void init() {
+		final MavenXpp3Reader reader = new MavenXpp3Reader();
+		try {
+			final Model model = reader.read(new InputStreamReader(pom.getInputStream()));
+
+			log.info(String.format("registering metric for %s", model.getArtifactId()));
+
+			final ImmutableTag tag1 = new ImmutableTag("component", model.getGroupId() + ":" + model.getArtifactId());
+			final ImmutableTag tag2 = new ImmutableTag("version", model.getVersion());
+			final ImmutableTag tag3 = new ImmutableTag("scmtag", model.getScm().getTag());
+
+			Metrics.gauge("micrometer_info", Arrays.asList(tag1, tag2, tag3), 1);
+		} catch (IOException | XmlPullParserException e) {
+			log.error("Error registering metric", e);
+		}
+	}
+
+	@Bean
+	public OpenAPI newSwaggerDocket() {
+		final List<Server> servers = new ArrayList<>();
+		if (StringUtils.isNotBlank(serverPublicUrl)) {
+			final Server server = new Server();
+			server.setUrl(serverPublicUrl);
+			server.setDescription(serverDesc);
+			servers.add(server);
+		}
+
+		return new OpenAPI()
+			.servers(servers)
+			.info(getSwaggerInfo())
+			.tags(getSwaggerTags());
+	}
+
+	@Bean
+	public GroupedOpenApi publicApi() {
+		return GroupedOpenApi.builder()
+			.group("Broker Public APIs")
+			.pathsToMatch("/**")
+			.build();
+	}
+
+	protected Info getSwaggerInfo() {
+		return new Info()
+			.title(serverTitle)
+			.description(serverDesc)
+			.version(swaggerVersion())
+			.license(swaggerLicense());
+	}
+
+	protected List<Tag> getSwaggerTags() {
+		return Arrays.asList(new Tag().name(serverTitle).description(serverDesc));
+	}
+
+	protected String swaggerVersion() {
+		return DEFAULT_VERSION;
+	}
+
+	protected License swaggerLicense() {
+		return AGPL_3_LICENSE;
+	}
+
+}

libs/dnet-common/src/main/java/eu/dnetlib/common/controller/AbstractDnetController.java

@@ -0,0 +1,45 @@
+package eu.dnetlib.common.controller;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+public abstract class AbstractDnetController {
+
+	private static final Logger log = LoggerFactory.getLogger(AbstractDnetController.class);
+
+	@ExceptionHandler(Exception.class)
+	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+	public @ResponseBody ErrorMessage handleException(final Exception e) {
+		log.error("Error processing http method", e);
+		return new ErrorMessage(e);
+	}
+
+	public class ErrorMessage {
+
+		private final String message;
+		private final String stacktrace;
+
+		public ErrorMessage(final Exception e) {
+			this(e.getMessage(), ExceptionUtils.getStackTrace(e));
+		}
+
+		public ErrorMessage(final String message, final String stacktrace) {
+			this.message = message;
+			this.stacktrace = stacktrace;
+		}
+
+		public String getMessage() {
+			return this.message;
+		}
+
+		public String getStacktrace() {
+			return this.stacktrace;
+		}
+
+	}
+}

libs/dnet-common/src/main/java/eu/dnetlib/common/exceptions/DnetException.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.common.exceptions;
+
+public class DnetException extends Exception {
+
+	private static final long serialVersionUID = 1318223089824261627L;
+
+	public DnetException(final String message, final Throwable cause) {
+		super(message, cause);
+	}
+
+	public DnetException(final String message) {
+		super(message);
+	}
+
+}

libs/dnet-common/src/main/java/eu/dnetlib/common/exceptions/DnetRuntimeException.java

@@ -0,0 +1,15 @@
+package eu.dnetlib.common.exceptions;
+
+public class DnetRuntimeException extends RuntimeException {
+
+	private static final long serialVersionUID = 5614504079402744578L;
+
+	public DnetRuntimeException(final String message, final Throwable cause) {
+		super(message, cause);
+	}
+
+	public DnetRuntimeException(final String message) {
+		super(message);
+	}
+
+}

libs/dnet-common/src/main/java/eu/dnetlib/data/mail/EmailMessage.java

@@ -0,0 +1,76 @@
+package eu.dnetlib.data.mail;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class EmailMessage implements Serializable {
+
+	private static final long serialVersionUID = 2012889148529575960L;
+
+	private String fromName;
+	private String fromMail;
+	private String to;
+	private List<String> ccs;
+	private String subject;
+	private String content;
+
+	public EmailMessage() {}
+
+	public EmailMessage(final String fromName, final String fromMail, final String to, final List<String> ccs, final String subject, final String content) {
+		this.fromName = fromName;
+		this.fromMail = fromMail;
+		this.to = to;
+		this.ccs = ccs;
+		this.subject = subject;
+		this.content = content;
+	}
+
+	public String getFromName() {
+		return fromName;
+	}
+
+	public void setFromName(final String fromName) {
+		this.fromName = fromName;
+	}
+
+	public String getFromMail() {
+		return fromMail;
+	}
+
+	public void setFromMail(final String fromMail) {
+		this.fromMail = fromMail;
+	}
+
+	public String getTo() {
+		return to;
+	}
+
+	public void setTo(final String to) {
+		this.to = to;
+	}
+
+	public List<String> getCcs() {
+		return ccs;
+	}
+
+	public void setCcs(final List<String> ccs) {
+		this.ccs = ccs;
+	}
+
+	public String getSubject() {
+		return subject;
+	}
+
+	public void setSubject(final String subject) {
+		this.subject = subject;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(final String content) {
+		this.content = content;
+	}
+
+}

pom.xml

@@ -1,312 +1,322 @@
 <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/maven-v4_0_0.xsd">
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.3</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>3.1.3</version>
+    <relativePath />
+  </parent>
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>eu.dnetlib.docker</groupId>
-	<artifactId>dnet-parent</artifactId>
-	<version>7.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>eu.dnetlib.docker</groupId>
+  <artifactId>dnet-parent</artifactId>
+  <version>7.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
-	<licenses>
-		<license>
-			<name>GNU Affero General Public License v3.0 or later</name>
-			<url>https://spdx.org/licenses/AGPL-3.0-or-later.html#licenseText</url>
-			<distribution>repo</distribution>
-			<comments>This program is free software: you can redistribute it and/or modify it under the terms of the
-				GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the
-				License, or (at your option) any later version.</comments>
-		</license>
-	</licenses>
+  <licenses>
+    <license>
+      <name>GNU Affero General Public License v3.0 or later</name>
+      <url>https://spdx.org/licenses/AGPL-3.0-or-later.html#licenseText</url>
+      <distribution>repo</distribution>
+      <comments>This program is free software: you can redistribute it and/or modify it under the terms of the
+      GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the
+      License, or (at your option) any later version.</comments>
+    </license>
+  </licenses>
 
-	<modules>
-		<module>libs</module>
-		<module>apps</module>
-	</modules>
+  <modules>
+    <module>libs</module>
+    <module>apps</module>
+  </modules>
 
-	<issueManagement>
-		<system>Redmine</system>
-		<url>https://issue.openaire.research-infrastructures.eu/projects/openaire</url>
-	</issueManagement>
+  <issueManagement>
+    <system>Redmine</system>
+    <url>https://issue.openaire.research-infrastructures.eu/projects/openaire</url>
+  </issueManagement>
 
-	<ciManagement>
-		<system>jenkins</system>
-		<url>https://jenkins-dnet.d4science.org/</url>
-	</ciManagement>
+  <ciManagement>
+    <system>jenkins</system>
+    <url>https://jenkins-dnet.d4science.org/</url>
+  </ciManagement>
 
-	<scm>
-		<connection>scm:git:gitea@code-repo.d4science.org:michele.artini/dnet-docker.git</connection>
-		<developerConnection>scm:git:gitea@code-repo.d4science.org:michele.artini/dnet-docker.git</developerConnection>
-		<url>https://code-repo.d4science.org/michele.artini/dnet-docker</url>
-		<tag>HEAD</tag>
-	</scm>
+  <scm>
+    <connection>scm:git:gitea@code-repo.d4science.org:michele.artini/dnet-docker.git</connection>
+    <developerConnection>scm:git:gitea@code-repo.d4science.org:michele.artini/dnet-docker.git</developerConnection>
+    <url>https://code-repo.d4science.org/michele.artini/dnet-docker</url>
+    <tag>HEAD</tag>
+  </scm>
 
-	<description>This module is the root descriptor for the dnet-dockers project</description>
+  <description>This module is the root descriptor for the dnet-dockers project</description>
 
-	<pluginRepositories>
-	</pluginRepositories>
+  <pluginRepositories>
+  </pluginRepositories>
 
-	<repositories />
+  <repositories />
 
-	<dependencies>
+  <dependencies>
 
-		<!-- Commons -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
 
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-		</dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
 
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
 
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-junit-jupiter</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
 
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-pool2</artifactId>
-			<version>2.11.1</version>
-		</dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+      <version>2.11.1</version>
+    </dependency>
 
-	</dependencies>
+  </dependencies>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>1.4</version>
-			</dependency>
+  <dependencyManagement>
+    <dependencies>
 
-			<dependency>
-				<groupId>commons-codec</groupId>
-				<artifactId>commons-codec</artifactId>
-				<version>1.9</version>
-			</dependency>
+      <dependency>
+	<groupId>javax.annotation</groupId>
+	<artifactId>javax.annotation-api</artifactId>
+	<version>1.3.2</version>
+      </dependency>
+      
+      <dependency>
+	<groupId>commons-cli</groupId>
+	<artifactId>commons-cli</artifactId>
+	<version>1.4</version>
+      </dependency>
 
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>2.10.0</version>
-			</dependency>
+      <dependency>
+	<groupId>commons-codec</groupId>
+	<artifactId>commons-codec</artifactId>
+	<version>1.9</version>
+      </dependency>
 
-			<dependency>
-				<groupId>dom4j</groupId>
-				<artifactId>dom4j</artifactId>
-				<version>2.1.4</version>
-			</dependency>
+      <dependency>
+	<groupId>commons-io</groupId>
+	<artifactId>commons-io</artifactId>
+	<version>2.10.0</version>
+      </dependency>
 
-			<dependency>
-				<groupId>xml-apis</groupId>
-				<artifactId>xml-apis</artifactId>
-				<version>1.4.01</version>
-			</dependency>
+      <dependency>
+	<groupId>dom4j</groupId>
+	<artifactId>dom4j</artifactId>
+	<version>2.1.4</version>
+      </dependency>
 
-			<dependency>
-				<groupId>jaxen</groupId>
-				<artifactId>jaxen</artifactId>
-				<version>1.1.6</version>
-			</dependency>
+      <dependency>
+	<groupId>xml-apis</groupId>
+	<artifactId>xml-apis</artifactId>
+	<version>1.4.01</version>
+      </dependency>
 
-			<dependency>
-				<groupId>org.apache.maven</groupId>
-				<artifactId>maven-model</artifactId>
-				<version>3.8.1</version>
-			</dependency>
+      <dependency>
+	<groupId>jaxen</groupId>
+	<artifactId>jaxen</artifactId>
+	<version>1.1.6</version>
+      </dependency>
 
-			<dependency>
-				<groupId>com.vladmihalcea</groupId>
-				<artifactId>hibernate-types-52</artifactId>
-				<version>2.9.13</version>
-			</dependency>
+      <dependency>
+	<groupId>org.apache.maven</groupId>
+	<artifactId>maven-model</artifactId>
+	<version>3.8.1</version>
+      </dependency>
 
-			<!-- JAXB API, java.xml.bind module -->
-			<dependency>
-				<groupId>jakarta.xml.bind</groupId>
-				<artifactId>jakarta.xml.bind-api</artifactId>
-				<version>2.3.2</version>
-			</dependency>
+      <dependency>
+	<groupId>com.vladmihalcea</groupId>
+	<artifactId>hibernate-types-52</artifactId>
+	<version>2.9.13</version>
+      </dependency>
 
-			<!-- JAXB Runtime, com.sun.xml.bind module -->
-			<dependency>
-				<groupId>org.glassfish.jaxb</groupId>
-				<artifactId>jaxb-runtime</artifactId>
-				<version>2.3.2</version>
-			</dependency>
+      <!-- JAXB API, java.xml.bind module -->
+      <dependency>
+	<groupId>jakarta.xml.bind</groupId>
+	<artifactId>jakarta.xml.bind-api</artifactId>
+	<version>2.3.2</version>
+      </dependency>
 
-			<!-- Mail -->
-			<dependency>
-				<groupId>javax.mail</groupId>
-				<artifactId>mail</artifactId>
-				<version>1.4.7</version>
-			</dependency>
+      <!-- JAXB Runtime, com.sun.xml.bind module -->
+      <dependency>
+	<groupId>org.glassfish.jaxb</groupId>
+	<artifactId>jaxb-runtime</artifactId>
+	<version>2.3.2</version>
+      </dependency>
 
-			<!-- Swagger -->
-			<dependency>
-				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-ui</artifactId>
-				<version>1.6.10</version>
-			</dependency>
+      <!-- Mail -->
+      <dependency>
+	<groupId>javax.mail</groupId>
+	<artifactId>mail</artifactId>
+	<version>1.4.7</version>
+      </dependency>
 
-		</dependencies>
+      <!-- Swagger -->
+      <dependency>
+	<groupId>org.springdoc</groupId>
+	<artifactId>springdoc-openapi-ui</artifactId>
+	<version>1.6.10</version>
+      </dependency>
 
-	</dependencyManagement>
+    </dependencies>
 
-	<build>
-		<directory>target</directory>
-		<outputDirectory>target/classes</outputDirectory>
-		<finalName>${project.artifactId}-${project.version}</finalName>
-		<testOutputDirectory>target/test-classes</testOutputDirectory>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.0.0</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.7.1</version>
-				</plugin>
+  </dependencyManagement>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>${maven.compiler.plugin.version}</version>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-						<encoding>${project.build.sourceEncoding}</encoding>
-					</configuration>
-				</plugin>
+  <build>
+    <directory>target</directory>
+    <outputDirectory>target/classes</outputDirectory>
+    <finalName>${project.artifactId}-${project.version}</finalName>
+    <testOutputDirectory>target/test-classes</testOutputDirectory>
+    <pluginManagement>
+      <plugins>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-project-info-reports-plugin</artifactId>
+	  <version>3.0.0</version>
+	</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-site-plugin</artifactId>
+	  <version>3.7.1</version>
+	</plugin>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.2</version>
-				</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-compiler-plugin</artifactId>
+	  <version>${maven.compiler.plugin.version}</version>
+	  <configuration>
+	    <source>1.8</source>
+	    <target>1.8</target>
+	    <encoding>${project.build.sourceEncoding}</encoding>
+	  </configuration>
+	</plugin>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>3.0.1</version>
-					<executions>
-						<execution>
-							<id>attach-sources</id>
-							<phase>verify</phase>
-							<goals>
-								<goal>jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-jar-plugin</artifactId>
+	  <version>3.0.2</version>
+	</plugin>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M4</version>
-					<configuration>
-						<redirectTestOutputToFile>true</redirectTestOutputToFile>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.2.0</version>
-					<configuration>
-						<detectLinks>true</detectLinks>
-						<doclint>none</doclint>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.0.0</version>
-				</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-source-plugin</artifactId>
+	  <version>3.0.1</version>
+	  <executions>
+	    <execution>
+	      <id>attach-sources</id>
+	      <phase>verify</phase>
+	      <goals>
+		<goal>jar-no-fork</goal>
+	      </goals>
+	    </execution>
+	  </executions>
+	</plugin>
 
-			</plugins>
-		</pluginManagement>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-site-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.3</version>
-			</plugin>
-		</plugins>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-surefire-plugin</artifactId>
+	  <version>3.0.0-M4</version>
+	  <configuration>
+	    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+	  </configuration>
+	</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-javadoc-plugin</artifactId>
+	  <version>3.2.0</version>
+	  <configuration>
+	    <detectLinks>true</detectLinks>
+	    <doclint>none</doclint>
+	  </configuration>
+	</plugin>
+	<plugin>
+	  <groupId>org.apache.maven.plugins</groupId>
+	  <artifactId>maven-dependency-plugin</artifactId>
+	  <version>3.0.0</version>
+	</plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-site-plugin</artifactId>
+      </plugin>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-release-plugin</artifactId>
+	<version>2.5.3</version>
+      </plugin>
+    </plugins>
 
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-ssh</artifactId>
-				<version>2.10</version>
-			</extension>
-		</extensions>
-	</build>
+    <extensions>
+      <extension>
+	<groupId>org.apache.maven.wagon</groupId>
+	<artifactId>wagon-ssh</artifactId>
+	<version>2.10</version>
+      </extension>
+    </extensions>
+  </build>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<detectLinks>true</detectLinks>
-					<doclint>none</doclint>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
+  <reporting>
+    <plugins>
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-javadoc-plugin</artifactId>
+	<configuration>
+	  <detectLinks>true</detectLinks>
+	  <doclint>none</doclint>
+	</configuration>
+      </plugin>
+    </plugins>
+  </reporting>
 
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
-		<java.version>17</java.version>
-		<apache.solr.version>7.1.0</apache.solr.version>
-		<prometheus.version>0.10.0</prometheus.version>
-		<javamelody.version>1.71.0</javamelody.version>
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
-	</properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
+    <java.version>17</java.version>
+    <apache.solr.version>7.1.0</apache.solr.version>
+    <prometheus.version>0.10.0</prometheus.version>
+    <javamelody.version>1.71.0</javamelody.version>
+    <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
+  </properties>
 </project>