SONAR-11916 replace class EmailTemplate by interface

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 b6a1ffd62efc54cd5e391cb4a076336e4544649a..ef0ff26bd4be938baadbfef119a086d5e62ae01e 100644 (file)
--- 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 1aa2f5cd9d85025abf06667e698ce5f78fa9638f..e2c9f1be79cfcb48a946d52f1645671471acd752 100644 (file)
--- 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 7c1e2f1f9f9765d39c5a7b0064d14512fabe8569..eaa7af95bdb2356b631a1a655e44ac5966108ce9 100644 (file)
--- 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 d5a3b590fd1c41d86f0ac34e44ef8c069c7fd60c..9e8a7f6a06c172ef3d83512e6d38fb1abb32d38d 100644 (file)
--- 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 c196299957e9c46ce467883c20384e27d1e1ff0e..d5a883e1d66c534777ca31bc3003a4a1e7e2e3e6 100644 (file)
--- 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 3f58c44920b32c99ea9b90f3b7925f3895dcfd22..41fd750f45d734faf44530e0e5df19d95003eba7 100644 (file)
--- 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;