From 357e2ec0a060dac15c7cce9fd80defc9abd41143 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 20:40:50 +0100 Subject: [PATCH 1/7] Method Fatal creation --- src/main/java/ch/hearc/ig/odi/logger/LogClass.java | 2 ++ .../hearc/ig/odi/stringcalculatortdd/StringCalculator.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index d0aacb2..6369460 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -10,4 +10,6 @@ public static void info(CharSequence message){} public static void warn(CharSequence message){} + public static void fatal(CharSequence message){} + } \ No newline at end of file diff --git a/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java b/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java index 7ef4194..70f6d47 100644 --- a/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java +++ b/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java @@ -4,9 +4,13 @@ import org.apache.commons.lang3.StringUtils; import ch.hearc.ig.odi.logger.LogClass; + + + import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import org.apache.logging.log4j.message.Message; public class StringCalculator { @@ -51,6 +55,7 @@ else if (numberInt > 1000) } if (negativeNumbers.size() > 0) { + LogClass.fatal("Nombre négatif interdit"); throw new RuntimeException("Negative not allowed: " + negativeNumbers.toString()); } From 756c22a50156efa44e9295d0ef741bc741aa1ea0 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 21:17:30 +0100 Subject: [PATCH 2/7] Correcting pom.xml --- pom.xml | 28 +++++++++++++++---- .../java/ch/hearc/ig/odi/logger/LogClass.java | 6 ++-- .../stringcalculatortdd/StringCalculator.java | 6 +--- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index fd66767..f5618c3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,12 @@ ch.hearc.ig.odi.stringcalculatortdd 1.0-SNAPSHOT + + + 1.8 + 1.8 + + junit @@ -30,11 +36,21 @@ log4j-core 2.11.1 - - org.apache.logging.log4j - log4j-api - 2.11.1 - - + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + \ No newline at end of file diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index 6369460..640a2e0 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -1,12 +1,14 @@ package ch.hearc.ig.odi.logger; - import org.apache.logging.log4j.*; + public class LogClass { private static final Logger LOGGER = LogManager.getLogger(LogClass.class); - public static void info(CharSequence message){} + public static void info(CharSequence message){ + System.out.println(message); + } public static void warn(CharSequence message){} diff --git a/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java b/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java index 70f6d47..87defa2 100644 --- a/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java +++ b/src/main/java/ch/hearc/ig/odi/stringcalculatortdd/StringCalculator.java @@ -2,15 +2,11 @@ import ch.hearc.ig.odi.logger.LogClass; import org.apache.commons.lang3.StringUtils; -import ch.hearc.ig.odi.logger.LogClass; - - - import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.*; public class StringCalculator { From 2eb4a6a121b5a071f80e1bc030f348f307eacb34 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 21:24:59 +0100 Subject: [PATCH 3/7] Displaying logs in console Relates #1 --- src/main/java/ch/hearc/ig/odi/logger/LogClass.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index 640a2e0..41fa40e 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -10,8 +10,12 @@ public static void info(CharSequence message){ System.out.println(message); } - public static void warn(CharSequence message){} + public static void warn(CharSequence message){ + System.out.println(message); + } - public static void fatal(CharSequence message){} + public static void fatal(CharSequence message){ + System.out.println(message); + } } \ No newline at end of file From f9f584fad7de8177c975544151f3fc5816fbf3e5 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 21:30:55 +0100 Subject: [PATCH 4/7] Changing log display in console Relates #2 --- src/main/java/ch/hearc/ig/odi/logger/LogClass.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index 41fa40e..6508dc9 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -7,15 +7,15 @@ public class LogClass { private static final Logger LOGGER = LogManager.getLogger(LogClass.class); public static void info(CharSequence message){ - System.out.println(message); + System.out.println("Logger information : " + message); } public static void warn(CharSequence message){ - System.out.println(message); + System.out.println("Logger warning : " + message); } public static void fatal(CharSequence message){ - System.out.println(message); + System.out.println("Logger fatal : " + message); } } \ No newline at end of file From e1631d0a867f80cac7640c82b63caabaeb8688a4 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 21:47:19 +0100 Subject: [PATCH 5/7] Changing log's color Relates #3 --- src/main/java/ch/hearc/ig/odi/logger/LogClass.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index 6508dc9..3fe78a7 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -11,11 +11,11 @@ public static void info(CharSequence message){ } public static void warn(CharSequence message){ - System.out.println("Logger warning : " + message); + System.out.println("\u001B[31m" + "Logger warning : " + message); } public static void fatal(CharSequence message){ - System.out.println("Logger fatal : " + message); + System.out.println("\u001B[33m" + "Logger fatal : " + message); } } \ No newline at end of file From 05dfe2415807aa4e2bad633e426e36f556490819 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 21:51:18 +0100 Subject: [PATCH 6/7] Logs under Warning disapearing Relates #4 --- src/main/java/ch/hearc/ig/odi/logger/LogClass.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java index 3fe78a7..c56ca1f 100644 --- a/src/main/java/ch/hearc/ig/odi/logger/LogClass.java +++ b/src/main/java/ch/hearc/ig/odi/logger/LogClass.java @@ -7,7 +7,8 @@ public class LogClass { private static final Logger LOGGER = LogManager.getLogger(LogClass.class); public static void info(CharSequence message){ - System.out.println("Logger information : " + message); + //issue #4 + //System.out.println("Logger information : " + message); } public static void warn(CharSequence message){ From 836dd0dac3203caba32c502aa9b2f22e6f1d5ab1 Mon Sep 17 00:00:00 2001 From: nellysalima Date: Sun, 17 Mar 2019 22:06:10 +0100 Subject: [PATCH 7/7] .log generation frunction implemented Relates #5 --- src/main/resources/log4j2.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 9e29cc3..38b9422 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -4,10 +4,29 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file