Skip to content

Commit 520fe49

Browse files
mugamuga
committed
MSGPACK-58: changed logging library to java.util.logging.Logger
1 parent 9f48d2f commit 520fe49

10 files changed

Lines changed: 56 additions & 66 deletions

‎CHANGES.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Release 0.6.4 -
55
BUG FIXES
66
Fixes bug:validation error occurs when loading templates of array classes with
77
Javassist-based template builder.
8+
MSGPACK-58 Changes logging library from SLF4J to java.util.logging.Logger.
89
PULL REQUEST-10 Fix compilation error caused by package name mistake.
910

1011
Release 0.6.3 - 2011/11/08

‎pom.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,6 @@
5454
<version>3.15.0-GA</version>
5555
<scope>compile</scope>
5656
</dependency>
57-
<dependency>
58-
<groupId>org.slf4j</groupId>
59-
<artifactId>slf4j-api</artifactId>
60-
<version>1.6.1</version>
61-
</dependency>
62-
<dependency>
63-
<groupId>org.slf4j</groupId>
64-
<artifactId>slf4j-log4j12</artifactId>
65-
<version>1.6.1</version>
66-
</dependency>
6757
<dependency>
6858
<groupId>junit</groupId>
6959
<artifactId>junit</artifactId>

‎src/main/java/org/msgpack/template/builder/ArrayTemplateBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.lang.reflect.GenericArrayType;
2323
import java.lang.reflect.ParameterizedType;
2424
import java.lang.reflect.Type;
25+
import java.util.logging.Level;
26+
import java.util.logging.Logger;
2527

2628
import org.msgpack.MessageTypeException;
2729
import org.msgpack.packer.Packer;
@@ -37,13 +39,11 @@
3739
import org.msgpack.template.Template;
3840
import org.msgpack.template.TemplateRegistry;
3941
import org.msgpack.unpacker.Unpacker;
40-
import org.slf4j.Logger;
41-
import org.slf4j.LoggerFactory;
4242

