migrate from JUL to SLF4j

This commit is contained in:
Richard Vowles
2013-04-11 21:53:25 +12:00
parent 4ce891eb43
commit 0a951165e5
108 changed files with 688 additions and 631 deletions
@@ -6,8 +6,6 @@ import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Iterator;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
import javax.persistence.Transient;
@@ -25,6 +23,8 @@ import com.avaje.ebeaninternal.server.type.CtCompoundType;
import com.avaje.ebeaninternal.server.type.ScalarType;
import com.avaje.ebeaninternal.server.type.TypeManager;
import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Create the properties for a bean.
@@ -35,7 +35,7 @@ import com.avaje.ebeaninternal.server.type.reflect.CheckImmutableResponse;
*/
public class DeployCreateProperties {
private static final Logger logger = Logger.getLogger(DeployCreateProperties.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DeployCreateProperties.class);
private final DetermineManyType determineManyType;
@@ -62,11 +62,11 @@ public class DeployCreateProperties {
if (prop.isTransient()){
if (prop.getWriteMethod() == null || prop.getReadMethod() == null){
// Typically a helper method ... this is expected
logger.finest("... transient: "+prop.getFullBeanName());
logger.trace("... transient: "+prop.getFullBeanName());
} else {
// dubious, possible error...
String msg = Message.msg("deploy.property.nofield", desc.getFullName(), prop.getName());
logger.warning(msg);
logger.warn(msg);
}
}
}
@@ -112,7 +112,7 @@ public class DeployCreateProperties {
} else if (Modifier.isTransient(field.getModifiers())) {
// not interested in transient fields
logger.finer("Skipping transient field "+field.getName()+" in "+beanType.getName());
logger.trace("Skipping transient field "+field.getName()+" in "+beanType.getName());
} else if (ignoreFieldByName(field.getName())) {
// not interested this field (ebean or aspectJ field)
@@ -142,7 +142,7 @@ public class DeployCreateProperties {
} else {
String msg = "Huh??? property "+prop.getFullBeanName()+" being defined twice";
msg += " but replaced property was not transient? This is not expected?";
logger.warning(msg);
logger.warn(msg);
}
}
}
@@ -191,7 +191,7 @@ public class DeployCreateProperties {
char c = name.charAt(2);
if (Character.isUpperCase(c)){
String msg = "trimming off 'is' from boolean field name "+name+" in class "+beanType.getName();
logger.log(Level.INFO, msg);
logger.info(msg);
return name.substring(2);
}
@@ -285,7 +285,7 @@ public class DeployCreateProperties {
// not supporting this field (generic type used)
return null;
}
logger.warning("Could not find parameter type (via reflection) on "+desc.getFullName()+" "+field.getName());
logger.warn("Could not find parameter type (via reflection) on "+desc.getFullName()+" "+field.getName());
}
return createManyType(desc, targetType, manyType);
}
@@ -323,7 +323,7 @@ public class DeployCreateProperties {
}
}
} catch (Exception e){
logger.log(Level.SEVERE, "Error with "+desc+" field:"+field.getName(), e);
logger.error("Error with " + desc + " field:" + field.getName(), e);
}
}
@@ -1,8 +1,6 @@
package com.avaje.ebeaninternal.server.deploy.parse;
import java.sql.Types;
import java.util.logging.Logger;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.PersistenceException;
@@ -22,13 +20,15 @@ import com.avaje.ebeaninternal.server.type.ScalarType;
import com.avaje.ebeaninternal.server.type.ScalarTypeEnumStandard;
import com.avaje.ebeaninternal.server.type.SimpleAesEncryptor;
import com.avaje.ebeaninternal.server.type.TypeManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Utility object to help processing deployment information.
*/
public class DeployUtil {
private static final Logger logger = Logger.getLogger(DeployUtil.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DeployUtil.class);
@@ -193,7 +193,7 @@ public class DeployUtil {
} else {
// this is ok...
logger.finest("... transient property "+msg);
logger.trace("... transient property "+msg);
return null;
}
}
@@ -3,16 +3,16 @@ package com.avaje.ebeaninternal.server.deploy.parse;
import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.validation.ValidatorMeta;
import com.avaje.ebean.validation.factory.Validator;
import com.avaje.ebean.validation.factory.ValidatorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ValidatorFactoryManager {
static final Logger logger = Logger.getLogger(ValidatorFactoryManager.class.getName());
private static final Logger logger = LoggerFactory.getLogger(ValidatorFactoryManager.class);
Map<Class<?>, ValidatorFactory> factoryMap;
@@ -43,7 +43,7 @@ public class ValidatorFactoryManager {
} catch (Exception e) {
String msg = "Error creating ValidatorFactory " + factoryClass.getName();
logger.log(Level.SEVERE, msg, e);
logger.error(msg, e);
return null;
}
}