Skip to content

Commit 68ba5d5

Browse files
author
kadary DEMBELE
committed
Create an Abstract logger witch implements Logger Interface and extends it to Default Logger
Restructuration of Levels priorities to TRACE > ERROR > DEBUG > WARM > INFO > OFF
1 parent 4984a7c commit 68ba5d5

6 files changed

Lines changed: 90 additions & 78 deletions

File tree

‎src/project/architecture/javaLogger/modules/core/AbstractLogger.java‎

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @version 1.0
1919
* @param <V>
2020
*/
21-
public class AbstractLogger implements Logger {
21+
public abstract class AbstractLogger implements Logger {
2222

2323
private String fqcn;
2424
private Handler CONSOLE = new ConsoleHandler();
@@ -31,6 +31,13 @@ public class AbstractLogger implements Logger {
3131
public AbstractLogger(String name) {
3232
this.setFQCN(name);
3333
}
34+
35+
public abstract void trace(String message);
36+
public abstract void debug(String message);
37+
public abstract void info(String message);
38+
public abstract void warn(String message);
39+
public abstract void error(String message);
40+
3441

3542
private String getFQCN() {
3643
return fqcn;
@@ -60,72 +67,23 @@ public boolean isInfoEnabled() {
6067
return isEnabled(Key.LevelINFO.name());
6168
}
6269

63-
public void info(String message) {
64-
if (!handlers.isEmpty() || !isNull(levelFixed)) {
65-
this.logByLoggerConfig(message, Level.INFO);
66-
}
67-
68-
else {
69-
this.logByPropConfig(message, Level.INFO);
70-
}
71-
}
72-
7370
public boolean isWarnEnabled() {
7471
return isEnabled(Key.LevelWARN.name());
7572
}
7673

77-
public void warn(String message) {
78-
if (!handlers.isEmpty() || !isNull(levelFixed)) {
79-
this.logByLoggerConfig(message, Level.WARN);
80-
}
81-
else {
82-
this.logByPropConfig(message, Level.WARN);
83-
}
84-
}
85-
8674
public boolean isErrorEnabled() {
8775
return isEnabled(Key.LevelERROR.name());
8876
}
8977

90-
public void error(String message) {
91-
if (!handlers.isEmpty() || !isNull(levelFixed)) {
92-
this.logByLoggerConfig(message, Level.ERROR);
93-
}
94-
else {
95-
this.logByPropConfig(message, Level.ERROR);
96-
}
97-
}
98-
9978
public boolean isDebugEnabled() {
10079
return isEnabled(Key.LevelDEBUG.name());
10180
}
10281

103-
public void debug(String message) {
104-
if (!handlers.isEmpty() || !isNull(levelFixed)) {
105-
this.logByLoggerConfig(message, Level.DEBUG);
106-
}
107-
108-
else {
109-
this.logByPropConfig(message, Level.DEBUG);
110-
}
111-
}
112-
11382
@Override
11483
public boolean isTraceEnabled() {
11584
return isEnabled(Key.LevelTrace.name());
11685
}
11786

118-
@Override
119-
public void trace(String message) {
120-
if (!handlers.isEmpty() || !isNull(levelFixed)) {
121-
this.logByLoggerConfig(message, Level.TRACE);
122-
}
123-
124-
else {
125-
this.logByPropConfig(message, Level.TRACE);
126-
}
127-
}
128-
12987
@Override
13088
public void setHandlers(Handler handler) {
13189
handlers.put(handler.getClass().getName(), handler);
@@ -142,7 +100,7 @@ public void setLayout() {
142100

143101
}
144102

145-
private void logByLoggerConfig(String message, Level level) {
103+
protected void logByLoggerConfig(String message, Level level) {
146104
if (!handlers.isEmpty()) {
147105
Set<String> keys = handlers.keySet();
148106
Iterator<String> iterator = keys.iterator();
@@ -187,7 +145,7 @@ else if(!isNull(levelFixed)) {
187145
}
188146
}
189147

190-
private void logByPropConfig(String message, Level level) {
148+
protected void logByPropConfig(String message, Level level) {
191149
if (handlers.isEmpty() & isNull(levelFixed)) {
192150
if (isEnabled(Key.ConsoleHandler.name())) {
193151
CONSOLE.log(level, message, this.getFQCN(), ConsoleHandler.class.getName());
@@ -203,7 +161,7 @@ private void logByPropConfig(String message, Level level) {
203161
}
204162
}
205163

206-
private boolean isNull(Level levelFixed) {
164+
protected boolean isNull(Level levelFixed) {
207165
return this.levelFixed == null || this.levelFixed.getName() == " " ? true : false;
208166
}
209167
}

‎src/project/architecture/javaLogger/modules/core/DefaultLogger.java‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package project.architecture.javaLogger.modules.core;
2+
3+
4+
/**
5+
* ???
6+
* @author kadary
7+
* version 1.0
8+
*/
9+
public class DefaultLogger extends AbstractLogger {
10+
11+
public DefaultLogger(String name) {
12+
super(name);
13+
}
14+
15+
@Override
16+
public void trace(String message) {
17+
if (!handlers.isEmpty() || !isNull(levelFixed)) {
18+
this.logByLoggerConfig(message, Level.TRACE);
19+
}
20+
21+
else {
22+
this.logByPropConfig(message, Level.TRACE);
23+
}
24+
}
25+
26+
@Override
27+
public void debug(String message) {
28+
if (!handlers.isEmpty() || !isNull(levelFixed)) {
29+
this.logByLoggerConfig(message, Level.DEBUG);
30+
}
31+
32+
else {
33+
this.logByPropConfig(message, Level.DEBUG);
34+
}
35+
}
36+
37+
@Override
38+
public void error(String message) {
39+
if (!handlers.isEmpty() || !isNull(levelFixed)) {
40+
this.logByLoggerConfig(message, Level.ERROR);
41+
}
42+
else {
43+
this.logByPropConfig(message, Level.ERROR);
44+
}
45+
}
46+
47+
@Override
48+
public void warn(String message) {
49+
if (!handlers.isEmpty() || !isNull(levelFixed)) {
50+
this.logByLoggerConfig(message, Level.WARN);
51+
}
52+
else {
53+
this.logByPropConfig(message, Level.WARN);
54+
}
55+
}
56+
57+
@Override
58+
public void info(String message) {
59+
if (!handlers.isEmpty() || !isNull(levelFixed)) {
60+
this.logByLoggerConfig(message, Level.INFO);
61+
}
62+
63+
else {
64+
this.logByPropConfig(message, Level.INFO);
65+
}
66+
}
67+
}

‎src/project/architecture/javaLogger/modules/core/ExtendedLogger.java‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/project/architecture/javaLogger/modules/core/Level.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package project.architecture.javaLogger.modules.core;
22

33
/**
4-
* Herited class with our 6 log levels : TRACE > DEBUG > INFO > WARM > ERROR > OFF
4+
* Herited class with our 6 log levels : TRACE > ERROR > DEBUG > WARM > INFO > OFF
55
* off - Logger disabled
66
* error - Other runtime errors or unexpected conditions. Expect these to be immediately visible on a status console.
77
* warn - Use of deprecated APIs, poor use of API, 'almost' errors, other runtime situations that are undesirable or unexpected, but not necessarily "wrong". Expect these to be immediately visible on a status console.
@@ -19,15 +19,16 @@ public Level(String name, int value) {
1919
this.setValue(value);
2020
}
2121

22-
public static final Level TRACE = new Level("TRACE", Integer.MAX_VALUE);
23-
24-
public static final Level DEBUG = new Level("DEBUG", 400);
22+
public static final Level OFF = new Level("OFF", Integer.MIN_VALUE);
2523

26-
public static final Level INFO = new Level("INFO", 300);
24+
public static final Level INFO = new Level("INFO", 100);
2725

2826
public static final Level WARN = new Level("WARN", 200);
2927

30-
public static final Level ERROR = new Level("ERROR", 100);
28+
public static final Level DEBUG = new Level("DEBUG", 300);
29+
30+
public static final Level ERROR = new Level("ERROR", 400);
31+
32+
public static final Level TRACE = new Level("TRACE", Integer.MAX_VALUE);
3133

32-
public static final Level OFF = new Level("OFF", Integer.MIN_VALUE);
3334
}

‎src/project/architecture/javaLogger/modules/core/LogManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public <T> Logger getLogger(Class<T> targetClass) {
3131
return loggers.get(fqcn);
3232
}
3333
else
34-
loggers.put(fqcn, new ExtendedLogger(fqcn));
34+
loggers.put(fqcn, new DefaultLogger(fqcn));
3535
return loggers.get(fqcn);
3636
}
3737

@@ -43,7 +43,7 @@ public Logger getLogger(String targetClass) {
4343
return loggers.get(fqcn);
4444
}
4545
else
46-
loggers.put(fqcn, new ExtendedLogger(fqcn));
46+
loggers.put(fqcn, new DefaultLogger(fqcn));
4747
return loggers.get(fqcn);
4848
}
4949

‎src/project/architecture/javaLogger/test/Main.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public static void main(String[] args) {
2323

2424
logger.setHandlers(new ConsoleHandler());
2525
//logger.setHandlers(new FileHandler());
26-
//logger.setLevel(Level.INFO);
27-
logger.setLevel(Level.WARN);
26+
logger.setLevel(Level.INFO);
27+
//logger.setLevel(Level.WARN);
2828

2929
if (logger.isInfoEnabled()) {
3030
logger.info("Ceci est un message tres tres long car on veut tester l'indentation du LoggerWriter pour pouvoir reajuster le texte dans la console/le fichier texte. Et blablabla... Et blablabla ! Baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin baratin. ");

0 commit comments

Comments
 (0)