From 46410359c6c8aecb2dfec1edc0b182d5cc44f477 Mon Sep 17 00:00:00 2001
From: yossipapi <yossi.papiashvili@kaltura.com>
Date: Mon, 30 Sep 2024 15:48:13 +0300
Subject: [PATCH] SECF-5700: Start using log4j core&api and support logging to
 stdout

---
 sources/java/pom.xml                          | 25 ++----
 .../com/kaltura/client/KalturaLogger.java     |  2 +-
 .../kaltura/client/KalturaLoggerLog4j.java    | 81 ++++++++++++-------
 sources/java/src/main/resources/log4j2.xml    | 13 +++
 4 files changed, 76 insertions(+), 45 deletions(-)
 create mode 100644 sources/java/src/main/resources/log4j2.xml

diff --git a/sources/java/pom.xml b/sources/java/pom.xml
index eb8e8dfbf..80e988bc2 100644
--- a/sources/java/pom.xml
+++ b/sources/java/pom.xml
@@ -73,23 +73,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.15</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.24.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.24.0</version>
 		</dependency>
 
 		<!-- JUnit for testing -->
diff --git a/sources/java/src/main/java/com/kaltura/client/KalturaLogger.java b/sources/java/src/main/java/com/kaltura/client/KalturaLogger.java
index 1f53731b8..adf66f661 100644
--- a/sources/java/src/main/java/com/kaltura/client/KalturaLogger.java
+++ b/sources/java/src/main/java/com/kaltura/client/KalturaLogger.java
@@ -34,7 +34,7 @@ abstract public class KalturaLogger
 	// Creation & retrieval methods:
 	public static IKalturaLogger getLogger(String name)
 	{
-		return KalturaLoggerLog4j.get(name);
+		return new KalturaLoggerLog4j(name);
 	}
 	
 	public static IKalturaLogger getLogger(Class<?> clazz)
diff --git a/sources/java/src/main/java/com/kaltura/client/KalturaLoggerLog4j.java b/sources/java/src/main/java/com/kaltura/client/KalturaLoggerLog4j.java
index b804affc6..0364390e1 100644
--- a/sources/java/src/main/java/com/kaltura/client/KalturaLoggerLog4j.java
+++ b/sources/java/src/main/java/com/kaltura/client/KalturaLoggerLog4j.java
@@ -27,40 +27,67 @@
 // ===================================================================================================
 package com.kaltura.client;
 
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
 
 public class KalturaLoggerLog4j extends Logger implements IKalturaLogger
 {
-	protected Logger logger;
-	static protected LoggerFactory loggerFactory = new KalturaLoggerFactory();
-	
-	static class KalturaLoggerFactory implements LoggerFactory {
-		@Override
-		public Logger makeNewLoggerInstance(String name) {
-			return new KalturaLoggerLog4j(name);
-		}
-	}
-	
-	// Creation & retrieval methods:
-	public static IKalturaLogger get(String name)
-	{
-		Logger logger = LogManager.getLogger(name, loggerFactory);
-		if(logger instanceof Logger){
-			return (KalturaLoggerLog4j) logger;
-		}
-		
-		return null;
-	}
-	
-	protected KalturaLoggerLog4j(String name)
+	private org.apache.logging.log4j.Logger logger;
+
+	public KalturaLoggerLog4j(String name)
 	{
-		super(name);
+		logger = LogManager.getLogger(name);
 	}
 
 	@Override
 	public boolean isEnabled() {
-		return this.isInfoEnabled();
+		return logger.isInfoEnabled();
+	}
+	@Override
+	public void trace(Object message) {
+		logger.trace(message);
+	}
+	@Override
+	public void debug(Object message) {
+		logger.debug(message);
+	}
+	@Override
+	public void info(Object message) {
+		logger.info(message);
+	}
+	@Override
+	public void warn(Object message) {
+		logger.warn(message);
+	}
+	@Override
+	public void error(Object message) {
+		logger.error(message);
+	}
+	@Override
+	public void fatal(Object message) {
+		logger.fatal(message);
+	}
+	@Override
+	public void trace(Object message, Throwable t) {
+		logger.trace(message, t);
+	}
+	@Override
+	public void debug(Object message, Throwable t) {
+		logger.debug(message, t);
+	}
+	@Override
+	public void info(Object message, Throwable t) {
+		logger.info(message, t);
+	}
+	@Override
+	public void warn(Object message, Throwable t) {
+		logger.warn(message, t);
+	}
+	@Override
+	public void error(Object message, Throwable t) {
+		logger.error(message, t);
+	}
+	@Override
+	public void fatal(Object message, Throwable t) {
+		logger.fatal(message, t);
 	}
 }
diff --git a/sources/java/src/main/resources/log4j2.xml b/sources/java/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..87627b0da
--- /dev/null
+++ b/sources/java/src/main/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS}: %-5level{lowerCase=true} - %msg%n%n" />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="all">
+            <AppenderRef ref="Console" />
+        </Root>
+    </Loggers>
+</Configuration> 
\ No newline at end of file