Added verbose level to messages and ms to timestamps

Author: Fi0x

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.Fi0x</groupId>
     <artifactId>JavaLogger</artifactId>
-    <version>1.1.11</version>
+    <version>1.2.0</version>
     <name>Java Logger</name>
     <description>This is a Library for a custom Java Logger</description>
     <url>http://github.com/Fi0x/JavaLogger</url>

src/main/java/io/fi0x/javalogger/logging/LogEntry.java

@@ -20,6 +20,7 @@ public class LogEntry
     Exception exception = null;
     boolean fileEntry = true;
     boolean onlyVerbose = false;
+    int verboseLevel = 0;
     boolean onlyDebug = false;
     boolean plainText = false;
     boolean consoleException = false;
@@ -54,6 +55,7 @@ public LogEntry(String text, String templateName) throws IllegalArgumentExceptio
         this.loglevel = t.loglevel;
         this.fileEntry = t.fileEntry;
         this.onlyVerbose = t.onlyVerbose;
+        this.verboseLevel = t.verboseLevel;
         this.onlyDebug = t.onlyDebug;
         this.plainText = t.plainText;
         this.consoleException = t.consoleException;
@@ -156,6 +158,17 @@ public LogEntry VERBOSE(boolean onlyInVerboseMode)
         onlyVerbose = onlyInVerboseMode;
         return this;
     }
+    /**
+     * Set the verbose-level of this {@link LogEntry}.
+     * @param verboseLvl The verbose-level of the Logger which is at least required to show this message.
+     *                   (Default is 0)
+     * @return The current {@link LogEntry} to be used further.
+     */
+    public LogEntry LEVEL(int verboseLvl)
+    {
+        verboseLevel = verboseLvl;
+        return this;
+    }
     /**
      * Stop this {@link LogEntry} from using the prefix information.
      * The removed prefix information is the time, logging-level and error-code.

src/main/java/io/fi0x/javalogger/logging/LogTemplate.java

@@ -11,19 +11,21 @@ class LogTemplate
     String loglevel;
     boolean fileEntry;
     boolean onlyVerbose;
+    int verboseLevel;
     boolean onlyDebug;
     boolean plainText;
     boolean consoleException;
     boolean mixpanelMessage;
     String mixpanelEventName;
 
-    LogTemplate(String color, String background, String level, boolean writeToFile, boolean requireVerbose, boolean requireDebug, boolean noPrefix, boolean showExceptionInConsole, boolean mixpanelMessage, String mixpanelEventName)
+    LogTemplate(String color, String background, String level, boolean writeToFile, boolean requireVerbose, int verboseLevel, boolean requireDebug, boolean noPrefix, boolean showExceptionInConsole, boolean mixpanelMessage, String mixpanelEventName)
     {
         this.color = color;
         this.background = background;
         this.loglevel = level;
         this.fileEntry = writeToFile;
         this.onlyVerbose = requireVerbose;
+        this.verboseLevel = verboseLevel;
         this.onlyDebug = requireDebug;
         this.plainText = noPrefix;
         this.consoleException = showExceptionInConsole;

src/main/java/io/fi0x/javalogger/logging/Logger.java

@@ -22,14 +22,16 @@ public class Logger
     private File currentLogFile;
     private boolean isDebug;
     private boolean isVerbose;
+    private int verboseLevel = 0;
     private boolean smallLog;
     private boolean consoleExceptions;
 
-    static Map<String, LogTemplate> templates = new HashMap<String,LogTemplate>() {{
-        put(TEMPLATE.VERBOSE.name(), new LogTemplate(LogColor.WHITE, "", "VER", false, true, false, false, false, false, "LOG"));
-        put(TEMPLATE.INFO.name(), new LogTemplate(LogColor.WHITE, "", "INF", true, true, true, false, false, false, "LOG"));
-        put(TEMPLATE.WARNING.name(), new LogTemplate(LogColor.YELLOW, "", "WRN", true, false, false, false, false, true, "LOG"));
-        put(TEMPLATE.ERROR.name(), new LogTemplate(LogColor.RED, "", "ERR", true, false, false, false, false, true, "LOG"));
+    static Map<String, LogTemplate> templates = new HashMap<>()
+    {{
+        put(TEMPLATE.VERBOSE.name(), new LogTemplate(LogColor.WHITE, "", "VER", false, true, 0, false, false, false, false, "LOG"));
+        put(TEMPLATE.INFO.name(), new LogTemplate(LogColor.WHITE, "", "INF", true, true, 0, true, false, false, false, "LOG"));
+        put(TEMPLATE.WARNING.name(), new LogTemplate(LogColor.YELLOW, "", "WRN", true, false, 0, false, false, false, true, "LOG"));
+        put(TEMPLATE.ERROR.name(), new LogTemplate(LogColor.RED, "", "ERR", true, false, 0, false, false, false, true, "LOG"));
     }};
 
     private Logger()
@@ -83,6 +85,16 @@ public void setVerbose(boolean isVerboseMode)
     {
         isVerbose = isVerboseMode;
     }
+    /**
+     * Change the current verbose-level. This will show messages
+     * with the selected verbose level or lower.
+     * @param level How many different verbose levels should be active.
+     *              (Default is 0)
+     */
+    public void setVerboseLevel(int level)
+    {
+        verboseLevel = level;
+    }
     /**
      * Change the way {@link LogEntry}s are displayed.
      * Using small-logs will remove all prefixes from logging.
@@ -117,8 +129,11 @@ public void setConsoleExceptions(boolean showExceptionsInConsole)
     public static void log(LogEntry log)
     {
         String logOutput = createLogString(log);
+        boolean debugOK = !log.onlyDebug || getInstance().isDebug;
+        boolean verboseOK = !log.onlyVerbose || getInstance().isVerbose;
+        boolean verboseLevelOK = log.verboseLevel <= getInstance().verboseLevel;
 
-        if((log.onlyDebug && getInstance().isDebug) || (log.onlyVerbose && getInstance().isVerbose) || (!log.onlyVerbose && !log.onlyDebug))
+        if(debugOK || (verboseOK && verboseLevelOK))
         {
             System.out.println(log.color + log.background + logOutput + LogColor.RESET);
 
@@ -206,118 +221,133 @@ public static boolean log(String text, Enum<?> template)
      * @param writeToFile If {@link LogEntry}s written with this {@link LogTemplate} should be saved in a log-file.
      * @param onlyDebug If {@link LogEntry}s with these settings should only be visible in debug-mode.
      * @param onlyVerbose If {@link LogEntry}s with these settings should only be visible in verbose-mode.
+     * @param verboseLevel The minimum required level for messages with this {@link LogEntry} to be displayed if they are onlyVerbose.
      * @param hidePrefix If only the actual message without timestamp, logging-level and error-code should be shown.
      * @param exceptionsInConsole If {@link LogEntry}s whith these settings should print their exceptions in the console.
      * @param mixpanelMessage If the {@link LogEntry} should be sent to Mixpanel.
      * @param mixpanelName The name of the Mixpanel-event.
      * @return True if the {@link LogTemplate} was created successfully, False if the {@link LogTemplate} was overwritten.
      */