4343
@SuppressWarnings({ "rawtypes", "unchecked" })
4444
public class ArrayTemplateBuilder extends AbstractTemplateBuilder {
4545

46-
private static final Logger LOG = LoggerFactory.getLogger(ArrayTemplateBuilder.class);
46+
private static final Logger LOG = Logger.getLogger(ArrayTemplateBuilder.class.getName());
4747

4848
static class ReflectionMultidimentionalArrayTemplate extends AbstractTemplate {
4949

@@ -107,8 +107,8 @@ public ArrayTemplateBuilder(TemplateRegistry registry) {
107107
public boolean matchType(Type targetType, boolean forceBuild) {
108108
Class<?> targetClass = (Class<?>) targetType;
109109
boolean matched = AbstractTemplateBuilder.matchAtArrayTemplateBuilder(targetClass, false);
110-
if (matched && LOG.isDebugEnabled()) {
111-
LOG.debug("matched type: " + targetClass.getName());
110+
if (matched && LOG.isLoggable(Level.FINE)) {
111+
LOG.fine("matched type: " + targetClass.getName());
112112
}
113113
return matched;
114114
}

‎src/main/java/org/msgpack/template/builder/BuildContext.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import java.io.IOException;
2121
import java.lang.reflect.InvocationTargetException;
22+
import java.util.logging.Logger;
2223

2324
import org.msgpack.*;
2425
import org.msgpack.packer.Packer;
@@ -31,13 +32,10 @@
3132
import javassist.CtNewMethod;
3233
import javassist.NotFoundException;
3334

34-
import org.slf4j.Logger;
35-
import org.slf4j.LoggerFactory;
36-
3735
@SuppressWarnings({ "rawtypes" })
3836
public abstract class BuildContext<T extends FieldEntry> {
3937

40-
private static Logger LOG = LoggerFactory.getLogger(BuildContext.class);
38+
private static Logger LOG = Logger.getLogger(BuildContext.class.getName());
4139

4240
protected JavassistTemplateBuilder director;
4341

@@ -58,20 +56,20 @@ public BuildContext(JavassistTemplateBuilder director) {
5856
protected Template build(final String className) {
5957
try {
6058
reset(className, false);
61-
LOG.debug("started generating template class %s for original class %s",
62-
new Object[] { tmplCtClass.getName(), className });
59+
LOG.fine(String.format("started generating template class %s for original class %s",
60+
new Object[] { tmplCtClass.getName(), className }));
6361
buildClass();
6462
buildConstructor();
6563
buildMethodInit();
6664
buildWriteMethod();
6765
buildReadMethod();
68-
LOG.debug("finished generating template class %s for original class %s",
69-
new Object[] { tmplCtClass.getName(), className });
66+
LOG.fine(String.format("finished generating template class %s for original class %s",
67+
new Object[] { tmplCtClass.getName(), className }));
7068
return buildInstance(createClass());
7169
} catch (Exception e) {
7270
String code = getBuiltString();
7371
if (code != null) {
74-
LOG.error("builder: " + code, e);
72+
LOG.severe("builder: " + code);
7573
throw new TemplateBuildException("Cannot compile: " + code, e);
7674
} else {
7775
throw new TemplateBuildException(e);
@@ -103,8 +101,8 @@ protected abstract Template buildInstance(Class<?> c)
103101
IllegalAccessException, InvocationTargetException;
104102

105103
protected void buildWriteMethod() throws CannotCompileException, NotFoundException {
106-
LOG.debug("started generating write method in template class %s",
107-
new Object[] { tmplCtClass.getName() });
104+
LOG.fine(String.format("started generating write method in template class %s",
105+
new Object[] { tmplCtClass.getName() }));
108106
String mbody = buildWriteMethodBody();
109107
int mod = javassist.Modifier.PUBLIC;
110108
CtClass returnType = CtClass.voidType;
@@ -117,19 +115,19 @@ protected void buildWriteMethod() throws CannotCompileException, NotFoundExcepti
117115
CtClass[] exceptTypes = new CtClass[] {
118116
director.getCtClass(IOException.class.getName())
119117
};
120-
LOG.debug("compiling write method body: %s", new Object[] { mbody });
118+
LOG.fine(String.format("compiling write method body: %s", new Object[] { mbody }));
121119
CtMethod newCtMethod = CtNewMethod.make(
122120
mod, returnType, mname, paramTypes, exceptTypes, mbody, tmplCtClass);
123121
tmplCtClass.addMethod(newCtMethod);
124-
LOG.debug("finished generating write method in template class %s",
125-
new Object[] { tmplCtClass.getName() });
122+
LOG.fine(String.format("finished generating write method in template class %s",
123+
new Object[] { tmplCtClass.getName() }));
126124
}
127125

128126
protected abstract String buildWriteMethodBody();
129127

130128
protected void buildReadMethod() throws CannotCompileException, NotFoundException {
131-
LOG.debug("started generating read method in template class %s",
132-
new Object[] { tmplCtClass.getName() });
129+
LOG.fine(String.format("started generating read method in template class %s",
130+
new Object[] { tmplCtClass.getName() }));
133131
String mbody = buildReadMethodBody();
134132
int mod = javassist.Modifier.PUBLIC;
135133
CtClass returnType = director.getCtClass(Object.class.getName());
@@ -142,12 +140,12 @@ protected void buildReadMethod() throws CannotCompileException, NotFoundExceptio
142140
CtClass[] exceptTypes = new CtClass[] {
143141
director.getCtClass(MessageTypeException.class.getName())
144142
};
145-
LOG.debug("compiling read method body: %s", new Object[] { mbody });
143+
LOG.fine(String.format("compiling read method body: %s", new Object[] { mbody }));
146144
CtMethod newCtMethod = CtNewMethod.make(
147145
mod, returnType, mname, paramTypes, exceptTypes, mbody, tmplCtClass);
148146
tmplCtClass.addMethod(newCtMethod);
149-
LOG.debug("finished generating read method in template class %s",
150-
new Object[] { tmplCtClass.getName() });
147+
LOG.fine(String.format("finished generating read method in template class %s",
148+
new Object[] { tmplCtClass.getName() }));
151149
}
152150

153151
protected abstract String buildReadMethodBody();
@@ -221,7 +219,7 @@ protected void write(final String className, final String directoryName) {
221219
} catch (Exception e) {
222220
String code = getBuiltString();
223221
if (code != null) {
224-
LOG.error("builder: " + code, e);
222+
LOG.severe("builder: " + code);
225223
throw new TemplateBuildException("Cannot compile: " + code, e);
226224
} else {
227225
throw new TemplateBuildException(e);
@@ -241,7 +239,7 @@ protected Template load(final String className) {
241239
} catch (Exception e) {
242240
String code = getBuiltString();
243241
if (code != null) {
244-
LOG.error("builder: " + code, e);
242+
LOG.severe("builder: " + code);
245243
throw new TemplateBuildException("Cannot compile: " + code, e);
246244
} else {
247245
throw new TemplateBuildException(e);

‎src/main/java/org/msgpack/template/builder/JavassistBeansTemplateBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.msgpack.template.builder;
22

33
import java.lang.reflect.Type;
4+
import java.util.logging.Level;
5+
import java.util.logging.Logger;
46

57
import org.msgpack.template.TemplateRegistry;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
88

99
@SuppressWarnings({ "rawtypes" })
1010
public class JavassistBeansTemplateBuilder extends JavassistTemplateBuilder {
11-
private static final Logger LOG = LoggerFactory.getLogger(JavassistBeansTemplateBuilder.class);
11+
private static final Logger LOG = Logger.getLogger(JavassistBeansTemplateBuilder.class.getName());
1212

1313
public JavassistBeansTemplateBuilder(TemplateRegistry registry) {
1414
super(registry);
@@ -18,8 +18,8 @@ public JavassistBeansTemplateBuilder(TemplateRegistry registry) {
1818
public boolean matchType(Type targetType, boolean hasAnnotation) {
1919
Class<?> targetClass = (Class<?>) targetType;
2020
boolean matched = matchAtClassTemplateBuilder(targetClass, hasAnnotation);
21-
if (matched && LOG.isDebugEnabled()) {
22-
LOG.debug("matched type: " + targetClass.getName());
21+
if (matched && LOG.isLoggable(Level.FINE)) {
22+
LOG.fine("matched type: " + targetClass.getName());
2323
}
2424
return matched;
2525
}

‎src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
import java.lang.Thread;
2121
import java.lang.reflect.Type;
22+
import java.util.logging.Level;
23+
import java.util.logging.Logger;
2224

2325
import javassist.ClassPool;
2426
import javassist.CtClass;
2527
import javassist.LoaderClassPath;
2628
import javassist.NotFoundException;
2729

28-
import org.slf4j.Logger;
29-
import org.slf4j.LoggerFactory;
3030
import org.msgpack.template.FieldOption;
3131
import org.msgpack.template.Template;
3232
import org.msgpack.template.AbstractTemplate;
@@ -35,7 +35,7 @@
3535
@SuppressWarnings({ "rawtypes", "unchecked" })
3636
public class JavassistTemplateBuilder extends AbstractTemplateBuilder {
3737

38-
private static Logger LOG = LoggerFactory.getLogger(JavassistTemplateBuilder.class);
38+
private static Logger LOG = Logger.getLogger(JavassistTemplateBuilder.class.getName());
3939

4040
public static abstract class JavassistTemplate<T> extends AbstractTemplate<T> {
4141
public Class<T> targetClass;
@@ -63,7 +63,8 @@ public JavassistTemplateBuilder(TemplateRegistry registry) {
6363
appended = true;
6464
}
6565
} catch (SecurityException e) {
66-
LOG.debug("Cannot append a search path of context classloader", e);
66+
LOG.fine("Cannot append a search path of context classloader");
67+
e.printStackTrace();
6768
}
6869
try {
6970
ClassLoader cl2 = getClass().getClassLoader();
@@ -72,7 +73,8 @@ public JavassistTemplateBuilder(TemplateRegistry registry) {
7273
appended = true;
7374
}
7475
} catch (SecurityException e) {
75-
LOG.debug("Cannot append a search path of classloader", e);
76+
LOG.fine("Cannot append a search path of classloader");
77+
e.printStackTrace();
7678
}
7779
if (!appended) {
7880
pool.appendSystemPath();
@@ -83,8 +85,8 @@ public JavassistTemplateBuilder(TemplateRegistry registry) {
8385
public boolean matchType(Type targetType, boolean hasAnnotation) {
8486
Class<?> targetClass = (Class<?>) targetType;
8587
boolean matched = matchAtClassTemplateBuilder(targetClass, hasAnnotation);
86-
if (matched && LOG.isDebugEnabled()) {
87-
LOG.debug("matched type: " + targetClass.getName());
88+
if (matched && LOG.isLoggable(Level.FINE)) {
89+
LOG.fine("matched type: " + targetClass.getName());
8890
}
8991
return matched;
9092
}

‎src/main/java/org/msgpack/template/builder/OrdinalEnumTemplateBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
package org.msgpack.template.builder;
1919

2020
import java.lang.reflect.Type;
21+
import java.util.logging.Level;
22+
import java.util.logging.Logger;
2123

2224
import org.msgpack.template.OrdinalEnumTemplate;
2325
import org.msgpack.template.Template;
2426
import org.msgpack.template.TemplateRegistry;
2527
import org.msgpack.template.builder.TemplateBuildException;
26-
import org.slf4j.Logger;
27-
import org.slf4j.LoggerFactory;
2828

2929
public class OrdinalEnumTemplateBuilder extends AbstractTemplateBuilder {
3030

31-
private static final Logger LOG = LoggerFactory.getLogger(OrdinalEnumTemplateBuilder.class);
31+
private static final Logger LOG = Logger.getLogger(OrdinalEnumTemplateBuilder.class.getName());
3232

3333
public OrdinalEnumTemplateBuilder(TemplateRegistry registry) {
3434
super(registry);
@@ -38,8 +38,8 @@ public OrdinalEnumTemplateBuilder(TemplateRegistry registry) {
3838
public boolean matchType(Type targetType, boolean hasAnnotation) {
3939
Class<?> targetClass = (Class<?>) targetType;
4040
boolean matched = matchAtOrdinalEnumTemplateBuilder(targetClass, hasAnnotation);
41-
if (matched && LOG.isDebugEnabled()) {
42-
LOG.debug("matched type: " + targetClass.getName());
41+
if (matched && LOG.isLoggable(Level.FINE)) {
42+
LOG.fine("matched type: " + targetClass.getName());
4343
}
4444
return matched;
4545
}

‎src/main/java/org/msgpack/template/builder/ReflectionBeansTemplateBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.lang.reflect.Modifier;
2727
import java.lang.reflect.Type;
2828
import java.util.ArrayList;
29+
import java.util.logging.Level;
30+
import java.util.logging.Logger;
2931

3032
import org.msgpack.annotation.Ignore;
3133
import org.msgpack.annotation.Index;
@@ -36,8 +38,6 @@
3638
import org.msgpack.template.Template;
3739
import org.msgpack.template.TemplateRegistry;
3840
import org.msgpack.unpacker.Unpacker;
39-
import org.slf4j.Logger;
40-
import org.slf4j.LoggerFactory;
4141

4242
/**
4343
* Class for building java reflection template builder for java beans class.
@@ -48,7 +48,7 @@
4848
@SuppressWarnings({ "rawtypes" })
4949
public class ReflectionBeansTemplateBuilder extends ReflectionTemplateBuilder {
5050

51-
private static Logger LOG = LoggerFactory.getLogger(ReflectionBeansTemplateBuilder.class);
51+
private static Logger LOG = Logger.getLogger(ReflectionBeansTemplateBuilder.class.getName());
5252

5353
static class ReflectionBeansFieldTemplate extends ReflectionFieldTemplate {
5454
ReflectionBeansFieldTemplate(final FieldEntry entry) {
@@ -76,8 +76,8 @@ public ReflectionBeansTemplateBuilder(TemplateRegistry registry) {
7676
public boolean matchType(Type targetType, boolean hasAnnotation) {
7777
Class<?> targetClass = (Class<?>) targetType;
7878
boolean matched = matchAtBeansClassTemplateBuilder(targetClass, hasAnnotation);
79-
if (matched && LOG.isDebugEnabled()) {
80-
LOG.debug("matched type: " + targetClass.getName());
79+
if (matched && LOG.isLoggable(Level.FINE)) {
80+
LOG.fine("matched type: " + targetClass.getName());
8181
}
8282
return matched;
8383
}

‎src/main/java/org/msgpack/template/builder/ReflectionTemplateBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121
import java.lang.reflect.Field;
2222
import java.lang.reflect.Modifier;
2323
import java.lang.reflect.Type;
24+
import java.util.logging.Level;
25+
import java.util.logging.Logger;
2426

2527
import org.msgpack.MessageTypeException;
2628
import org.msgpack.packer.Packer;
2729
import org.msgpack.template.Template;
2830
import org.msgpack.template.AbstractTemplate;
2931
import org.msgpack.template.TemplateRegistry;
3032
import org.msgpack.unpacker.Unpacker;
31-
import org.slf4j.Logger;
32-
import org.slf4j.LoggerFactory;
3333

3434
@SuppressWarnings({ "rawtypes", "unchecked" })
3535
public class ReflectionTemplateBuilder extends AbstractTemplateBuilder {
3636

37-
private static Logger LOG = LoggerFactory.getLogger(ReflectionBeansTemplateBuilder.class);
37+
private static Logger LOG = Logger.getLogger(ReflectionBeansTemplateBuilder.class.getName());
3838

3939
protected static abstract class ReflectionFieldTemplate extends AbstractTemplate<Object> {
4040
protected FieldEntry entry;
@@ -162,8 +162,8 @@ public ReflectionTemplateBuilder(TemplateRegistry registry) {
162162
public boolean matchType(Type targetType, boolean hasAnnotation) {
163163
Class<?> targetClass = (Class<?>) targetType;
164164
boolean matched = matchAtClassTemplateBuilder(targetClass, hasAnnotation);
165-
if (matched && LOG.isDebugEnabled()) {
166-
LOG.debug("matched type: " + targetClass.getName());
165+
if (matched && LOG.isLoggable(Level.FINE)) {
166+
LOG.fine("matched type: " + targetClass.getName());
167167
}
168168
return matched;
169169
}

‎src/main/java/org/msgpack/util/TemplatePrecompiler.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.HashSet;
2424
import java.util.List;
2525
import java.util.Properties;
26+
import java.util.logging.Logger;
2627
import java.util.regex.Matcher;
2728
import java.util.regex.Pattern;
2829

@@ -35,8 +36,6 @@
3536

3637
import org.msgpack.template.TemplateRegistry;
3738
import org.msgpack.template.builder.JavassistTemplateBuilder;
38-
import org.slf4j.Logger;
39-
import org.slf4j.LoggerFactory;
4039

4140
/**
4241
* This class is a template precompiler, which is used for saving templates that
@@ -46,7 +45,7 @@
4645
*/
4746
public class TemplatePrecompiler {
4847

49-
private static final Logger LOG = LoggerFactory.getLogger(TemplatePrecompiler.class);
48+
private static final Logger LOG = Logger.getLogger(TemplatePrecompiler.class.getName());
5049

5150
public static final String DEST = "msgpack.template.destdir";
5251

0 commit comments

Comments
 (0)