The Unified and Autonomous Development Platform
Add migration from mail setting
Robin Shen2e4fa1150926
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.javaindex 26035e7100..7c82ebbe9b 100644--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java@@ -851,7 +851,7 @@ public class DefaultMailManager implements MailManager {IMAPFolder inbox = null;try {store = session.getStore("imap");- String credentialValue = checkSetting.getImapCredential()!=null?checkSetting.getImapCredential().getValue():null;+ String credentialValue = checkSetting.getImapCredential().getValue();store.connect(checkSetting.getImapUser(), credentialValue);inbox = (IMAPFolder) store.getFolder("INBOX");inbox.open(Folder.READ_ONLY);diff --git a/server-core/src/main/java/io/onedev/server/mail/MailCheckSetting.java b/server-core/src/main/java/io/onedev/server/mail/MailCheckSetting.javaindex b25bc12a2f..8b7a829664 100644--- a/server-core/src/main/java/io/onedev/server/mail/MailCheckSetting.java+++ b/server-core/src/main/java/io/onedev/server/mail/MailCheckSetting.java@@ -2,8 +2,6 @@ package io.onedev.server.mail;import java.io.Serializable;-import javax.annotation.Nullable;-public class MailCheckSetting implements Serializable {private static final long serialVersionUID = 1L;@@ -24,7 +22,7 @@ public class MailCheckSetting implements Serializable {private final int timeout;- public MailCheckSetting(String imapHost, int imapPort, @Nullable String imapUser, @Nullable MailCredential imapCredential,+ public MailCheckSetting(String imapHost, int imapPort, String imapUser, MailCredential imapCredential,String checkAddress, boolean enableSSL, int pollInterval, int timeout) {this.imapHost = imapHost;this.imapPort = imapPort;diff --git a/server-core/src/main/java/io/onedev/server/mail/MailSendSetting.java b/server-core/src/main/java/io/onedev/server/mail/MailSendSetting.javaindex 7d713b88d7..bc98d745c7 100644--- a/server-core/src/main/java/io/onedev/server/mail/MailSendSetting.java+++ b/server-core/src/main/java/io/onedev/server/mail/MailSendSetting.java@@ -2,8 +2,6 @@ package io.onedev.server.mail;import java.io.Serializable;-import javax.annotation.Nullable;-public class MailSendSetting implements Serializable {private static final long serialVersionUID = 1L;@@ -22,7 +20,7 @@ public class MailSendSetting implements Serializable {private final int timeout;- public MailSendSetting(String smtpHost, int smtpPort, @Nullable String smtpUser, @Nullable MailCredential smtpCredential,+ public MailSendSetting(String smtpHost, int smtpPort, String smtpUser, MailCredential smtpCredential,String senderAddress, boolean enableStartTLS, int timeout) {this.smtpHost = smtpHost;this.smtpPort = smtpPort;diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex b6e6f7e1fc..97e058bcd1 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -4246,4 +4246,25 @@ public class DataMigrator {private void migrate93(File dataDir, Stack<Integer> versions) {}+ private void migrate94(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("MAIL")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ valueElement.addAttribute("class", "io.onedev.server.model.support.administration.mailsetting.OtherMailSetting");+ Element receiveMailSettingElement = valueElement.element("receiveMailSetting");+ if (receiveMailSettingElement != null)+ receiveMailSettingElement.setName("otherInboxPollSetting");+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/ImapAuth.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/ImapAuth.javadeleted file mode 100644index 9faf3fe3da..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/ImapAuth.java+++ /dev/null@@ -1,18 +0,0 @@-package io.onedev.server.model.support.administration.mailsetting;--import java.io.Serializable;--import javax.annotation.Nullable;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public interface ImapAuth extends Serializable {-- @Nullable- String getUserName(OtherMailSetting otherMailSetting);-- @Nullable- String getPassword(OtherMailSetting otherMailSetting);--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.javaindex 2a0a03ffe8..ef800995c9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherInboxPollSetting.java@@ -1,10 +1,9 @@package io.onedev.server.model.support.administration.mailsetting;-import javax.validation.constraints.NotNull;-import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Password;@Editablepublic class OtherInboxPollSetting extends InboxPollSetting {@@ -15,7 +14,9 @@ public class OtherInboxPollSetting extends InboxPollSetting {private int imapPort = 993;- private ImapAuth imapAuth = new UseSmtpAuth();+ private String imapUser;++ private String imapPassword;private boolean enableSSL = true;@@ -38,14 +39,27 @@ public class OtherInboxPollSetting extends InboxPollSetting {this.imapPort = imapPort;}- @Editable(order=300, name="Authentication")- @NotNull- public ImapAuth getImapAuth() {- return imapAuth;+ @Editable(order=300, name="IMAP User", description="Specify IMAP user name.<br>"+ + "<b class='text-danger'>NOTE: </b> This account should be able to receive emails sent to system "+ + "email address specified above")+ @NotEmpty+ public String getImapUser() {+ return imapUser;+ }++ public void setImapUser(String imapUser) {+ this.imapUser = imapUser;+ }++ @Editable(order=400, name="IMAP Password")+ @Password(autoComplete="new-password")+ @NotEmpty+ public String getImapPassword() {+ return imapPassword;}- public void setImapAuth(ImapAuth imapAuth) {- this.imapAuth = imapAuth;+ public void setImapPassword(String imapPassword) {+ this.imapPassword = imapPassword;}@Editable(order=700, name="Enable IMAP SSL", description="Whether or not to enable SSL when connect to IMAP server")diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.javaindex 5bc627506a..e3d65634d1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java@@ -9,7 +9,7 @@ import io.onedev.server.mail.MailSendSetting;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;-@Editable(order=10000, name="Other Provider")+@Editable(order=10000, name="Other")public class OtherMailSetting extends MailSetting {private static final long serialVersionUID = 1L;@@ -47,9 +47,7 @@ public class OtherMailSetting extends MailSetting {this.smtpPort = smtpPort;}- @Editable(order=300, name="SMTP User", description=- "Optionally specify user name here if the SMTP host needs authentication"- )+ @Editable(order=300, name="SMTP User")public String getSmtpUser() {return smtpUser;}@@ -58,9 +56,7 @@ public class OtherMailSetting extends MailSetting {this.smtpUser = smtpUser;}- @Editable(order=400, name="SMTP Password", description=- "Optionally specify password here if the SMTP host needs authentication"- )+ @Editable(order=400, name="SMTP Password")@Password(autoComplete="new-password")public String getSmtpPassword() {return smtpPassword;@@ -105,25 +101,19 @@ public class OtherMailSetting extends MailSetting {@Overridepublic MailSendSetting getSendSetting() {- MailCredential credential;+ MailCredential smtpCredential;if (smtpPassword != null)- credential = new BasicAuthPassword(smtpPassword);+ smtpCredential = new BasicAuthPassword(smtpPassword);else- credential = null;- return new MailSendSetting(smtpHost, smtpPort, smtpUser, credential, emailAddress, enableStartTLS, getTimeout());+ smtpCredential = null;+ return new MailSendSetting(smtpHost, smtpPort, smtpUser, smtpCredential, emailAddress, enableStartTLS, getTimeout());}@Overridepublic MailCheckSetting getCheckSetting() {if (otherInboxPollSetting != null) {- String imapUser = otherInboxPollSetting.getImapAuth().getUserName(this);- MailCredential imapCredential;- String imapPassword = otherInboxPollSetting.getImapAuth().getPassword(this);- if (imapPassword != null)- imapCredential = new BasicAuthPassword(imapPassword);- else- imapCredential = null;-+ String imapUser = otherInboxPollSetting.getImapUser();+ MailCredential imapCredential = new BasicAuthPassword(otherInboxPollSetting.getImapPassword());return new MailCheckSetting(otherInboxPollSetting.getImapHost(), otherInboxPollSetting.getImapPort(),imapUser, imapCredential, emailAddress, otherInboxPollSetting.isEnableSSL(),otherInboxPollSetting.getPollInterval(), getTimeout());diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/SeparateImapAuth.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/SeparateImapAuth.javadeleted file mode 100644index 974e55d7b5..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/SeparateImapAuth.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.model.support.administration.mailsetting;--import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Password;--@Editable(order=200, name="Specify User Name and Password")-public class SeparateImapAuth implements ImapAuth {-- private static final long serialVersionUID = 1L;-- private String userName;-- private String password;-- @Editable(order=500, name="IMAP User", description="Specify IMAP user name.<br>"- + "<b class='text-danger'>NOTE: </b> This account should be able to receive emails sent to system "- + "email address specified above")- public String getUserName() {- return userName;- }-- public void setUserName(String userName) {- this.userName = userName;- }-- @Editable(order=600, name="IMAP Password")- @Password(autoComplete="new-password")- public String getPassword() {- return password;- }-- public void setPassword(String password) {- this.password = password;- }-- @Override- public String getUserName(OtherMailSetting otherMailSetting) {- return getUserName();- }-- @Override- public String getPassword(OtherMailSetting otherMailSetting) {- return getPassword();- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/UseSmtpAuth.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/UseSmtpAuth.javadeleted file mode 100644index 2dc53e2150..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/UseSmtpAuth.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.model.support.administration.mailsetting;--import io.onedev.server.web.editable.annotation.Editable;--@Editable(order=100, name="Same as SMTP")-public class UseSmtpAuth implements ImapAuth {-- private static final long serialVersionUID = 1L;-- @Override- public String getUserName(OtherMailSetting otherMailSetting) {- return otherMailSetting.getSmtpUser();- }-- @Override- public String getPassword(OtherMailSetting otherMailSetting) {- return otherMailSetting.getSmtpPassword();- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.javaindex d9a3666b26..2cf7b200c9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java@@ -4,7 +4,6 @@ import java.io.Serializable;import io.onedev.server.model.support.administration.mailsetting.MailSetting;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.OmitName;@Editablepublic class MailSettingHolder implements Serializable {@@ -13,8 +12,7 @@ public class MailSettingHolder implements Serializable {private MailSetting mailSetting;- @Editable(placeholder="Disable")- @OmitName+ @Editable(name="Provider", placeholder="None")public MailSetting getMailSetting() {return mailSetting;}