use private slf4j logger where possible

logger objects should be always a private var internal to the specific class
hmng · Jan 15, 2016 · 854b506 · 854b506
1 parent ae42348
commit 854b506
Show file tree

Hide file tree

Showing 264 changed files with 1,946 additions and 2,095 deletions.
diff --git a/Applications/BugTracker/Sources/er/bugtracker/components/PageWrapper.java b/Applications/BugTracker/Sources/er/bugtracker/components/PageWrapper.java
@@ -6,7 +6,9 @@
  * included with this distribution in the LICENSE.NPL file.  */
 
 package er.bugtracker.components;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
@@ -21,7 +23,7 @@
 import er.extensions.foundation.ERXPatcher;
 
 public class PageWrapper extends WOComponent {
-    static final Logger log = Logger.getLogger(PageWrapper.class);
+    private static final Logger log = LoggerFactory.getLogger(PageWrapper.class);
 
     public PageWrapper(WOContext aContext) {
         super(aContext);
@@ -71,10 +73,8 @@ public NSKeyValueCoding navigationContext() {
             session().setObjectForKey(context, "navigationContext");
         }
         ERXNavigationState state = ERXNavigationManager.manager().navigationStateForSession(session());
-        log.debug("NavigationState:" + state + "," + state.state() + "," + state.stateAsString());
-        //log.info("navigationContext:" + session().objectForKey("navigationContext"));
+        log.debug("NavigationState: {}, {}, {}", state, state.state(), state.stateAsString());
+        //log.info("navigationContext: {}", session().objectForKey("navigationContext"));
         return context;
     }
 }
-
-
diff --git a/Applications/BugTracker/Sources/er/bugtracker/components/reporting/Report.java b/Applications/BugTracker/Sources/er/bugtracker/components/reporting/Report.java
@@ -1,6 +1,7 @@
 package er.bugtracker.components.reporting;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOContext;
 import com.webobjects.foundation.NSDictionary;
