Remove lombok from next set of plugins

Change-Id: I912eb22c4612741e60626f8c59e065ad98a5c05a
Reviewed-on: http://gerrit.dmdirc.com/2997
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/nma/NotifyMyAndroidClient.java

@@ -31,16 +31,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
 
 /**
  * Simple client for sending events to NotifyMyAndroid.
  */
-@Slf4j
-@RequiredArgsConstructor
 public class NotifyMyAndroidClient {
 
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(NotifyMyAndroidClient.class);
+
     /** The base URL for the NMA API. */
     private static final String BASE_URL = "https://www.notifymyandroid.com";
     /** The method to call to send a notification. */
@@ -52,6 +51,11 @@ public class NotifyMyAndroidClient {
     /** The application to report ourselves as. */
     private final String application;
 
+    public NotifyMyAndroidClient(Collection<String> apiKeys, String application) {
+        this.apiKeys = apiKeys;
+        this.application = application;
+    }
+
     /**
      * Creates a new instance of {@link NotifyMyAndroidClient} with a single
      * API key.
@@ -78,11 +82,11 @@ public class NotifyMyAndroidClient {
         arguments.put("event", event);
         arguments.put("description", description);
 
-        log.info("Sending notification to NMA for event '{}'", event);
-        log.debug("Arguments: {}", arguments);
+        LOG.info("Sending notification to NMA for event '{}'", event);
+        LOG.debug("Arguments: {}", arguments);
 
         final List<String> response = Downloader.getPage(BASE_URL + NOTIFY_PATH, arguments);
-        log.debug("Response: {}", response);
+        LOG.debug("Response: {}", response);
     }
 
     /**

src/com/dmdirc/addons/nma/NotifyMyAndroidCommand.java

@@ -32,15 +32,15 @@ import com.dmdirc.interfaces.CommandController;
 
 import java.io.IOException;
 
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.LoggerFactory;
 
 /**
  * Command to raise notifications with NotifyMyAndroid.
  */
-@Slf4j
 public class NotifyMyAndroidCommand extends Command {
 
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(NotifyMyAndroidCommand.class);
+
     /** A command info object for this command. */
     public static final BaseCommandInfo INFO = new BaseCommandInfo(
             "notifymyandroid",
@@ -49,7 +49,6 @@ public class NotifyMyAndroidCommand extends Command {
             CommandType.TYPE_GLOBAL);
 
     /** The configuration domain to retrieve settings from. */
-    @Setter
     private String configDomain;
 
     /**
@@ -61,18 +60,22 @@ public class NotifyMyAndroidCommand extends Command {
         super(controller);
     }
 
+    public void setConfigDomain(final String configDomain) {
+        this.configDomain = configDomain;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         final String[] parts = args.getArgumentsAsString().split("\\s+--\\s+", 2);
-        log.trace("Split input: {}", (Object[]) parts);
+        LOG.trace("Split input: {}", (Object[]) parts);
 
         if (parts.length != 2) {
             showUsage(origin, args.isSilent(), INFO.getName(), INFO.getHelp());
         }
 
-        log.trace("Retrieving settings from domain '{}'", configDomain);
+        LOG.trace("Retrieving settings from domain '{}'", configDomain);
         final NotifyMyAndroidClient client = new NotifyMyAndroidClient(
                 origin.getConfigManager().getOption(configDomain, "apikey"),
                 origin.getConfigManager().getOption(configDomain, "application"));
@@ -85,7 +88,7 @@ public class NotifyMyAndroidCommand extends Command {
                     client.notify(parts[0], parts[1]);
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Notification sent");
                 } catch (IOException ex) {
-                    log.info("Exception when trying to notify NMA", ex);
+                    LOG.info("Exception when trying to notify NMA", ex);
                     sendLine(origin, args.isSilent(), FORMAT_ERROR, "Unable to send: " + ex.getMessage());
                 }
             }

src/com/dmdirc/addons/osd/OsdManager.java

@@ -33,14 +33,11 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.Callable;
 
-import lombok.RequiredArgsConstructor;
-
 /**
  * Class to manage OSD Windows.
  *
  * @since 0.6.3
  */
-@RequiredArgsConstructor
 public class OsdManager {
 
     /** The window the OSD will be associated with. */
@@ -56,6 +53,14 @@ public class OsdManager {
     /** List of messages to be queued. */
     private final Queue<QueuedMessage> windowQueue = new LinkedList<>();
 
+    public OsdManager(final MainFrame mainFrame, final IdentityController identityController,
+            final OsdPlugin plugin, final ColourManager colourManager) {
+        this.mainFrame = mainFrame;
+        this.identityController = identityController;
+        this.plugin = plugin;
+        this.colourManager = colourManager;
+    }
+
     /**
      * Add messages to the queue and call displayWindows.
      *

src/com/dmdirc/addons/parser_xmpp/XmppParser.java

@@ -57,8 +57,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import lombok.extern.slf4j.Slf4j;
-
 import org.jivesoftware.smack.Chat;
 import org.jivesoftware.smack.ChatManagerListener;
 import org.jivesoftware.smack.ConnectionConfiguration;
@@ -76,6 +74,7 @@ import org.jivesoftware.smackx.ChatState;
 import org.jivesoftware.smackx.ChatStateListener;
 import org.jivesoftware.smackx.ChatStateManager;
 import org.jivesoftware.smackx.muc.MultiUserChat;
+import org.slf4j.LoggerFactory;
 
 /**
  * A parser which can understand the XMPP protocol.
@@ -84,9 +83,10 @@ import org.jivesoftware.smackx.muc.MultiUserChat;
     XmppClientInfo.class, XmppLocalClientInfo.class, XmppFakeChannel.class,
     XmppChannelClientInfo.class
 })
-@Slf4j
 public class XmppParser extends BaseSocketAwareParser {
 
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(XmppParser.class);
+
     /** Pattern to use to extract priority. */
     private static final Pattern PRIORITY_PATTERN
             = Pattern.compile("(?i)(?:^|&)priority=([0-9]+)(?:$|&)");
@@ -130,7 +130,7 @@ public class XmppParser extends BaseSocketAwareParser {
             priority = matcher.find() ? Integer.parseInt(matcher.group(1)) : 0;
         }
 
-         log.debug("XMPP parser created with query string {}, parsed fake channel = {}, priority = {}",
+         LOG.debug("XMPP parser created with query string {}, parsed fake channel = {}, priority = {}",
                  new Object[] { address.getQuery(), useFakeChannel, priority });
     }
 
@@ -397,7 +397,7 @@ public class XmppParser extends BaseSocketAwareParser {
     @Override
     public void sendMessage(final String target, final String message) {
         if (!chats.containsKey(target)) {
-            log.debug("Creating new chat for {}", target);
+            LOG.debug("Creating new chat for {}", target);
             chats.put(target, connection.getChatManager().createChat(target, new MessageListenerImpl()));
         }
 
@@ -511,7 +511,7 @@ public class XmppParser extends BaseSocketAwareParser {
                 }
             }
         } catch (XMPPException ex) {
-            log.debug("Go an XMPP exception", ex);
+            LOG.debug("Go an XMPP exception", ex);
 
             connection = null;
 
@@ -536,7 +536,7 @@ public class XmppParser extends BaseSocketAwareParser {
      * @param isBack True if the client is coming back, false if they're going away
      */
     public void handleAwayStateChange(final XmppClientInfo client, final boolean isBack) {
-        log.debug("Handling away state change for {} to {}", client.getNickname(), isBack);
+        LOG.debug("Handling away state change for {} to {}", client.getNickname(), isBack);
 
         if (useFakeChannel) {
             getCallback(OtherAwayStateListener.class)
@@ -573,7 +573,7 @@ public class XmppParser extends BaseSocketAwareParser {
     /** {@inheritDoc} */
     @Override
     public void setCompositionState(final String host, final CompositionState state) {
-        log.debug("Setting composition state for {} to {}", host, state);
+        LOG.debug("Setting composition state for {} to {}", host, state);
 
         final Chat chat = chats.get(parseHostmask(host)[0]);
 
@@ -597,7 +597,7 @@ public class XmppParser extends BaseSocketAwareParser {
                 stateManager.setCurrentState(newState, chat);
             } catch (XMPPException ex) {
                 // Can't set chat state... Oh well?
-                log.info("Couldn't set composition state", ex);
+                LOG.info("Couldn't set composition state", ex);
             }
         }
     }

src/com/dmdirc/addons/relaybot/RelayBotPlugin.java

@@ -51,12 +51,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import lombok.RequiredArgsConstructor;
-
 /**
  * This plugin makes certain relay bots less obnoxious looking.
  */
-@RequiredArgsConstructor
 public class RelayBotPlugin extends BasePlugin implements ActionListener, ConfigChangeListener {
 
     /** Known RelayChannelHandlers. */
@@ -68,6 +65,13 @@ public class RelayBotPlugin extends BasePlugin implements ActionListener, Config
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
 
+    public RelayBotPlugin(final PluginInfo pluginInfo, final ServerManager serverManager,
+            final IdentityController identityController) {
+        this.pluginInfo = pluginInfo;
+        this.serverManager = serverManager;
+        this.identityController = identityController;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onLoad() {