watch: use lombok for creating logger

diff --git a/watch/pom.xml b/watch/pom.xml
index 3f3aab89a3b67ed0d8b671b3e9d8c587ae09206d..048f7a1a75256d4d4bd6af8c23e4db459a395b4e 100644 (file)
--- a/watch/pom.xml
+++ b/watch/pom.xml
@@ -24,6 +24,11 @@
                        <artifactId>logging</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.projectlombok</groupId>
+                       <artifactId>lombok</artifactId>
+                       <scope>provided</scope>
+               </dependency>
        </dependencies>
        
        <build>

diff --git a/watch/src/main/java/net/rizon/moo/plugin/watch/EventWatch.java b/watch/src/main/java/net/rizon/moo/plugin/watch/EventWatch.java
index b9d65fdb2b294edea406683e8737564d81730df8..07590948a2e050aca7f52dcdec985d54dc9ea7c9 100644 (file)
--- a/watch/src/main/java/net/rizon/moo/plugin/watch/EventWatch.java
+++ b/watch/src/main/java/net/rizon/moo/plugin/watch/EventWatch.java
@@ -6,7 +6,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Date;
 import java.util.Iterator;
-
+import lombok.extern.slf4j.Slf4j;
 import net.rizon.moo.Moo;
 import net.rizon.moo.conf.Config;
 import net.rizon.moo.events.EventAkillDel;
@@ -15,13 +15,10 @@ import net.rizon.moo.events.EventOPMHit;
 import net.rizon.moo.events.InitDatabases;
 import net.rizon.moo.events.LoadDatabases;
 import net.rizon.moo.irc.Protocol;
-import org.slf4j.Logger;
 
+@Slf4j
 class EventWatch implements EventListener
 {
-       @Inject
-       private static Logger logger;
-       
        @Inject
        private Protocol protocol;
        
@@ -62,7 +59,7 @@ class EventWatch implements EventListener
                }
                catch (Exception ex)
                {
-                       logger.warn("Unable to load watch database", ex);
+                       log.warn("Unable to load watch database", ex);
                }
        }
 

diff --git a/watch/src/main/java/net/rizon/moo/plugin/watch/watch.java b/watch/src/main/java/net/rizon/moo/plugin/watch/watch.java
index 621cb88a992af954dd020abb0755e728f42e3b2f..c2cb6964bffcf22ba00bbea2894c8fa073bbe27c 100644 (file)
--- a/watch/src/main/java/net/rizon/moo/plugin/watch/watch.java
+++ b/watch/src/main/java/net/rizon/moo/plugin/watch/watch.java
@@ -10,7 +10,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
+import lombok.extern.slf4j.Slf4j;
 import net.rizon.moo.Command;
 import net.rizon.moo.Message;
 import net.rizon.moo.Moo;
@@ -19,13 +19,10 @@ import net.rizon.moo.conf.Config;
 import net.rizon.moo.events.EventListener;
 import net.rizon.moo.irc.Protocol;
 import net.rizon.moo.util.TimeDifference;
-import org.slf4j.Logger;
 
+@Slf4j
 public class watch extends Plugin
 {
-       @Inject
-       private static Logger logger;
-       
        @Inject
        private CommandWatch watch;
        
@@ -76,7 +73,7 @@ public class watch extends Plugin
                }
                catch (SQLException ex)
                {
-                       logger.warn("unable to insert watch " + e, ex);
+                       log.warn("unable to insert watch " + e, ex);
                }
        }
        
@@ -92,7 +89,7 @@ public class watch extends Plugin
                }
                catch (SQLException ex)
                {
-                       logger.warn("unable to remove watch " + e, ex);
+                       log.warn("unable to remove watch " + e, ex);
                }
        }