Ensure type safety

(cherry picked from commit ebb9788)

Author: mrodbratschi

common/src/main/java/com/genexus/diagnostics/Log.java

@@ -29,26 +29,24 @@ public static void write(int logLevel, String message, String topic) {
 
 	public static void write(String message, String topic, int logLevel) {
 		ILogger log = getLogger(topic);
-	
-		switch (logLevel) {			
-			case LogLevel.OFF: //LogLevel off
+		LogLevel level = LogLevel.fromInt(logLevel);
+
+		switch (level) {
+			case OFF: //LogLevel off
 				break;
-			case LogLevel.TRACE:
+			case TRACE:
 				log.trace(message);
 				break;
-			case LogLevel.DEBUG:
-				log.debug(message);
-				break;
-			case LogLevel.INFO:
+			case INFO:
 				log.info(message);
 				break;
-			case LogLevel.WARNING:
+			case WARNING:
 				log.warn(message);
 				break;
-			case LogLevel.ERROR:
+			case ERROR:
 				log.error(message);
 				break;
-			case LogLevel.FATAL:
+			case FATAL:
 				log.fatal(message);
 				break;
 			default:

common/src/main/java/com/genexus/diagnostics/LogLevel.java

@@ -1,13 +1,24 @@
 package com.genexus.diagnostics;
 
-public class LogLevel {
-	
-	public static final int OFF = 0;
-	public static final int TRACE = 1;
-	public static final int DEBUG = 5;
-	public static final int INFO = 10;
-	public static final int WARNING = 15;
-	public static final int ERROR = 20;
-	public static final int FATAL = 30;
-	
+public enum LogLevel {
+	OFF(0),
+	TRACE(1),
+	DEBUG(5),
+	INFO(10),
+	WARNING(15),
+	ERROR(20),
+	FATAL(30);
+
+	private final int lvl;
+	LogLevel(int lvl) { this.lvl = lvl; }
+	public int intValue() { return lvl; }
+
+	public static LogLevel fromInt(int lvl) {
+		for (LogLevel level : LogLevel.values()) {
+			if (level.intValue() == lvl) {
+				return level;
+			}
+		}
+		return LogLevel.OFF;
+	}
 }

common/src/main/java/com/genexus/diagnostics/UserLog.java

@@ -28,28 +28,26 @@ private static ILogger getLogger(String topic) {
 		return log;
 	}
 
-	public static void write( int logLevel, String message, String topic) {
+	public static void write(int logLevel, String message, String topic) {
 		ILogger log = getLogger(topic);
+		LogLevel level = LogLevel.fromInt(logLevel);
 
-		switch (logLevel) {
-			case LogLevel.OFF: //LogLevel off
+		switch (level) {
+			case OFF: //LogLevel off
 				break;
-			case LogLevel.TRACE:
+			case TRACE:
 				log.trace(message);
 				break;
-			case LogLevel.DEBUG:
-				log.debug(message);
-				break;
-			case LogLevel.INFO:
+			case INFO:
 				log.info(message);
 				break;
-			case LogLevel.WARNING:
+			case WARNING:
 				log.warn(message);
 				break;
-			case LogLevel.ERROR:
+			case ERROR:
 				log.error(message);
 				break;
-			case LogLevel.FATAL:
+			case FATAL:
 				log.fatal(message);
 				break;
 			default:

wrappercommon/src/main/java/com/genexus/diagnostics/core/provider/Log4J2Logger.java

@@ -288,13 +288,14 @@ private void writeJsonFormat(String message, int logLevel, Object data, boolean
 	}
 
 	private Level getLogLevel(int logLevel) {
-		switch (logLevel) {
-			case LogLevel.OFF: return Level.OFF;
-			case LogLevel.TRACE: return Level.TRACE;
-			case LogLevel.INFO: return Level.INFO;
-			case LogLevel.WARNING: return Level.WARN;
-			case LogLevel.ERROR: return Level.ERROR;
-			case LogLevel.FATAL: return Level.FATAL;
+		LogLevel level = LogLevel.fromInt(logLevel);
+		switch (level) {
+			case OFF: return Level.OFF;
+			case TRACE: return Level.TRACE;
+			case INFO: return Level.INFO;
+			case WARNING: return Level.WARN;
+			case ERROR: return Level.ERROR;
+			case FATAL: return Level.FATAL;
 			default: return Level.DEBUG;
 		}
 	}