Skip to content

Commit f106af9

Browse files
author
kadary DEMBELE
committed
Renaming of some variables and methods
1 parent 5e3d83a commit f106af9

10 files changed

Lines changed: 40 additions & 39 deletions

File tree

‎javaLogger.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ DB=false
1616
LEVEL=true
1717
DATE=truE
1818
HOUR=true
19-
CLASS=true
19+
FQCN=true

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
public class AbstractLogger implements Logger {
1717

18-
private String name;
18+
private String fqcn;
1919
private Handler console = new ConsoleHandler();
2020
private Handler file = new FileHandler();
2121
private Handler db = new DataBaseHandler();
@@ -24,16 +24,16 @@ public class AbstractLogger implements Logger {
2424

2525

2626
public AbstractLogger(String name) {
27-
this.setName(name);
27+
this.setFQCN(name);
2828
configuration.setConfig();
2929
}
3030

31-
public String getName() {
32-
return name;
31+
public String getFQCN() {
32+
return fqcn;
3333
}
3434

35-
public void setName(String name) {
36-
this.name = name;
35+
public void setFQCN(String fqcn) {
36+
this.fqcn = fqcn;
3737
}
3838

3939
public boolean isEnabled(String level) {
@@ -52,15 +52,15 @@ public boolean isInfoEnabled() {
5252

5353
public void info(String message) {
5454
if (isEnabled(Target.CONSOLE.name())) {
55-
console.log(Level.INFO, message, this.getName(), Target.CONSOLE);
55+
console.log(Level.INFO, message, this.getFQCN(), Target.CONSOLE);
5656
}
5757

5858
if (isEnabled(Target.FILE.name())) {
59-
file.log(Level.INFO, message, this.getName(), Target.FILE);
59+
file.log(Level.INFO, message, this.getFQCN(), Target.FILE);
6060
}
6161

6262
if (isEnabled(Target.DB.name())) {
63-
db.log(Level.INFO, message, this.getName(), Target.DB);
63+
db.log(Level.INFO, message, this.getFQCN(), Target.DB);
6464
}
6565
}
6666

@@ -70,15 +70,15 @@ public boolean isWarnEnabled() {
7070

7171
public void warn(String message) {
7272
if (isEnabled(Target.CONSOLE.name())) {
73-
console.log(Level.WARN, message, this.getName(), Target.CONSOLE);
73+
console.log(Level.WARN, message, this.getFQCN(), Target.CONSOLE);
7474
}
7575

7676
if (isEnabled(Target.FILE.name())) {
77-
file.log(Level.WARN, message, this.getName(), Target.FILE);
77+
file.log(Level.WARN, message, this.getFQCN(), Target.FILE);
7878
}
7979

8080
if (isEnabled(Target.DB.name())) {
81-
db.log(Level.WARN, message, this.getName(), Target.DB);
81+
db.log(Level.WARN, message, this.getFQCN(), Target.DB);
8282
}
8383
}
8484

@@ -88,15 +88,15 @@ public boolean isErrorEnabled() {
8888

8989
public void error(String message) {
9090
if (isEnabled(Target.CONSOLE.name())) {
91-
console.log(Level.ERROR, message, this.getName(), Target.CONSOLE);
91+
console.log(Level.ERROR, message, this.getFQCN(), Target.CONSOLE);
9292
}
9393

9494
if (isEnabled(Target.FILE.name())) {
95-
file.log(Level.ERROR, message, this.getName(), Target.FILE);
95+
file.log(Level.ERROR, message, this.getFQCN(), Target.FILE);
9696
}
9797

9898
if (isEnabled(Target.DB.name())) {
99-
db.log(Level.ERROR, message, this.getName(), Target.DB);
99+
db.log(Level.ERROR, message, this.getFQCN(), Target.DB);
100100
}
101101
}
102102

@@ -106,15 +106,15 @@ public boolean isDebugEnabled() {
106106

107107
public void debug(String message) {
108108
if (isEnabled(Target.CONSOLE.name())) {
109-
console.log(Level.DEBUG, message, this.getName(), Target.CONSOLE);
109+
console.log(Level.DEBUG, message, this.getFQCN(), Target.CONSOLE);
110110
}
111111

112112
if (isEnabled(Target.FILE.name())) {
113-
file.log(Level.DEBUG, message, this.getName(), Target.FILE);
113+
file.log(Level.DEBUG, message, this.getFQCN(), Target.FILE);
114114
}
115115

116116
if (isEnabled(Target.DB.name())) {
117-
db.log(Level.DEBUG, message, this.getName(), Target.DB);
117+
db.log(Level.DEBUG, message, this.getFQCN(), Target.DB);
118118
}
119119
}
120120
}

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@
1010
*/
1111
public class LogManager {
1212
private Map<String, Logger> loggers = new HashMap<String, Logger>();
13-
private String loggerName;
13+
private String fqcn;
1414

1515

1616
public LogManager() {
17-
loggerName = Thread. currentThread().getStackTrace()[2].getClassName();
17+
fqcn = Thread. currentThread().getStackTrace()[2].getClassName();
1818
}
1919

2020
public Logger getLogger(String name) {
2121
if (name != null && name != "") {
22-
this.loggerName = name;
22+
this.fqcn = name;
2323
}
24-
if (loggers.containsKey(loggerName)) {
25-
return loggers.get(loggerName);
24+
if (loggers.containsKey(fqcn)) {
25+
return loggers.get(fqcn);
2626
}
2727
else
28-
loggers.put(loggerName, new ExtendedLogger(loggerName));
29-
return loggers.get(loggerName);
28+
loggers.put(fqcn, new ExtendedLogger(fqcn));
29+
return loggers.get(fqcn);
3030
}
3131

3232
public Logger getLogger() {
33-
return this.getLogger(loggerName);
33+
return this.getLogger(fqcn);
3434
}
3535

3636
public void closeLogger(String name) {
3737
if (name != null && name != "") {
3838
if(loggers.containsKey(name)) {
39-
loggers.remove(loggerName);
39+
loggers.remove(name);
4040
}
4141
}
4242
}
4343

4444
public void closeLogger() {
45-
this.closeLogger(loggerName);
45+
this.closeLogger(fqcn);
4646
}
4747

4848
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public interface Logger {
2020
boolean isDebugEnabled();
2121
void debug(String message);
2222

23-
String getName();
24-
void setName(String name);
23+
String getFQCN();
24+
void setFQCN(String fqcn);
2525
}

‎src/project/architecture/javaLogger/modules/output/AbstractHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public AbstractHandler() {
1616
configuration.setConfig();
1717
}
1818

19-
public abstract void log(Level info, String message, String loggerName, Target target);
19+
public abstract void log(Level level, String message, String fqcn, Target target);
2020

2121

2222
public boolean isEnabled(String token) {
@@ -38,7 +38,7 @@ public boolean isDateEnabled() {
3838
}
3939

4040
public boolean isClassNameEnabled() {
41-
return isEnabled("CLASS");
41+
return isEnabled("FQCN");
4242
}
4343

4444
}

‎src/project/architecture/javaLogger/modules/output/ConsoleHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
public class ConsoleHandler extends AbstractHandler {
1515
@Override
16-
public void log(Level level, String message, String loggerName, Target target){
16+
public void log(Level level, String message, String fqcn, Target target){
1717
Map<String, String> log = new HashMap<String, String>();
1818
if(target.equals(Target.CONSOLE)) {
1919
Date date = new Date();
@@ -28,13 +28,13 @@ public void log(Level level, String message, String loggerName, Target target){
2828
}
2929

3030
if(isClassNameEnabled()) {
31-
log.put("class", loggerName);
31+
log.put("fqcn", fqcn);
3232
}
3333

3434

3535
log.put("message", message);
3636

37-
System.out.printf("%-5s %1s %-52s %5s %-5s %1s %-6s%n", log.get("date"), "|", log.get("class"), "|", log.get("level"), "|", log.get("message"));
37+
System.out.printf("%-5s %1s %-52s %5s %-5s %1s %-6s%n", log.get("date"), "|", log.get("fqcn"), "|", log.get("level"), "|", log.get("message"));
3838
}
3939

4040
}

‎src/project/architecture/javaLogger/modules/output/DataBaseHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class DataBaseHandler extends AbstractHandler {
1010

1111
@Override
12-
public void log(Level level, String message, String loggerName, Target target) {
12+
public void log(Level level, String message, String fqcn, Target target) {
1313
if(target.equals(Target.DB)) {
1414

1515
}

‎src/project/architecture/javaLogger/modules/output/FileHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public class FileHandler extends AbstractHandler {
1010

1111
@Override
12-
public void log(Level level, String message, String loggerName, Target target) {
12+
public void log(Level level, String message, String fqcn, Target target) {
1313
if(target.equals(Target.FILE)) {
1414

1515
}

‎src/project/architecture/javaLogger/modules/output/Handler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
public interface Handler {
1313

14-
void log(Level level, String message, String loggerName, Target target);
14+
void log(Level level, String message, String fqcn, Target target);
1515

1616
boolean isLevelEnabled();
1717
boolean isDateEnabled();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public static void main(String[] args) {
2222
logger.warn("Test de la librairie");
2323
}
2424

25+
logManager.closeLogger("Kadary");
2526
if (logger1.isErrorEnabled()) {
2627
logger1.error("Whaouuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu");
2728
}

0 commit comments

Comments
 (0)