#632 - Use static loggers

meveo-org · Nov 16, 2022 · 56752ef · 56752ef
1 parent 5de7647
commit 56752ef
Show file tree

Hide file tree

Showing 142 changed files with 599 additions and 385 deletions.
diff --git a/...o-admin-ejbs/src/main/java/org/hibernate/util/JoinedAutoStaleObjectEvictingPersister.java b/...o-admin-ejbs/src/main/java/org/hibernate/util/JoinedAutoStaleObjectEvictingPersister.java
@@ -26,7 +26,7 @@
  */
 public class JoinedAutoStaleObjectEvictingPersister extends JoinedSubclassEntityPersister {
 
-	private Logger log = LoggerFactory.getLogger(this.getClass());
+	private static Logger log = LoggerFactory.getLogger(JoinedAutoStaleObjectEvictingPersister.class);
 
 	public JoinedAutoStaleObjectEvictingPersister(PersistentClass persistentClass, EntityDataAccess cacheAccessStrategy, NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			PersisterCreationContext creationContext) throws HibernateException {

diff --git a/...o-admin-ejbs/src/main/java/org/hibernate/util/SingleAutoStaleObjectEvictingPersister.java b/...o-admin-ejbs/src/main/java/org/hibernate/util/SingleAutoStaleObjectEvictingPersister.java
@@ -26,7 +26,7 @@
  */
 public class SingleAutoStaleObjectEvictingPersister extends SingleTableEntityPersister {
 
-	private Logger log = LoggerFactory.getLogger(this.getClass());
+	private static Logger log = LoggerFactory.getLogger(SingleAutoStaleObjectEvictingPersister.class);
 
 	public SingleAutoStaleObjectEvictingPersister(PersistentClass persistentClass, EntityDataAccess cacheAccessStrategy, NaturalIdDataAccess naturalIdRegionAccessStrategy,
 			PersisterCreationContext creationContext) throws HibernateException {

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/async/FlatFileProcessingAsync.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/async/FlatFileProcessingAsync.java
@@ -35,6 +35,7 @@
 import org.meveo.service.script.ScriptInterface;
 import org.meveo.util.ApplicationProvider;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Asynchronous FlatFile processing.
@@ -50,8 +51,7 @@ public class FlatFileProcessingAsync {
 	private static final String THREAD_POOL_SIZE = FlatFileProcessingJob.FLAT_FILE_PROCESSING_JOB_THREAD_POOL_SIZE;
 
 	/** The log. */
-	@Inject
-	private Logger log;
+	private static Logger log = LoggerFactory.getLogger(FlatFileProcessingAsync.class);
 
 	/** The unit flat file processing job bean. */
 	@Inject

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoDefaultFtplet.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoDefaultFtplet.java
@@ -20,14 +20,16 @@
 import org.meveo.model.mediation.MeveoFtpFile;
 import org.meveo.service.admin.impl.UserService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Stateless
 public class MeveoDefaultFtplet extends DefaultFtplet {
-	@Inject
-	private Logger log;
+
+	private static Logger log = LoggerFactory.getLogger(MeveoDefaultFtplet.class);
 
 	@Inject
 	@FileUpload
+
 	private Event<MeveoFtpFile> upload;
 
 	@Inject

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoFtpUserManager.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoFtpUserManager.java
@@ -35,7 +35,7 @@ public class MeveoFtpUserManager extends AbstractUserManager {
     private static final int HOUR = 60 * 60;
     private static final String ADMINISTRATOR = "administrateur";
 
-    private Logger log = LoggerFactory.getLogger(MeveoFtpUserManager.class);
+    private static Logger log = LoggerFactory.getLogger(MeveoFtpUserManager.class);
 
     private UserService userService;
 

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoMinaFTPListener.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/ftp/MeveoMinaFTPListener.java
@@ -20,6 +20,7 @@
 import org.meveo.commons.utils.StringUtils;
 import org.meveo.service.admin.impl.UserService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -31,8 +32,9 @@
 // @Startup
 @Singleton
 public class MeveoMinaFTPListener {
-    @Inject
-    private Logger log;
+
+    private static Logger log = LoggerFactory.getLogger(MeveoMinaFTPListener.class);
+
     @Inject
     private UserService userService;
 

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FileProcessingJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FileProcessingJobBean.java
@@ -13,6 +13,7 @@
 import org.meveo.service.script.ScriptInterface;
 import org.meveo.util.ApplicationProvider;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.ejb.Stateless;
 import javax.ejb.TransactionAttribute;
@@ -31,8 +32,7 @@
 public class FileProcessingJobBean {
 
     /** The log. */
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(FileProcessingJobBean.class);
 
     /** The script instance service. */
     @Inject

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FilteringJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FilteringJobBean.java
@@ -31,6 +31,7 @@
 import org.meveo.service.script.ScriptInstanceService;
 import org.meveo.service.script.ScriptInterface;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The FilteringJobBean have 2 mains inputs :ScriptInstance and Filter. For each filtered entity the scriptInstance are executed.
@@ -41,8 +42,7 @@
 @Stateless
 public class FilteringJobBean {
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(FilteringJobBean.class);
 
     @Inject
     private FilterService filterService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FlatFileProcessingJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FlatFileProcessingJobBean.java
@@ -32,6 +32,7 @@
 import org.meveo.service.script.ScriptInstanceService;
 import org.meveo.service.script.ScriptInterface;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Class FlatFileProcessingJobBean.
@@ -44,8 +45,7 @@
 public class FlatFileProcessingJobBean {
 
     /** The log. */
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(FlatFileProcessingJobBean.class);
 
     /** The script instance service. */
     @Inject

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FtpAdapterJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/FtpAdapterJobBean.java
@@ -38,6 +38,7 @@
 import org.meveo.service.job.FtpImportedFileService;
 import org.meveo.service.job.JobExecutionService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Class FtpAdapterJobBean.
@@ -49,8 +50,7 @@
 public class FtpAdapterJobBean {
 
     /** The log. */
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(FtpAdapterJobBean.class);
 
     /** The ftp imported file service. */
     @Inject

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/GenerateMediationImport.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/GenerateMediationImport.java
@@ -11,6 +11,7 @@
 
 import org.meveo.commons.utils.StringUtils;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Edward P. Legaspi
@@ -31,8 +32,7 @@ public static void main(String args[]) {
 		new GenerateMediationImport();
 	}
 
-	@Inject
-	private Logger log;
+	private static Logger log = LoggerFactory.getLogger(GenerateMediationImport.class);
 
 	public GenerateMediationImport() {
 		System.out.println("start creating mediation file...");

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/ReportExtractJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/ReportExtractJobBean.java
@@ -24,6 +24,7 @@
 import org.meveo.service.crm.impl.CustomFieldInstanceService;
 import org.meveo.service.finance.ReportExtractService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * List all ReportExtract and dispatched for asynch execution.
@@ -38,8 +39,7 @@ public class ReportExtractJobBean implements Serializable {
 
     private static final long serialVersionUID = 9159856207913605563L;
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(ReportExtractJobBean.class);
 
     @Inject
     private CustomFieldInstanceService customFieldInstanceService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/ScriptingJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/ScriptingJobBean.java
@@ -18,11 +18,11 @@
 import org.meveo.service.script.ScriptInstanceService;
 import org.meveo.service.script.ScriptInterface;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ScriptingJobBean {
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(ScriptingJobBean.class);
 
     @Inject
     private ScriptInstanceService scriptInstanceService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/UnitReportExtractJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/UnitReportExtractJobBean.java
@@ -18,6 +18,7 @@
 import org.meveo.service.finance.ReportExtractService;
 import org.meveo.service.script.finance.ReportExtractScript;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Extension class for JobExtractReport to start a new transaction.
@@ -31,8 +32,7 @@ public class UnitReportExtractJobBean {
 
     private ParamBean paramBean = ParamBean.getInstance();
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(UnitReportExtractJobBean.class);
 
     @Inject
     private ReportExtractService reportExtractService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/UnitWorkflowJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/UnitWorkflowJobBean.java
@@ -14,6 +14,7 @@
 import org.meveo.model.wf.Workflow;
 import org.meveo.service.wf.WorkflowService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -23,8 +24,7 @@
 @Stateless
 public class UnitWorkflowJobBean {
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(UnitWorkflowJobBean.class);
 
     @Inject
     private WorkflowService workflowService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/WorkflowJobBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/WorkflowJobBean.java
@@ -27,12 +27,12 @@
 import org.meveo.service.filter.FilterService;
 import org.meveo.service.wf.WorkflowService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Stateless
 public class WorkflowJobBean {
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(WorkflowJobBean.class);
 
     @Inject
     private FilterService filterService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/dwh/DWHQueryBean.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/dwh/DWHQueryBean.java
@@ -41,6 +41,7 @@
 import org.neo4j.driver.Session;
 import org.neo4j.driver.Transaction;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Stateless
 public class DWHQueryBean {
@@ -55,8 +56,7 @@ public class DWHQueryBean {
     @MeveoJpa
     private EntityManagerWrapper emWrapper;
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(DWHQueryBean.class);
 
     @Inject
     private JobExecutionService jobExecutionService;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/logging/JobLoggingInterceptor.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/job/logging/JobLoggingInterceptor.java
@@ -20,7 +20,7 @@ public class JobLoggingInterceptor implements Serializable{
 	 * 
 	 */
 	private static final long serialVersionUID = 8509493016090519457L;
-	private Logger log = LoggerFactory.getLogger(this.getClass());
+	private static Logger log = LoggerFactory.getLogger(JobLoggingInterceptor.class);
 
 	@AroundInvoke
 	public Object aroundInvoke(InvocationContext invocationContext)

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/listener/ApplicationInitializer.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/listener/ApplicationInitializer.java
@@ -23,6 +23,7 @@
 import org.meveo.service.script.ScriptInstanceService;
 import org.primefaces.model.SortOrder;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Takes care of initializing/loading various application services/data
@@ -52,8 +53,7 @@ public class ApplicationInitializer {
     @Inject
     private EntityManagerProvider entityManagerProvider;
 
-    @Inject
-    private Logger log;
+    private static Logger log = LoggerFactory.getLogger(ApplicationInitializer.class);
 
     @Inject
     private NotificationCacheContainerProvider notifCache;

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/listener/StartupListener.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/listener/StartupListener.java
@@ -67,6 +67,7 @@
 import org.meveo.service.storage.RemoteRepositoryService;
 import org.meveo.service.storage.RepositoryService;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Edward P. Legaspi | czetsuya@gmail.com
@@ -92,8 +93,7 @@ public class StartupListener {
 	@Inject
 	private RemoteRepositoryService remoteRepositoryService;
 
-	@Inject
-	private Logger log;
+	private static Logger log = LoggerFactory.getLogger(StartupListener.class);
 
 	@Inject
 	@MeveoJpa

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/patches/PatchExecutionService.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/patches/PatchExecutionService.java
@@ -16,6 +16,7 @@
 import org.meveo.jpa.MeveoJpa;
 import org.meveo.model.patch.PatchExecution;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Service to execute patches
@@ -34,8 +35,7 @@ public class PatchExecutionService implements MeveoInitializer {
 	@Any
 	private Instance<Patch> patches;
 
-	@Inject
-	private Logger log;
+	private static Logger log = LoggerFactory.getLogger(PatchExecutionService.class);
 
 	/**
 	 * Execute every non-executed patch

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/admin/util/LoggerProducer.java b/meveo-admin-ejbs/src/main/java/org/meveo/admin/util/LoggerProducer.java
diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/audit/logging/writer/AuditEventDBWriter.java b/meveo-admin-ejbs/src/main/java/org/meveo/audit/logging/writer/AuditEventDBWriter.java
@@ -9,13 +9,16 @@
 import org.meveo.commons.utils.StringUtils;
 import org.meveo.model.audit.logging.AuditLog;
 import org.meveo.service.base.PersistenceService;
+import org.meveo.service.custom.CustomEntityTemplateService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Edward P. Legaspi
  **/
 @Stateless
 public class AuditEventDBWriter extends PersistenceService<AuditLog> {
-
+	
 	public void write(AuditEvent auditEvent) throws BusinessException {
 		AuditLog auditLog = new AuditLog();
 		auditLog.setAction(auditEvent.getAction());

diff --git a/meveo-admin-ejbs/src/main/java/org/meveo/commons/utils/CsvBuilder.java b/meveo-admin-ejbs/src/main/java/org/meveo/commons/utils/CsvBuilder.java
@@ -33,7 +33,7 @@
 
 public class CsvBuilder {
 
-	private Logger log = LoggerFactory.getLogger(CsvBuilder.class);
+	private static Logger log = LoggerFactory.getLogger(CsvBuilder.class);
 
 	/** Creates a new instance of CsvBuilder */
 	private final static String BREAK_LINE = "\r\n";