From 0a0784cbb6d5bcad55c0d46e626e23d997abc777 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 8 Apr 2019 10:34:05 +0200 Subject: [PATCH] SONAR-11916 replace class EmailTemplate by interface --- .../ReportAnalysisFailureNotificationEmailTemplate.java | 2 +- .../issue/notification/AbstractNewIssuesEmailTemplate.java | 2 +- .../org/sonar/server/issue/notification/EmailTemplate.java | 4 ++-- .../server/issue/notification/IssueChangesEmailTemplate.java | 2 +- .../qualitygate/notification/QGChangeEmailTemplate.java | 2 +- .../qualityprofile/BuiltInQPChangeNotificationTemplate.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/ReportAnalysisFailureNotificationEmailTemplate.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/ReportAnalysisFailureNotificationEmailTemplate.java index b6a1ffd62ef..ef0ff26bd4b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/ReportAnalysisFailureNotificationEmailTemplate.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/notification/ReportAnalysisFailureNotificationEmailTemplate.java @@ -28,7 +28,7 @@ import org.sonar.server.issue.notification.EmailTemplate; import static org.sonar.api.utils.DateUtils.formatDateTime; -public class ReportAnalysisFailureNotificationEmailTemplate extends EmailTemplate { +public class ReportAnalysisFailureNotificationEmailTemplate implements EmailTemplate { private static final char LINE_RETURN = '\n'; private static final char TAB = '\t'; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java index 1aa2f5cd9d8..e2c9f1be79c 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/AbstractNewIssuesEmailTemplate.java @@ -38,7 +38,7 @@ import static com.google.common.base.Preconditions.checkNotNull; /** * Base class to create emails for new issues */ -public abstract class AbstractNewIssuesEmailTemplate extends EmailTemplate { +public abstract class AbstractNewIssuesEmailTemplate implements EmailTemplate { protected static final char NEW_LINE = '\n'; protected static final String TAB = " "; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/EmailTemplate.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/EmailTemplate.java index 7c1e2f1f9f9..eaa7af95bdb 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/EmailTemplate.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/EmailTemplate.java @@ -25,8 +25,8 @@ import org.sonar.api.notifications.Notification; @ServerSide @ExtensionPoint -public abstract class EmailTemplate { +public interface EmailTemplate { - public abstract EmailMessage format(Notification notification); + EmailMessage format(Notification notification); } diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java index d5a3b590fd1..9e8a7f6a06c 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/issue/notification/IssueChangesEmailTemplate.java @@ -37,7 +37,7 @@ import static org.sonar.server.issue.notification.AbstractNewIssuesEmailTemplate /** * Creates email message for notification "issue-changes". */ -public class IssueChangesEmailTemplate extends EmailTemplate { +public class IssueChangesEmailTemplate implements EmailTemplate { private static final char NEW_LINE = '\n'; private final DbClient dbClient; diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/QGChangeEmailTemplate.java b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/QGChangeEmailTemplate.java index c196299957e..d5a883e1d66 100644 --- a/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/QGChangeEmailTemplate.java +++ b/server/sonar-server-common/src/main/java/org/sonar/server/qualitygate/notification/QGChangeEmailTemplate.java @@ -32,7 +32,7 @@ import org.sonar.server.issue.notification.EmailTemplate; * * @since 3.5 */ -public class QGChangeEmailTemplate extends EmailTemplate { +public class QGChangeEmailTemplate implements EmailTemplate { private EmailSettings configuration; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java index 3f58c44920b..41fd750f45d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BuiltInQPChangeNotificationTemplate.java @@ -33,7 +33,7 @@ import static org.sonar.api.utils.DateUtils.formatDate; import static org.sonar.server.qualityprofile.BuiltInQPChangeNotificationBuilder.Profile; import static org.sonar.server.qualityprofile.BuiltInQPChangeNotificationBuilder.parse; -public class BuiltInQPChangeNotificationTemplate extends EmailTemplate { +public class BuiltInQPChangeNotificationTemplate implements EmailTemplate { private final Server server; -- 2.39.5