logger -> LOGGER

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/channel/ValidateEntry.java

@@ -37,7 +37,7 @@ public class ValidateEntry {
 
 	public static final String ACTIVITY_VERB_POST = "post";
 
-	private static Logger logger = Logger.getLogger(ValidateEntry.class);
+	private static Logger LOGGER = Logger.getLogger(ValidateEntry.class);
 
 	private Element entry;
 
@@ -88,13 +88,13 @@ public boolean isValid() throws NodeStoreException {
 		if ((id == null) || (true == id.getText().isEmpty())) {
 			if (null != id)
 				id.detach();
-			logger.debug("ID of the entry was missing. We add a default one to it: 1");
+			LOGGER.debug("ID of the entry was missing. We add a default one to it: 1");
 			this.entry.addElement("id").setText("1");
 		}
 
 		Element title = this.entry.element("title");
 		if (null == title) {
-			logger.debug("Title of the entry was missing. We add a default one to it: 'Post'.");
+			LOGGER.debug("Title of the entry was missing. We add a default one to it: 'Post'.");
 			title = this.entry.addElement("title");
 			title.setText("Post");
 		}
@@ -121,14 +121,15 @@ public boolean isValid() throws NodeStoreException {
 		if (null == updated) {
 
 			String updateTime = Conf.formatDate(new Date());
-			logger.debug("Update of the entry was missing. We add a default one to it: '"
+			LOGGER.debug("Update of the entry was missing. We add a default one to it: '"
 					+ updateTime + "'.");
 			this.entry.addElement("updated").setText(updateTime);
 		}
 
 		this.geoloc = this.entry.element("geoloc");
 
 		Element reply = this.entry.element("in-reply-to");
+		
 		if ((null != reply) && (false == validateInReplyToElement(reply))) {
 			return false;
 		}
@@ -238,7 +239,7 @@ private boolean validateInReplyToElement(Element reply) throws NodeStoreExceptio
 			return false;
 		}
 		if (null != nodeItem.getInReplyTo()) {
-			logger.error("User is attempting to reply to a reply");
+			LOGGER.error("User is attempting to reply to a reply");
 			this.errorMessage = MAX_THREAD_DEPTH_EXCEEDED;
 			return false;
 		}

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/Publish.java

@@ -29,7 +29,7 @@
 
 public class Publish extends PubSubElementProcessorAbstract {
 
-	private static final Logger logger = Logger.getLogger(Publish.class);
+	private static final Logger LOGGER = Logger.getLogger(Publish.class);
 
 	public static final String MISSING_ITEM_ELEMENT = "item-required";
 	public static final String NODE_ID_REQUIRED = "nodeid-required";
@@ -138,7 +138,7 @@ private ValidateEntry getEntryValidator() {
 
 	private void sendInvalidEntryResponse()
 			throws InterruptedException {
-		logger.info("Entry is not valid: '" + entryContent.getErrorMessage() + "'.");
+		LOGGER.info("Entry is not valid: '" + entryContent.getErrorMessage() + "'.");
 		createExtendedErrorReply(PacketError.Type.modify,
 				PacketError.Condition.bad_request, entryContent.getErrorMessage());
 		outQueue.put(response);
@@ -248,7 +248,7 @@ private boolean checkNode() throws InterruptedException, NodeStoreException {
 					PacketError.Condition.bad_request,
 					PacketError.Type.modify);
 			response.setError(pe);
-			logger.error(e);
+			LOGGER.error(e);
 			outQueue.put(response);
 			return false;
 		}
@@ -283,7 +283,7 @@ private void sendNotifications() throws NodeStoreException,
 		for (NodeSubscription ns : cur) {
 			JID to = ns.getUser();
 			if (ns.getSubscription().equals(Subscriptions.subscribed)) {
-				logger.debug("Sending post notification to " + to.toBareJID());
+				LOGGER.debug("Sending post notification to " + to.toBareJID());
 				msg.setTo(ns.getListener());
 				outQueue.put(msg.createCopy());
 			}