@@ -10,7 +11,7 @@
 import er.reporting.WRReport;
 
 public class Report extends WRReport {
-    private static final Logger log = Logger.getLogger(Report.class);
+    private static final Logger log = LoggerFactory.getLogger(Report.class);
 
     public Report(WOContext context) {
         super(context);
@@ -24,12 +25,12 @@ public boolean synchronizesVariablesWithBindings() {
 
     @Override
     public Object handleQueryWithUnboundKey(String key) {
-        log.error("handleQueryWithUnboundKey: " + key, new RuntimeException("Stacktrace"));
+        log.error("handleQueryWithUnboundKey: {}", key, new RuntimeException("Stacktrace"));
         return null;
     }
 
     public void handleTakeValueWithUnboundKey(Object o, String key) {
-        log.error(key);
+        log.error("handleTakeValueWithUnboundKey: {}", key);
     }
 
     @Override

diff --git a/Applications/BugTracker/Sources/er/bugtracker/tests/Selenium.java b/Applications/BugTracker/Sources/er/bugtracker/tests/Selenium.java
@@ -1,6 +1,7 @@
 package er.bugtracker.tests;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOActionResults;
 import com.webobjects.appserver.WOCookie;
@@ -24,7 +25,7 @@
 import er.selenium.SeleniumAction;
 
 public class Selenium extends SeleniumAction  {
-	public final static Logger log = Logger.getLogger(Selenium.class);
+	private final static Logger log = LoggerFactory.getLogger(Selenium.class);
 
 	public static final String USERNAME = "sel_name";
 	public static final String PASSWORD = "sel_pass";
@@ -51,7 +52,7 @@ private void deleteTestPeople() {
 	        } finally {
 	            ec.unlock();
 	        }
-	        log.debug("People " + USERNAME + " deleted");
+	        log.debug("People {} deleted", USERNAME);
 	    }
 	}
 
@@ -63,7 +64,7 @@ private People addTestPeople(boolean isAdmin) {
 		people.setPassword(PASSWORD);
 		people.setIsAdmin(isAdmin);
 		ec.saveChanges();
-		log.debug("People " + USERNAME + " added");
+		log.debug("People {} added", USERNAME);
 		return people;
 	}
 

diff --git a/Applications/SecretPal/Sources/com/secretpal/SPUtilities.java b/Applications/SecretPal/Sources/com/secretpal/SPUtilities.java
@@ -1,6 +1,7 @@
 package com.secretpal;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.secretpal.components.person.SPGroupInvitationEmail;
 import com.secretpal.components.person.SPGroupInvitationTextEmail;
@@ -23,7 +24,7 @@
 import er.javamail.ERMessage;
 
 public class SPUtilities {
-	public static Logger log = Logger.getLogger(SPUtilities.class);
+	private static final Logger log = LoggerFactory.getLogger(SPUtilities.class);
 
 	public static final String CONFIRMATION_CODE_KEY = "confirmationCode";
 	public static final String RESET_PASSWORD_CODE_KEY = "resetPasswordCode";
@@ -66,7 +67,7 @@ public static boolean sendEmailToPerson(String subject, WOComponent component, W
 				editingContext.unlock();
 			}
 			editingContext.dispose();
-			SPUtilities.log.error("Failed to send email to '" + person.emailAddress() + "'.", e);
+			log.error("Failed to send email to '{}'.", person.emailAddress(), e);
 			errorNoticeList.addNotice("Failed to send email: " + e.getMessage());
 		}
 		return sentEmail;

diff --git a/Applications/SecretPal/Sources/com/secretpal/components/group/SPGroupEditPage.java b/Applications/SecretPal/Sources/com/secretpal/components/group/SPGroupEditPage.java
@@ -1,5 +1,8 @@
 package com.secretpal.components.group;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.secretpal.SPUtilities;
 import com.secretpal.components.application.SPPage;
 import com.secretpal.model.SPEvent;
@@ -13,6 +16,7 @@
 import er.extensions.eof.ERXEC;
 
 public class SPGroupEditPage extends SPPage {
+  private static final Logger log = LoggerFactory.getLogger(SPUtilities.class);
   private SPGroup _group;
   public SPMembership _membership;
   public String _inviteEmailAddresses;
@@ -104,7 +108,7 @@ public WOActionResults resendInvitation() {
     catch (Exception e) {
       localMembership.person().setEmailDeliveryFailure(Boolean.TRUE);
       session().errors().addNotice("Failed to send invitation to '" + localMembership.personName() + "': " + e.getMessage());
-      SPUtilities.log.error("Failed to send invitation to '" + localMembership.personName() + "'.", e);
+      log.error("Failed to send invitation to '{}'.", localMembership.personName(), e);
     }
     return null;
   }

diff --git a/Applications/SecretPal/Sources/com/secretpal/model/SPEvent.java b/Applications/SecretPal/Sources/com/secretpal/model/SPEvent.java
@@ -2,7 +2,8 @@
 
 import java.security.SecureRandom;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.foundation.NSArray;
@@ -12,7 +13,7 @@
 import er.extensions.eof.ERXEOControlUtilities;
 
 public class SPEvent extends _SPEvent {
-	private static Logger log = Logger.getLogger(SPEvent.class);
+	private static Logger log = LoggerFactory.getLogger(SPEvent.class);
 
 	public boolean hasAssignedSecretPals() {
 		return secretPals().count() > 0;
@@ -31,15 +32,15 @@ public void reassignSecretPals() {
 		NSArray<SPPerson> eligibleGivers = _eligibleGivers(allPeople);
 		NSMutableArray<SPPerson> consumedReceivers = new NSMutableArray<SPPerson>();
 
-		log.info(eligibleGivers.count() + " eligible givers out of " + allPeople.count() + " people");
+		log.info("{} eligible givers out of {} people", eligibleGivers.count(), allPeople.count());
 
     SecureRandom random = new SecureRandom();
 		long a = System.currentTimeMillis();
 		int numberOfAttempts = 0;
 		int maxNumberOfAttempts = 100;
 		boolean doneWithSecretPals = false;
 		while (!doneWithSecretPals && numberOfAttempts < maxNumberOfAttempts) {
-			log.info("attempt #" + numberOfAttempts + " of " + maxNumberOfAttempts);
+			log.info("attempt #{} of {}", numberOfAttempts, maxNumberOfAttempts);
 			EOEditingContext nestedEditingContext = ERXEC.newEditingContext(editingContext());
 			nestedEditingContext.lock();
 			SPEvent localEvent = localInstanceIn(nestedEditingContext);
@@ -51,7 +52,7 @@ public void reassignSecretPals() {
 	        }
           int selectedReceiverNum = Math.abs(random.nextInt()) % eligibleReceivers.count();
           SPPerson selectedReceiver = eligibleReceivers.objectAtIndex(selectedReceiverNum);
-          log.info("   " + selectedGiver.name() + "=>" + selectedReceiver.name() + ", " +selectedGiver + "," + selectedReceiver);
+          log.info("   {}=>{}, {}, {}", selectedGiver.name(), selectedReceiver.name(), selectedGiver, selectedReceiver);
           SPSecretPal.createSPSecretPal(nestedEditingContext, localEvent, selectedGiver.localInstanceIn(nestedEditingContext), selectedReceiver.localInstanceIn(nestedEditingContext));
           consumedReceivers.addObject(selectedReceiver);
 			  }
@@ -66,7 +67,7 @@ public void reassignSecretPals() {
 				nestedEditingContext.dispose();
 			}
 		}
-		log.info("done in " + (System.currentTimeMillis() - a) + "ms");
+		log.info("done in {}ms", System.currentTimeMillis() - a);
 		if (!doneWithSecretPals) {
 			throw new IllegalStateException("Failed to assign secret pals after " + numberOfAttempts + " attempts.");
 		}

diff --git a/Applications/WOTested/Sources/org/ganymede/ui/AddResultsPage.java b/Applications/WOTested/Sources/org/ganymede/ui/AddResultsPage.java
@@ -1,7 +1,8 @@
 
 package org.ganymede.ui;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOActionResults;
 import com.webobjects.appserver.WOContext;
@@ -15,8 +16,7 @@
 import er.extensions.components.ERXComponent;
 
 public class AddResultsPage extends ERXComponent {
-
-    private final Logger log = Logger.getLogger(AddResultsPage.class);
+    private static final Logger log = LoggerFactory.getLogger(AddResultsPage.class);
 
     public AddResultsPage(WOContext context) {
         super(context);
@@ -35,7 +35,7 @@ public WOActionResults add() {
 
         NSMutableArray<String> resultLines = new NSMutableArray<String>();
 
-        log.debug("boxResults lines # "+lines.size());
+        log.debug("boxResults lines # {}", lines.size());
         for (String line : lines) {
             line = line.replace("[java]", "");
             line = line.trim();

diff --git a/Applications/WOTested/Sources/org/ganymede/ui/AddTestResultPage.java b/Applications/WOTested/Sources/org/ganymede/ui/AddTestResultPage.java
@@ -1,7 +1,8 @@
 
 package org.ganymede.ui;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOContext;
 import com.webobjects.eoaccess.EOUtilities;
@@ -14,8 +15,7 @@
 import er.extensions.eof.ERXEC;
 
 public class AddTestResultPage extends ERXComponent {
-
-    private final Logger log = Logger.getLogger(AddTestResultPage.class);
+    private static final Logger log = LoggerFactory.getLogger(AddTestResultPage.class);
 
     public AddTestResultPage(WOContext context) {
         super(context);

diff --git a/Applications/wotaskd/Sources/com/webobjects/monitor/wotaskd/LifebeatRequestHandler.java b/Applications/wotaskd/Sources/com/webobjects/monitor/wotaskd/LifebeatRequestHandler.java
@@ -15,7 +15,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOApplication;
 import com.webobjects.appserver.WORequest;
@@ -28,9 +29,7 @@
 import com.webobjects.monitor._private.MInstance;
 
 public class LifebeatRequestHandler extends WORequestHandler {
-
-    private static final Logger log = Logger.getLogger(LifebeatRequestHandler.class);
-
+    private static final Logger log = LoggerFactory.getLogger(LifebeatRequestHandler.class);
 
     InetAddress myInetAddress;
     String myName;
@@ -82,7 +81,7 @@ private WOResponse _handleRequest(WORequest aRequest) {
         NSArray values = NSArray.componentsSeparatedByString(aRequest.queryString(), "&");
         if ( (values == null) || (values.count() != 4) ) {
             theApplication.siteConfig().globalErrorDictionary.takeValueForKey((myName + ": Received bad lifebeat: " + aRequest.queryString()), aRequest.queryString());
-            log.error(myName + ": Received bad lifebeat: " + aRequest.queryString());
+            log.error("{}: Received bad lifebeat: {}", myName, aRequest.queryString());
         } else {
             String notificationType = (String)values.objectAtIndex(0);
             String instanceName = (String)values.objectAtIndex(1);
@@ -115,7 +114,7 @@ private WOResponse _handleRequest(WORequest aRequest) {
                 aResponse = null;
             } else {
                 theApplication.siteConfig().globalErrorDictionary.takeValueForKey((myName + ": Received bad lifebeat: " + aRequest.queryString()), aRequest.queryString());
-                log.error(myName + ": Received bad lifebeat: " + aRequest.queryString());
+                log.error("{}: Received bad lifebeat: {}", myName, aRequest.queryString());
             }
         }
         if ("HTTP/1.0".equals(aRequest.httpVersion())) {
@@ -129,7 +128,7 @@ private InetAddress addressForName(String name) {
         try {
            return InetAddress.getByName(name);
         } catch (UnknownHostException uhe) {
-            log.error("Unknown host: " + name);
+            log.error("Unknown host: {}", name);
         }
         return null;
     }

diff --git a/Examples/Ajax/AjaxExample/Sources/LongResponseExample.java b/Examples/Ajax/AjaxExample/Sources/LongResponseExample.java
@@ -1,12 +1,12 @@
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOActionResults;
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
 
 public class LongResponseExample extends WOComponent {
-
-	static Logger log = Logger.getLogger(LongResponseExample.class);
+	private static final Logger log = LoggerFactory.getLogger(LongResponseExample.class);
 
 	public static class Task extends Thread {
 		int stage = 0;

diff --git a/Examples/Ajax/AjaxExample/Sources/ProxyExample.java b/Examples/Ajax/AjaxExample/Sources/ProxyExample.java
@@ -1,11 +1,12 @@
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.metaparadigm.dict.DictClient;
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
 
 public class ProxyExample extends WOComponent {
-    private Logger log=Logger.getLogger(ProxyExample.class);
+    private static final Logger log = LoggerFactory.getLogger(ProxyExample.class);
     private int _counter = 0;
     private DictClient _dict;
 
@@ -14,7 +15,7 @@ public ProxyExample(WOContext context) {
     }
 
     public int addMore(int x) {
-    	log.info("ProxyExample.addMore(" +x+ ")");
+        log.info("ProxyExample.addMore({})", Integer.valueOf(x));
         return _counter = _counter + x;
     }
 

diff --git a/Examples/Ajax/AjaxExample/Sources/UpdateDisplayGroupExample.java b/Examples/Ajax/AjaxExample/Sources/UpdateDisplayGroupExample.java
@@ -1,4 +1,5 @@
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
@@ -11,7 +12,7 @@
 import er.ajax.example.Word;
 
 public class UpdateDisplayGroupExample extends WOComponent {
-	private static final Logger log = Logger.getLogger(UpdateDisplayGroupExample.class);
+	private static final Logger log = LoggerFactory.getLogger(UpdateDisplayGroupExample.class);
 
 	public WODisplayGroup dg;
 	public Word current;
@@ -73,6 +74,6 @@ public void selectObject() {
 
 	public void save() {
 		// do nothing
-		log.info(dg.selectedObject());
+		log.info("{}", dg.selectedObject());
 	}
 }
diff --git a/...ndTasks/Sources/wowodc/background/controllers/CustomNextPageForErrorResultController.java b/...ndTasks/Sources/wowodc/background/controllers/CustomNextPageForErrorResultController.java
@@ -1,6 +1,7 @@
 package wowodc.background.controllers;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import wowodc.background.utilities.Utilities;
 
@@ -16,15 +17,14 @@
  * @author kieran
  */
 public class CustomNextPageForErrorResultController implements IERXPerformWOActionForResult {
-	private static final Logger log = Logger.getLogger(CustomNextPageForErrorResultController.class);
+	private static final Logger log = LoggerFactory.getLogger(CustomNextPageForErrorResultController.class);
 
 	private Exception _result = null;
 	private final WOComponent _nextPage;
 
 	public CustomNextPageForErrorResultController(WOComponent pageThatInitiatedTheTask) {
 		_nextPage = pageThatInitiatedTheTask;
-		if (log.isDebugEnabled())
-			log.debug("Constructor called with WOComponent argument = " + pageThatInitiatedTheTask);
+		log.debug("Constructor called with WOComponent argument = {}", pageThatInitiatedTheTask);
 	}
 
 	public WOActionResults performAction() {