From 6e5b8e44ae8dc8ae25b04cca7eaf8f3eee180f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jordi=20G=C3=B3mez?= <jordi.gomez@eclipse-foundation.org>
Date: Wed, 9 Apr 2025 10:03:28 +0200
Subject: [PATCH] refactor: moving MailerConfig to the config folder
---
.../service/impl/DefaultMailerService.java | 5 +--
.../eca/service/impl/EclipseMailerConfig.java | 34 -------------------
2 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 src/main/java/org/eclipsefoundation/git/eca/service/impl/EclipseMailerConfig.java
diff --git a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultMailerService.java b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultMailerService.java
index 5e37828..6c2a10d 100644
--- a/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultMailerService.java
+++ b/src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultMailerService.java
@@ -10,6 +10,7 @@
*/
package org.eclipsefoundation.git.eca.service.impl;
+import org.eclipsefoundation.git.eca.config.MailerConfig;
import org.eclipsefoundation.git.eca.dto.GithubWebhookTracking;
import org.eclipsefoundation.git.eca.service.MailerService;
import org.slf4j.Logger;
@@ -24,13 +25,13 @@ import jakarta.enterprise.context.ApplicationScoped;
@ApplicationScoped
public class DefaultMailerService implements MailerService {
public static final Logger LOGGER = LoggerFactory.getLogger(DefaultMailerService.class);
- private final EclipseMailerConfig config;
+ private final MailerConfig config;
private final Mailer mailer;
@Location("emails/revalidation_alert")
Template revalidationAlertTemplate;
- public DefaultMailerService(EclipseMailerConfig config, Mailer mailer) {
+ public DefaultMailerService(MailerConfig config, Mailer mailer) {
this.config = config;
this.mailer = mailer;
}
diff --git a/src/main/java/org/eclipsefoundation/git/eca/service/impl/EclipseMailerConfig.java b/src/main/java/org/eclipsefoundation/git/eca/service/impl/EclipseMailerConfig.java
deleted file mode 100644
index 2a200ef..0000000
--- a/src/main/java/org/eclipsefoundation/git/eca/service/impl/EclipseMailerConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipsefoundation.git.eca.service.impl;
-
-import java.util.List;
-import java.util.Optional;
-
-import io.smallrye.config.ConfigMapping;
-
-/**
- * Represents configuration for the default mailer service.
- *
- * @author Martin Lowe
- *
- */
-@ConfigMapping(prefix = "eclipse.mailer")
-public interface EclipseMailerConfig {
-
- public RevalidationAlert revalidationAlert();
-
- /**
- * This interface defines the contract for specifying recipients and message configuration when
- * sending revalidation alerts within the ECA validation process.
- */
- public interface RevalidationAlert {
- public List<String> to();
-
- public MessageConfiguration authorMessage();
- }
-
- public interface MessageConfiguration {
- public Optional<String> replyTo();
-
- public Optional<List<String>> bcc();
- }
-}
--
GitLab