migrate from JUL to SLF4j

This commit is contained in:
Richard Vowles committed 2013-04-11 21:53:25 +12:00
1 parent 4ce891eb43
commit 0a951165e5
108 files changed
+688 -631

No files matched your search

@@ -1,11 +1,11 @@
package com.avaje.ebeaninternal.server.query;
import java.util.concurrent.Callable;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.bean.BeanCollection;
import com.avaje.ebeaninternal.api.SpiTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Continue the fetch using a Background thread. The client knows when this has
@@ -13,7 +13,7 @@ import com.avaje.ebeaninternal.api.SpiTransaction;
*/
public class BackgroundFetch implements Callable<Integer> {
private static final Logger logger = Logger.getLogger(BackgroundFetch.class.getName());
private static final Logger logger = LoggerFactory.getLogger(BackgroundFetch.class);
private final CQuery<?> cquery;
@@ -38,14 +38,14 @@ public class BackgroundFetch implements Callable<Integer> {
return bc.size();
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
return Integer.valueOf(0);
} finally {
try {
cquery.close();
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
// we must have our own transaction for background fetching
@@ -53,7 +53,7 @@ public class BackgroundFetch implements Callable<Integer> {
// connection back into the connection pool.
transaction.rollback();
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -4,13 +4,13 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.concurrent.Callable;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.api.BeanIdList;
import com.avaje.ebeaninternal.api.SpiTransaction;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.deploy.DbReadContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Continue the fetch using a Background thread. The client knows when this has
@@ -18,7 +18,7 @@ import com.avaje.ebeaninternal.server.deploy.DbReadContext;
*/
public class BackgroundIdFetch implements Callable<Integer> {
private static final Logger logger = Logger.getLogger(BackgroundIdFetch.class.getName());
private static final Logger logger = LoggerFactory.getLogger(BackgroundIdFetch.class);
private final ResultSet rset;
@@ -61,21 +61,21 @@ public class BackgroundIdFetch implements Callable<Integer> {
rowsRead++;
}
if (logger.isLoggable(Level.INFO)){
if (logger.isInfoEnabled()){
logger.info("BG FetchIds read:"+rowsRead+" total:"+(startSize+rowsRead));
}
return rowsRead;
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
return 0;
} finally {
try {
close();
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
// we must have our own transaction for background fetching
@@ -83,7 +83,7 @@ public class BackgroundIdFetch implements Callable<Integer> {
// connection back into the connection pool.
transaction.rollback();
} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -95,14 +95,14 @@ public class BackgroundIdFetch implements Callable<Integer> {
rset.close();
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
if (pstmt != null) {
pstmt.close();
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -6,8 +6,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -41,6 +39,8 @@ import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties;
import com.avaje.ebeaninternal.server.transaction.DefaultPersistenceContext;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.type.DataReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* An object that represents a SqlSelect statement.
@@ -56,7 +56,7 @@ import com.avaje.ebeaninternal.server.type.DataReader;
*/
public class CQuery<T> implements DbReadContext, CancelableQuery {
private static final Logger logger = Logger.getLogger(CQuery.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CQuery.class);
private static final int GLOBAL_ROW_LIMIT = 1000000;
@@ -400,7 +400,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
dataReader = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
if (pstmt != null) {
@@ -408,7 +408,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
pstmt = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -654,7 +654,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery {
queryPlan.executionTime(loadedBeanCount, executionTimeMicros);
} catch (Exception e){
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -2,7 +2,6 @@ package com.avaje.ebeaninternal.server.query;
import java.sql.SQLException;
import java.util.concurrent.FutureTask;
import java.util.logging.Logger;
import com.avaje.ebean.BackgroundExecutor;
import com.avaje.ebean.QueryIterator;
@@ -15,13 +14,15 @@ import com.avaje.ebeaninternal.api.SpiQuery;
import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
import com.avaje.ebeaninternal.server.jmx.MAdminLogging;
import com.avaje.ebeaninternal.server.persist.Binder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Handles the Object Relational fetching.
*/
public class CQueryEngine {
private static final Logger logger = Logger.getLogger(CQueryEngine.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CQueryEngine.class);
private final CQueryBuilder queryBuilder;
@@ -66,7 +67,7 @@ public class CQueryEngine {
if (!list.isFetchingInBackground() && request.getQuery().isFutureFetch()) {
// end the transaction for futureFindIds (it had it's own one)
logger.fine("Future findIds completed!");
logger.debug("Future findIds completed!");
request.getTransaction().end();
}
@@ -100,7 +101,7 @@ public class CQueryEngine {
}
if (request.getQuery().isFutureFetch()) {
logger.fine("Future findRowCount completed!");
logger.debug("Future findRowCount completed!");
request.getTransaction().end();
}
@@ -132,7 +133,7 @@ public class CQueryEngine {
if (!cquery.prepareBindExecuteQuery()) {
// query has been cancelled already
logger.finest("Future fetch already cancelled");
logger.trace("Future fetch already cancelled");
return null;
}
@@ -173,7 +174,7 @@ public class CQueryEngine {
if (!cquery.prepareBindExecuteQuery()) {
// query has been cancelled already
logger.finest("Future fetch already cancelled");
logger.trace("Future fetch already cancelled");
return null;
}
@@ -221,7 +222,7 @@ public class CQueryEngine {
if (request.getQuery().isFutureFetch()) {
// end the transaction for futureFindIds
// as it had it's own transaction
logger.fine("Future fetch completed!");
logger.debug("Future fetch completed!");
request.getTransaction().end();
}
}
@@ -9,8 +9,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.FutureTask;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebean.BackgroundExecutor;
import com.avaje.ebean.bean.BeanCollection;
@@ -28,13 +26,15 @@ import com.avaje.ebeaninternal.server.deploy.DbReadContext;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.type.DataReader;
import com.avaje.ebeaninternal.server.type.RsetDataReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Executes the select row count query.
*/
public class CQueryFetchIds {
private static final Logger logger = Logger.getLogger(CQueryFetchIds.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CQueryFetchIds.class);
/**
* The overall find request wrapper object.
@@ -236,7 +236,7 @@ public class CQueryFetchIds {
dataReader = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
if (pstmt != null) {
@@ -244,7 +244,7 @@ public class CQueryFetchIds {
pstmt = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -3,8 +3,6 @@ package com.avaje.ebeaninternal.server.query;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.api.BindParams;
import com.avaje.ebeaninternal.api.BindParams.OrderedList;
@@ -19,6 +17,8 @@ import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.util.BindParamsParser;
import com.avaje.ebeaninternal.util.DefaultExpressionRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Compile Query Predicates.
@@ -33,7 +33,7 @@ import com.avaje.ebeaninternal.util.DefaultExpressionRequest;
*/
public class CQueryPredicates {
private static final Logger logger = Logger.getLogger(CQueryPredicates.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CQueryPredicates.class);
private final Binder binder;
@@ -455,7 +455,7 @@ public class CQueryPredicates {
msg += " must come before the many property [" + manyProp.getName() + "] in the orderBy.";
msg += " Ebean has automatically modified the orderBy clause to do this.";
logger.log(Level.WARNING, msg);
logger.warn(msg);
}
// the id needs to come before the manyPropName
@@ -4,8 +4,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -15,13 +13,15 @@ import com.avaje.ebeaninternal.server.core.OrmQueryRequest;
import com.avaje.ebeaninternal.server.core.SpiOrmQueryRequest;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.type.DataBind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Executes the select row count query.
*/
public class CQueryRowCount {
private static final Logger logger = Logger.getLogger(CQueryRowCount.class.getName());
private static final Logger logger = LoggerFactory.getLogger(CQueryRowCount.class);
/**
* The overall find request wrapper object.
@@ -157,7 +157,7 @@ public class CQueryRowCount {
rset = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
if (pstmt != null) {
@@ -165,7 +165,7 @@ public class CQueryRowCount {
pstmt = null;
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
@@ -6,8 +6,6 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -25,13 +23,15 @@ import com.avaje.ebeaninternal.server.jmx.MAdminLogging;
import com.avaje.ebeaninternal.server.persist.Binder;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.util.BindParamsParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Perform native sql fetches.
*/
public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
private static final Logger logger = Logger.getLogger(DefaultRelationalQueryEngine.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DefaultRelationalQueryEngine.class);
private final int defaultMaxRows;
@@ -75,7 +75,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
synchronized (query) {
if (query.isCancelled()){
logger.finest("Query already cancelled");
logger.trace("Query already cancelled");
return null;
}
@@ -182,7 +182,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
}
if (query.isCancelled()){
logger.fine("Query was cancelled during execution rows:"+loadRowCount);
logger.debug("Query was cancelled during execution rows:"+loadRowCount);
}
return beanColl;
@@ -198,14 +198,14 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine {
rset.close();
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
try {
if (pstmt != null) {
pstmt.close();
}
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}
@@ -1,8 +1,5 @@
package com.avaje.ebeaninternal.server.query;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
import com.avaje.ebean.config.dbplatform.DatabasePlatform;
@@ -16,6 +13,8 @@ import com.avaje.ebeaninternal.server.deploy.DeployNamedQuery;
import com.avaje.ebeaninternal.server.deploy.DeployParser;
import com.avaje.ebeaninternal.server.persist.Binder;
import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Factory for SqlSelectClause based on raw sql.
@@ -26,7 +25,7 @@ import com.avaje.ebeaninternal.server.querydefn.OrmQueryLimitRequest;
*/
public class RawSqlSelectClauseBuilder {
private static final Logger logger = Logger.getLogger(RawSqlSelectClauseBuilder.class.getName());
private static final Logger logger = LoggerFactory.getLogger(RawSqlSelectClauseBuilder.class);
private final Binder binder;
@@ -92,7 +91,7 @@ public class RawSqlSelectClauseBuilder {
} catch (Exception e) {
String msg = "Error with " + desc.getFullName() + " query:\r" + sql;
logger.log(Level.SEVERE, msg);
logger.error(msg);
throw new PersistenceException(e);
}
}
@@ -9,8 +9,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.avaje.ebeaninternal.api.ManyWhereJoins;
import com.avaje.ebeaninternal.api.SpiQuery;
@@ -26,13 +24,15 @@ import com.avaje.ebeaninternal.server.deploy.TableJoin;
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
import com.avaje.ebeaninternal.server.querydefn.OrmQueryProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Factory for SqlTree.
*/
public class SqlTreeBuilder {
private static final Logger logger = Logger.getLogger(SqlTreeBuilder.class.getName());
private static final Logger logger = LoggerFactory.getLogger(SqlTreeBuilder.class);
private final SpiQuery<?> query;
@@ -322,7 +322,7 @@ public class SqlTreeBuilder {
BeanProperty p = desc.findBeanProperty(propName);
if (p == null) {
logger.log(Level.SEVERE, "property [" + propName + "]not found on " + desc + " for query - excluding it.");
logger.error("property [" + propName + "]not found on " + desc + " for query - excluding it.");
}
else if (p instanceof BeanPropertyAssoc<?> && p.isEmbedded()) {
@@ -356,7 +356,7 @@ public class SqlTreeBuilder {
BeanProperty p = desc.findBeanProperty(baseName);
if (p == null) {
String m = "property [" + propName + "] not found on " + desc + " for query - excluding it.";
logger.log(Level.SEVERE, m);
logger.error(m);
} else if (p.isEmbedded()) {
// add the embedded bean (and effectively
@@ -369,7 +369,7 @@ public class SqlTreeBuilder {
} else {
String m = "property [" + p.getFullBeanName()
+ "] expected to be an embedded bean for query - excluding it.";
logger.log(Level.SEVERE, m);
logger.error(m);
}
}
@@ -378,8 +378,8 @@ public class SqlTreeBuilder {
// sub class hierarchy if required
BeanProperty p = desc.findBeanProperty(propName);
if (p == null) {
logger.log(Level.SEVERE, "property [" + propName + "] not found on " + desc
+ " for query - excluding it.");
logger.error("property [" + propName + "] not found on " + desc
+ " for query - excluding it.");
} else if (p.isId()) {
// do not bother to include id for normal queries as the
@@ -474,9 +474,9 @@ public class SqlTreeBuilder {
if (manyProperty != null) {
// only one many associated allowed to be included in fetch
if (logger.isLoggable(Level.FINE)) {
if (logger.isDebugEnabled()) {
String msg = "Not joining [" + propName + "] as already joined to a Many[" + manyProperty + "].";
logger.fine(msg);
logger.debug(msg);
}
return false;
}