fixed minor code issues (jooby-project#1175)

feffi · jknack · commit 798458a00de7 · 2018-06-25T13:05:02.000-03:00
(cherry picked from commit 9ae00d1)
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/EmailFactory.java b/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/EmailFactory.java
@@ -219,21 +219,19 @@
 
 public class EmailFactory {
 
-  private static interface EmailSetter {
+  private interface EmailSetter {
     void apply(String p) throws Exception;
   }
 
-  private Config mail;
+  private final Config mail;
 
   public EmailFactory(final Config mail) {
     this.mail = requireNonNull(mail, "Mail config is required.");
   }
 
   public <T extends Email> T newEmail(final T email) {
     try {
-      ifset("username", p -> {
-        email.setAuthentication(mail.getString(p), mail.getString("password"));
-      });
+      ifset("username", p -> email.setAuthentication(mail.getString(p), mail.getString("password")));
 
       ifset("bcc", p -> email.setBcc(address(strList(p))));
       ifset("bounceAddress", p -> email.setBounceAddress(mail.getString(p)));
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/HtmlEmailProvider.java b/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/HtmlEmailProvider.java
@@ -211,7 +211,7 @@
 
 public class HtmlEmailProvider implements Provider<HtmlEmail> {
 
-  private EmailFactory factory;
+  private final EmailFactory factory;
 
   public HtmlEmailProvider(final Config mail) {
     factory = new EmailFactory(mail);
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/ImageHtmlEmailProvider.java b/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/ImageHtmlEmailProvider.java
@@ -211,7 +211,7 @@
 
 public class ImageHtmlEmailProvider implements Provider<ImageHtmlEmail> {
 
-  private EmailFactory factory;
+  private final EmailFactory factory;
 
   public ImageHtmlEmailProvider(final Config mail) {
     factory = new EmailFactory(mail);
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/MultiPartEmailProvider.java b/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/MultiPartEmailProvider.java
@@ -211,7 +211,7 @@
 
 public class MultiPartEmailProvider implements Provider<MultiPartEmail> {
 
-  private EmailFactory factory;
+  private final EmailFactory factory;
 
   public MultiPartEmailProvider(final Config mail) {
     factory = new EmailFactory(mail);
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/SimpleEmailProvider.java b/modules/jooby-commons-email/src/main/java/org/jooby/internal/mail/SimpleEmailProvider.java
@@ -211,7 +211,7 @@
 
 public class SimpleEmailProvider implements Provider<SimpleEmail> {
 
-  private EmailFactory factory;
+  private final EmailFactory factory;
 
   public SimpleEmailProvider(final Config mail) {
     factory = new EmailFactory(mail);
diff --git a/modules/jooby-commons-email/src/main/java/org/jooby/mail/CommonsEmail.java b/modules/jooby-commons-email/src/main/java/org/jooby/mail/CommonsEmail.java
@@ -265,7 +265,7 @@
  */
 public class CommonsEmail implements Jooby.Module {
 
-  private String name;
+  private final String name;
 
   /**
    * Creates a {@link CommonsEmail}.
@@ -288,18 +288,10 @@ public void configure(final Env env, final Config config, final Binder binder) {
     Config mail = config.getConfig(name).withFallback(config.getConfig("mail"));
 
     ServiceKey serviceKey = env.serviceKey();
-    serviceKey.generate(SimpleEmail.class, name, k -> {
-      binder.bind(k).toProvider(new SimpleEmailProvider(mail));
-    });
-    serviceKey.generate(HtmlEmail.class, name, k -> {
-      binder.bind(k).toProvider(new HtmlEmailProvider(mail));
-    });
-    serviceKey.generate(MultiPartEmail.class, name, k -> {
-      binder.bind(k).toProvider(new MultiPartEmailProvider(mail));
-    });
-    serviceKey.generate(ImageHtmlEmail.class, name, k -> {
-      binder.bind(k).toProvider(new ImageHtmlEmailProvider(mail));
-    });
+    serviceKey.generate(SimpleEmail.class, name, k -> binder.bind(k).toProvider(new SimpleEmailProvider(mail)));
+    serviceKey.generate(HtmlEmail.class, name, k -> binder.bind(k).toProvider(new HtmlEmailProvider(mail)));
+    serviceKey.generate(MultiPartEmail.class, name, k -> binder.bind(k).toProvider(new MultiPartEmailProvider(mail)));
+    serviceKey.generate(ImageHtmlEmail.class, name, k -> binder.bind(k).toProvider(new ImageHtmlEmailProvider(mail)));
   }
 
   @Override
