mxbl: use lombok for creating logger

diff --git a/mxbl/pom.xml b/mxbl/pom.xml
index f6414f608b0954505b087f0c192a488d01705fbc..4e0bfce952c202b2dd0bbf21936428d509b749ee 100644 (file)
--- a/mxbl/pom.xml
+++ b/mxbl/pom.xml
@@ -19,6 +19,11 @@
                        <artifactId>moo</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <scope>provided</scope>
+               </dependency>
        </dependencies>
        
        <build>

diff --git a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/EventRegister.java b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/EventRegister.java
index f6bd1e95f395d6b543396b4caa15bc8b5efc1873..44f049ea0144a1cbdfb34184b0d100e6477dc800 100644 (file)
--- a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/EventRegister.java
+++ b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/EventRegister.java
@@ -10,6 +10,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.naming.NamingException;
+import lombok.extern.slf4j.Slf4j;
 import net.rizon.moo.Event;
 import net.rizon.moo.conf.Config;
 import net.rizon.moo.events.EventListener;
@@ -17,17 +18,14 @@ import net.rizon.moo.events.EventPrivmsg;
 import net.rizon.moo.irc.Protocol;
 import net.rizon.moo.plugin.mxbl.dns.NS;
 import net.rizon.moo.plugin.mxbl.dns.RecordType;
-import org.slf4j.Logger;
 
 /**
  *
  * @author Orillion <orillion@rizon.net>
  */
+@Slf4j
 public class EventRegister extends Event implements EventListener
 {
-       @Inject
-       private static Logger logger;
-       
        @Inject
        private Config conf;
        
@@ -117,11 +115,11 @@ public class EventRegister extends Event implements EventListener
                }
                catch (NamingException ex)
                {
-                       logger.info("Naming Exception: ", ex.getMessage());
+                       log.info("Naming Exception: ", ex.getMessage());
                }
                catch (UnknownHostException ex)
                {
-                       logger.info("Unknown Host Exception: ", ex.getMessage());
+                       log.info("Unknown Host Exception: ", ex.getMessage());
                }
        }
 

diff --git a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/Mailhost.java b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/Mailhost.java
index aef0007cf52105ca11ebff9f10b71dcdec5c7476..21b95ad5e3ef26a7928bb28b84ac1bb75a081e04 100644 (file)
--- a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/Mailhost.java
+++ b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/Mailhost.java
@@ -11,18 +11,16 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import lombok.extern.slf4j.Slf4j;
 import net.rizon.moo.Moo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  *
  * @author Orillion <orillion@rizon.net>
  */
+@Slf4j
 public class Mailhost
 {
-       private static final Logger logger = LoggerFactory.getLogger(Mailhost.class);
-
        private static final Map<String, Mailhost> mailhosts = new HashMap<>();
        private static final Map<Integer, Mailhost> mailhostsIds = new HashMap<>();
 
@@ -227,7 +225,7 @@ public class Mailhost
                }
                catch (SQLException ex)
                {
-                       logger.info("SQL Exception: ", ex.getMessage());
+                       log.info("SQL Exception: ", ex.getMessage());
                }
        }
 
@@ -246,7 +244,7 @@ public class Mailhost
                }
                catch (SQLException ex)
                {
-                       logger.info("SQL Exception: ", ex.getMessage());
+                       log.info("SQL Exception: ", ex.getMessage());
                }
 
                mailhosts.remove(this.mailhost);

diff --git a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/dns/NS.java b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/dns/NS.java
index 2147bc7aa15fb88baf1d8c8d47f025eee74c7607..3ea9b5a44bd429a40893f3b8bc3d00749a97ffee 100644 (file)
--- a/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/dns/NS.java
+++ b/mxbl/src/main/java/net/rizon/moo/plugin/mxbl/dns/NS.java
@@ -11,17 +11,15 @@ import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InitialDirContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
  * @author Orillion <orillion@rizon.net>
  */
+@Slf4j
 public class NS
 {
-       private static final Logger logger = LoggerFactory.getLogger(NS.class);
-
        /**
         * Looks up the specified {@link RecordType}s for the given hostname.
         * <p>
@@ -87,7 +85,7 @@ public class NS
                        }
                        catch (NamingException ex)
                        {
-                               logger.info("Naming Exception: ", ex.getMessage());
+                               log.info("Naming Exception: ", ex.getMessage());
                        }
                }
                return list;