-    public static boolean createNewTemplate(String templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean exceptionsInConsole, boolean mixpanelMessage, String mixpanelName)
+    public static boolean createNewTemplate(String templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, int verboseLevel, boolean onlyDebug, boolean hidePrefix, boolean exceptionsInConsole, boolean mixpanelMessage, String mixpanelName)
     {
         boolean isNew = !templates.containsKey(templateName);
-        templates.put(templateName, new LogTemplate(colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName));
+        templates.put(templateName, new LogTemplate(colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, verboseLevel, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName));
         return isNew;
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
+     */
+    public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, int verboseLevel, boolean onlyDebug, boolean hidePrefix, boolean exceptionsInConsole, boolean mixpanelMessage, String mixpanelName)
+    {
+        return createNewTemplate(templateName.name(), colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, verboseLevel, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName);
+    }
+    /**
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
+     */
+    public static boolean createNewTemplate(String templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean exceptionsInConsole, boolean mixpanelMessage, String mixpanelName)
+    {
+        return createNewTemplate(templateName, colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, 0, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName);
+    }
+    /**
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean exceptionsInConsole, boolean mixpanelMessage, String mixpanelName)
     {
-        return createNewTemplate(templateName.name(), colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName);
+        return createNewTemplate(templateName, colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, 0, onlyDebug, hidePrefix, exceptionsInConsole, mixpanelMessage, mixpanelName);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage, String mixpanelName)
     {
         return createNewTemplate(templateName, colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, false, mixpanelMessage, mixpanelName);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String backgroundColorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage, String mixpanelName)
     {
-        return createNewTemplate(templateName.name(), colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, mixpanelMessage, mixpanelName);
+        return createNewTemplate(templateName, colorCode, backgroundColorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, false, mixpanelMessage, mixpanelName);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage, String mixpanelName)
     {
         return createNewTemplate(templateName, colorCode, "", logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, mixpanelMessage, mixpanelName);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage, String mixpanelName)
     {
         return createNewTemplate(templateName, colorCode, "", logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, mixpanelMessage, mixpanelName);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, mixpanelMessage, "LOG");
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix, boolean mixpanelMessage)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, mixpanelMessage, "LOG");
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug, boolean hidePrefix)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, hidePrefix, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel, boolean writeToFile, boolean onlyVerbose, boolean onlyDebug)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, onlyVerbose, onlyDebug, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel, boolean writeToFile)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, false, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel, boolean writeToFile)
     {
         return createNewTemplate(templateName, colorCode, logLevel, writeToFile, false, false);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(String templateName, String colorCode, String logLevel)
     {
         return createNewTemplate(templateName, colorCode, logLevel, true);
     }
     /**
-     * @see #createNewTemplate(String, String, String, String, boolean, boolean, boolean, boolean, boolean, boolean, String)
+     * @see #createNewTemplate(String, String, String, String, boolean, boolean, int, boolean, boolean, boolean, boolean, String)
      */
     public static boolean createNewTemplate(Enum<?> templateName, String colorCode, String logLevel)
     {
@@ -336,7 +366,7 @@ private static String createLogString(LogEntry log)
     }
     private static String getLogEntryDate()
     {
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss:SSS");
         LocalDateTime now = LocalDateTime.now();
 
         return "[" + dtf.format(now) + "]";