From 533294134fb42a02b2557c68eda45f47d77e73cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Tue, 12 Jul 2016 01:16:38 +0200 Subject: [PATCH] upd: rename sendmail to sendMail Change-Id: Ibd6448de53e03f4f9ccb322b47a6e49aca7d1a7f --- src/org/cacert/gigi/email/EmailProvider.java | 14 +++++++------- src/org/cacert/gigi/email/MailProbe.java | 2 +- .../gigi/email/{Sendmail.java => SendMail.java} | 6 +++--- src/org/cacert/gigi/pages/PasswordResetPage.java | 4 ++-- .../cacert/gigi/email/TestEmailProviderClass.java | 2 +- tests/org/cacert/gigi/email/TestSendmail.java | 4 ++-- tests/org/cacert/gigi/testUtils/BusinessTest.java | 2 +- .../cacert/gigi/testUtils/TestEmailReceiver.java | 2 +- .../gigi/email/CommandlineEmailProvider.java | 2 +- .../org/cacert/gigi/email/TestEmailProvider.java | 4 ++-- util-testing/org/cacert/gigi/pages/Manager.java | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) rename src/org/cacert/gigi/email/{Sendmail.java => SendMail.java} (96%) diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java index b66ba3f9..ed61aeca 100644 --- a/src/org/cacert/gigi/email/EmailProvider.java +++ b/src/org/cacert/gigi/email/EmailProvider.java @@ -25,7 +25,7 @@ import org.cacert.gigi.util.DNSUtil; public abstract class EmailProvider { - public abstract void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException; + public abstract void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException; private static EmailProvider instance; @@ -99,7 +99,7 @@ public abstract class EmailProvider { BufferedReader br = br0; PrintWriter pw = pw0; String line; - if ( !Sendmail.readSMTPResponse(br, 220)) { + if ( !SendMail.readSMTPResponse(br, 220)) { continue; } @@ -120,7 +120,7 @@ public abstract class EmailProvider { if (starttls) { pw.print("STARTTLS\r\n"); pw.flush(); - if ( !Sendmail.readSMTPResponse(br, 220)) { + if ( !SendMail.readSMTPResponse(br, 220)) { continue; } Socket s1 = ((SSLSocketFactory) SSLSocketFactory.getDefault()).createSocket(s, host, 25, true); @@ -128,7 +128,7 @@ public abstract class EmailProvider { pw = new PrintWriter(new OutputStreamWriter(s1.getOutputStream(), "UTF-8")); pw.print("EHLO www.cacert.org\r\n"); pw.flush(); - if ( !Sendmail.readSMTPResponse(br, 250)) { + if ( !SendMail.readSMTPResponse(br, 250)) { continue; } } @@ -136,18 +136,18 @@ public abstract class EmailProvider { pw.print("MAIL FROM: \r\n"); pw.flush(); - if ( !Sendmail.readSMTPResponse(br, 250)) { + if ( !SendMail.readSMTPResponse(br, 250)) { continue; } pw.print("RCPT TO: <" + address + ">\r\n"); pw.flush(); - if ( !Sendmail.readSMTPResponse(br, 250)) { + if ( !SendMail.readSMTPResponse(br, 250)) { continue; } pw.print("QUIT\r\n"); pw.flush(); - if ( !Sendmail.readSMTPResponse(br, 221)) { + if ( !SendMail.readSMTPResponse(br, 221)) { continue; } diff --git a/src/org/cacert/gigi/email/MailProbe.java b/src/org/cacert/gigi/email/MailProbe.java index 41fc99a5..987c036e 100644 --- a/src/org/cacert/gigi/email/MailProbe.java +++ b/src/org/cacert/gigi/email/MailProbe.java @@ -22,7 +22,7 @@ public class MailProbe { body.append(l.getTranslation("Best regards")); body.append("\n"); body.append(l.getTranslation("SomeCA.org Support!")); - EmailProvider.getInstance().sendmail(address, "[SomeCA.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false); + EmailProvider.getInstance().sendMail(address, "[SomeCA.org] " + l.getTranslation("Mail Probe"), body.toString(), "support@cacert.org", null, null, null, null, false); } } diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/SendMail.java similarity index 96% rename from src/org/cacert/gigi/email/Sendmail.java rename to src/org/cacert/gigi/email/SendMail.java index a65b1326..43c07e8a 100644 --- a/src/org/cacert/gigi/email/Sendmail.java +++ b/src/org/cacert/gigi/email/SendMail.java @@ -17,13 +17,13 @@ import java.util.regex.Pattern; import org.cacert.gigi.util.PEM; import org.cacert.gigi.util.ServerConstants; -public class Sendmail extends EmailProvider { +public class SendMail extends EmailProvider { private final String targetHost; private final int targetPort; - protected Sendmail(Properties props) { + protected SendMail(Properties props) { targetHost = props.getProperty("emailProvider.smtpHost", "localhost"); targetPort = Integer.parseInt(props.getProperty("emailProvider.smtpPort", "25")); } @@ -31,7 +31,7 @@ public class Sendmail extends EmailProvider { private static final Pattern NON_ASCII = Pattern.compile("[^a-zA-Z0-9 .-\\[\\]!_@]"); @Override - public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { String[] bits = from.split(","); diff --git a/src/org/cacert/gigi/pages/PasswordResetPage.java b/src/org/cacert/gigi/pages/PasswordResetPage.java index 496c0e1e..7ba5d73c 100644 --- a/src/org/cacert/gigi/pages/PasswordResetPage.java +++ b/src/org/cacert/gigi/pages/PasswordResetPage.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletResponse; import org.cacert.gigi.GigiApiException; import org.cacert.gigi.database.GigiPreparedStatement; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.email.Sendmail; +import org.cacert.gigi.email.SendMail; import org.cacert.gigi.localisation.Language; import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.SprintfCommand; @@ -137,7 +137,7 @@ public class PasswordResetPage extends Page { outMail.print("\n"); outMail.print(l.getTranslation("SomeCA.org Support!")); outMail.close(); - Sendmail.getInstance().sendmail(Page.getUser(req).getEmail(), "[SomeCA.org] " + subject, sw.toString(), "support@cacert.org", null, null, null, null, false); + SendMail.getInstance().sendMail(Page.getUser(req).getEmail(), "[SomeCA.org] " + subject, sw.toString(), "support@cacert.org", null, null, null, null, false); out.println(Page.getLanguage(req).getTranslation("Password reset successful.")); } catch (IOException e) { e.printStackTrace(); diff --git a/tests/org/cacert/gigi/email/TestEmailProviderClass.java b/tests/org/cacert/gigi/email/TestEmailProviderClass.java index 3b38bc26..1ebb8117 100644 --- a/tests/org/cacert/gigi/email/TestEmailProviderClass.java +++ b/tests/org/cacert/gigi/email/TestEmailProviderClass.java @@ -47,7 +47,7 @@ public class TestEmailProviderClass extends ConfiguredTest { @BeforeClass public static void initMailsystem() throws NoSuchAlgorithmException, KeyManagementException { Properties prop = new Properties(); - prop.setProperty("emailProvider", "org.cacert.gigi.email.Sendmail"); + prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail"); EmailProvider.initSystem(prop, null, null); SSLContext c = SSLContext.getInstance("TLS"); c.init(null, new TrustManager[] { diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java index f918e3fe..5ddd7508 100644 --- a/tests/org/cacert/gigi/email/TestSendmail.java +++ b/tests/org/cacert/gigi/email/TestSendmail.java @@ -55,7 +55,7 @@ public class TestSendmail extends ConfiguredTest { String subj = "subj-" + createUniqueName(); String msg = "msg-" + createUniqueName(); - EmailProvider.getInstance().sendmail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false); + EmailProvider.getInstance().sendMail(succmail, subj, msg, "system@cacert.org", "system@cacert.org", "Testtarget", "Testsender", null, false); try (Socket s = SSLSocketFactory.getDefault().createSocket(imap, 993);// PrintWriter pw = new PrintWriter(new OutputStreamWriter(s.getOutputStream(), "UTF-8"), true);// @@ -110,7 +110,7 @@ public class TestSendmail extends ConfiguredTest { private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort")); Properties prop = new Properties(); - prop.setProperty("emailProvider", "org.cacert.gigi.email.Sendmail"); + prop.setProperty("emailProvider", "org.cacert.gigi.email.SendMail"); prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost")); prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort")); KeyPair kp = generateKeypair(); diff --git a/tests/org/cacert/gigi/testUtils/BusinessTest.java b/tests/org/cacert/gigi/testUtils/BusinessTest.java index 408b518b..c014e2b3 100644 --- a/tests/org/cacert/gigi/testUtils/BusinessTest.java +++ b/tests/org/cacert/gigi/testUtils/BusinessTest.java @@ -38,7 +38,7 @@ public abstract class BusinessTest extends ConfiguredTest { } @Override - public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { TestMail tm = new TestEmailReceiver.TestMail(to, subject, message, fromname, replyto) { @Override diff --git a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java index d7818312..27b166f9 100644 --- a/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java +++ b/tests/org/cacert/gigi/testUtils/TestEmailReceiver.java @@ -273,7 +273,7 @@ public final class TestEmailReceiver extends EmailProvider implements Runnable, } @Override - public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { mails.add(new TestMail(to, subject, message, from, replyto)); } diff --git a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java b/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java index 108dd646..e23f4758 100644 --- a/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java +++ b/util-testing/org/cacert/gigi/email/CommandlineEmailProvider.java @@ -8,7 +8,7 @@ public class CommandlineEmailProvider extends EmailProvider { public CommandlineEmailProvider(Properties p) {} @Override - public void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { synchronized (System.out) { System.out.println("== MAIL =="); System.out.println("To: " + to); diff --git a/util-testing/org/cacert/gigi/email/TestEmailProvider.java b/util-testing/org/cacert/gigi/email/TestEmailProvider.java index bee64f4b..74012027 100644 --- a/util-testing/org/cacert/gigi/email/TestEmailProvider.java +++ b/util-testing/org/cacert/gigi/email/TestEmailProvider.java @@ -45,10 +45,10 @@ public class TestEmailProvider extends EmailProvider { } @Override - public synchronized void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public synchronized void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { while (true) { if ( !assureLocalConnection() && target != null) { - target.sendmail(to, subject, message, from, replyto, toname, fromname, errorsto, extra); + target.sendMail(to, subject, message, from, replyto, toname, fromname, errorsto, extra); return; } try { diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java index 6a3f4196..dfa4b5a4 100644 --- a/util-testing/org/cacert/gigi/pages/Manager.java +++ b/util-testing/org/cacert/gigi/pages/Manager.java @@ -148,7 +148,7 @@ public class Manager extends Page { } @Override - public synchronized void sendmail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { + public synchronized void sendMail(String to, String subject, String message, String from, String replyto, String toname, String fromname, String errorsto, boolean extra) throws IOException { HashMap> mails = Manager.getInstance().emails; LinkedList hismails = mails.get(to); if (hismails == null) { -- 2.39.2