Skip to content

Commit 8e249bd

Browse files
committed
small updates
1 parent e4b3313 commit 8e249bd

File tree

3 files changed

+23
-39
lines changed

3 files changed

+23
-39
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies {
3939
### Fake SMTP Server
4040

4141
```java
42+
4243
var container = new FakeSMTPTestContainer()
4344
.withSmtpPassword("pwd")
4445
.withSmtpUser("test_user");
@@ -92,19 +93,15 @@ LoggerLevel.DEBUG.setEnabled(true);
9293

9394
logger.debug("Simple message");
9495
logger.debug(5, (val) -> "Lazy message with 5: " + val);
96+
logger.debug(5, "Lazy message with 5:%d"::formated);
9597
logger.debug(5, 10D, (val1, val2) -> "Lazy message with 5: " + val1 + " and 10: " + val2);
96-
logger.debug("", "Message with a string owner.");
97-
logger.debug("", 5, (val) -> "Lazy message with 5: " + val);
98-
logger.debug("", 5, 10D, (val1, val2) -> "Lazy message with 5: " + val1 + " and 10: " + val2);
98+
logger.debug(5, 10D, "Lazy message with 5:%d and 10:%d"::formatted);
9999

100100
// global disable debug level
101101
LoggerLevel.DEBUG.setEnabled(false);
102102

103103
// local enable debug level only for this logger instance
104104
logger.setEnabled(LoggerLevel.DEBUG, true);
105-
106-
// show debug message
107-
logger.debug("Showed");
108105
```
109106

110107
### Mail Sender
@@ -132,10 +129,9 @@ var javaxConfig = JavaxMailSender.JavaxMailSenderConfig
132129
var sender = new JavaxMailSender(config, javaxConfig);
133130

134131
sender.send("[email protected]","Test Subject","Content");
135-
136132
sender
137133
.sendAsync("[email protected]","Test Subject","Content")
138-
.thenAccept(aVoid ->System.out.println("done!"));
134+
.thenAccept(aVoid -> System.out.println("done!"));
139135
```
140136

141137
### Network API

rlib-mail/src/main/java/javasabr/rlib/mail/sender/MailSenderConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ public class MailSenderConfig {
1616
private String from;
1717

1818
private boolean useAuth;
19-
private boolean enableTtls;
19+
private boolean enableTls;
2020
}

rlib-mail/src/main/java/javasabr/rlib/mail/sender/impl/JavaxMailSender.java

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,22 @@
2020
import java.util.concurrent.SynchronousQueue;
2121
import java.util.concurrent.ThreadPoolExecutor;
2222
import java.util.concurrent.TimeUnit;
23-
import javasabr.rlib.logger.api.Logger;
24-
import javasabr.rlib.logger.api.LoggerManager;
2523
import javasabr.rlib.mail.sender.MailSender;
2624
import javasabr.rlib.mail.sender.MailSenderConfig;
2725
import javasabr.rlib.mail.sender.exception.UncheckedMessagingException;
2826
import lombok.Builder;
27+
import lombok.CustomLog;
2928
import lombok.Getter;
3029

30+
@CustomLog
3131
public class JavaxMailSender implements MailSender {
3232

33-
private static final Logger LOGGER = LoggerManager.getLogger(JavaxMailSender.class);
34-
3533
@Getter
3634
@Builder
3735
public static class JavaxMailSenderConfig {
38-
3936
private int executorMinThreads;
4037
private int executorMaxThreads;
4138
private int executorKeepAlive;
42-
4339
private Executor executor;
4440
}
4541

@@ -48,13 +44,12 @@ public static class JavaxMailSenderConfig {
4844
private final InternetAddress from;
4945

5046
public JavaxMailSender(MailSenderConfig config) {
51-
this(config,
52-
JavaxMailSenderConfig
53-
.builder()
54-
.executorKeepAlive(60)
55-
.executorMinThreads(1)
56-
.executorMaxThreads(2)
57-
.build());
47+
this(config, JavaxMailSenderConfig
48+
.builder()
49+
.executorKeepAlive(60)
50+
.executorMinThreads(1)
51+
.executorMaxThreads(2)
52+
.build());
5853
}
5954

6055
public JavaxMailSender(MailSenderConfig config, JavaxMailSenderConfig javaxConfig) {
@@ -64,7 +59,7 @@ public JavaxMailSender(MailSenderConfig config, JavaxMailSenderConfig javaxConfi
6459
prop.put("mail.smtp.host", config.getHost());
6560
prop.put("mail.smtp.port", String.valueOf(config.getPort()));
6661

67-
if (config.isEnableTtls()) {
62+
if (config.isEnableTls()) {
6863
prop.put("mail.smtp.socketFactory.port", String.valueOf(config.getPort()));
6964
prop.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
7065
prop.put("mail.smtp.starttls.enable", "true");
@@ -82,18 +77,17 @@ protected PasswordAuthentication getPasswordAuthentication() {
8277
return new PasswordAuthentication(username, password);
8378
}
8479
});
85-
8680
try {
8781
this.from = new InternetAddress(config.getFrom());
8882
} catch (AddressException e) {
8983
throw new RuntimeException(e);
9084
}
9185

92-
LOGGER.info("Initialized javax mail sender with settings:");
93-
LOGGER.info("User : " + username);
94-
LOGGER.info("From : " + config.getFrom());
95-
LOGGER.info("Server : " + config.getHost() + ":" + config.getPort());
96-
LOGGER.info("Using SSL : " + config.isEnableTtls());
86+
log.info("Initialized javax mail sender with settings:");
87+
log.info(username, "User:[%s]"::formatted);
88+
log.info(config.getFrom(), "From:[%s]"::formatted);
89+
log.info(config.getHost(), config.getPort(), "Server:[%s:%d]"::formatted);
90+
log.info(config.isEnableTls(), "Using SSL:[%s]"::formatted);
9791

9892
if (javaxConfig.getExecutor() != null) {
9993
this.executor = javaxConfig.getExecutor();
@@ -111,24 +105,18 @@ protected PasswordAuthentication getPasswordAuthentication() {
111105

112106
@Override
113107
public void send(String email, String subject, String content) {
114-
115108
try {
116-
117-
var message = new MimeMessage(session);
118-
message.setFrom(from);
119-
message.setRecipients(MimeMessage.RecipientType.TO, InternetAddress.parse(email));
120-
message.setSubject(subject, StandardCharsets.UTF_8.name());
121-
122109
var mimeBodyPart = new MimeBodyPart();
123110
mimeBodyPart.setContent(content, "text/html; charset=UTF-8");
124-
125111
var multipart = new MimeMultipart();
126112
multipart.addBodyPart(mimeBodyPart);
127113

114+
var message = new MimeMessage(session);
115+
message.setFrom(from);
116+
message.setRecipients(MimeMessage.RecipientType.TO, InternetAddress.parse(email));
117+
message.setSubject(subject, StandardCharsets.UTF_8.name());
128118
message.setContent(multipart);
129-
130119
Transport.send(message);
131-
132120
} catch (MessagingException e) {
133121
throw new UncheckedMessagingException(e);
134122
}

0 commit comments

Comments
 (0)