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

@@ -2,14 +2,14 @@ package com.avaje.ebeaninternal.server.persist;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
import com.avaje.ebeaninternal.api.SpiTransaction;
import com.avaje.ebeaninternal.server.core.PersistRequest;
import com.avaje.ebeaninternal.server.core.PersistRequestBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Controls the batch ordering of persist requests.
@@ -27,7 +27,7 @@ import com.avaje.ebeaninternal.server.core.PersistRequestBean;
*/
public final class BatchControl {
private static final Logger logger = Logger.getLogger(BatchControl.class.getName());
private static final Logger logger = LoggerFactory.getLogger(BatchControl.class);
/**
* Used to sort queue entries by depth.
@@ -167,8 +167,8 @@ public final class BatchControl {
if (persistList == null) {
// special case where the same bean instance has been added
// to the batch more than once
if (logger.isLoggable(Level.FINE)) {
logger.fine("Bean instance already in this batch: " + request.getBean());
if (logger.isDebugEnabled()) {
logger.debug("Bean instance already in this batch: " + request.getBean());
}
return -1;
}
@@ -1,11 +1,12 @@
package com.avaje.ebeaninternal.server.persist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -19,7 +20,7 @@ import javax.persistence.PersistenceException;
*/
public class BatchedPstmtHolder {
private static final Logger logger = Logger.getLogger(BatchedPstmtHolder.class.getName());
private static final Logger logger = LoggerFactory.getLogger(BatchedPstmtHolder.class);
/**
* A Map of the statements using a String key. This is used so that the same
@@ -101,7 +102,7 @@ public class BatchedPstmtHolder {
} catch (SQLException ex) {
SQLException next = ex.getNextException();
while(next != null) {
logger.log(Level.SEVERE, "Next Exception during batch execution", next);
logger.error("Next Exception during batch execution", next);
next = next.getNextException();
}
@@ -109,7 +110,7 @@ public class BatchedPstmtHolder {
firstError = ex;
errorSql = bs.getSql();
} else {
logger.log(Level.SEVERE, null, ex);
logger.error(null, ex);
}
isError = true;
@@ -118,7 +119,7 @@ public class BatchedPstmtHolder {
bs.close();
} catch (SQLException ex) {
// error closing PreparedStatement
logger.log(Level.SEVERE, null, ex);
logger.error(null, ex);
}
}
}
@@ -6,7 +6,6 @@ import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -15,13 +14,15 @@ import com.avaje.ebeaninternal.server.core.Message;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.type.ScalarType;
import com.avaje.ebeaninternal.server.type.TypeManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Binds bean values to a PreparedStatement.
*/
public class Binder {
private static final Logger logger = Logger.getLogger(Binder.class.getName());
private static final Logger logger = LoggerFactory.getLogger(Binder.class);
//private final Calendar calendar;
@@ -141,7 +142,7 @@ public class Binder {
}
} catch (SQLException ex) {
logger.warning(Message.msg("fetch.bind.error", "" + (dataBind.currentPos() - 1), value));
logger.warn(Message.msg("fetch.bind.error", "" + (dataBind.currentPos() - 1), value));
throw ex;
}
}
@@ -6,8 +6,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -40,6 +38,8 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocMany;
import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne;
import com.avaje.ebeaninternal.server.deploy.IntersectionRow;
import com.avaje.ebeaninternal.server.deploy.ManyType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Persister implementation using DML.
@@ -59,7 +59,7 @@ import com.avaje.ebeaninternal.server.deploy.ManyType;
*/
public final class DefaultPersister implements Persister {
private static final Logger logger = Logger.getLogger(DefaultPersister.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DefaultPersister.class);
/**
* Actually does the persisting work.
@@ -403,8 +403,8 @@ public final class DefaultPersister implements Persister {
} else {
// skip validation on unchanged bean
if (logger.isLoggable(Level.FINE)) {
logger.fine(Message.msg("persist.update.skipped", request.getBean()));
if (logger.isDebugEnabled()) {
logger.debug(Message.msg("persist.update.skipped", request.getBean()));
}
}
@@ -426,8 +426,8 @@ public final class DefaultPersister implements Persister {
if (req.isRegisteredForDeleteBean()) {
// skip deleting bean. Used where cascade is on
// both sides of a relationship
if (logger.isLoggable(Level.FINE)) {
logger.fine("skipping delete on alreadyRegistered " + bean);
if (logger.isDebugEnabled()) {
logger.debug("skipping delete on alreadyRegistered " + bean);
}
return;
}
@@ -1022,7 +1022,7 @@ public final class DefaultPersister implements Persister {
if (t.isLogSummary()) {
t.logInternal(m);
}
logger.log(Level.WARNING, m);
logger.warn(m);
} else {
if (!prop.hasImportedId(otherBean)) {
@@ -2,8 +2,6 @@ package com.avaje.ebeaninternal.server.persist;
import java.sql.CallableStatement;
import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -14,13 +12,15 @@ import com.avaje.ebeaninternal.server.core.PersistRequestCallableSql;
import com.avaje.ebeaninternal.server.core.PstmtBatch;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.util.BindParamsParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Handles the execution of CallableSql requests.
*/
public class ExeCallableSql {
private static final Logger logger = Logger.getLogger(ExeCallableSql.class.getName());
private static final Logger logger = LoggerFactory.getLogger(ExeCallableSql.class);
private final Binder binder;
@@ -68,7 +68,7 @@ public class ExeCallableSql {
try {
cstmt.close();
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}
@@ -2,8 +2,6 @@ package com.avaje.ebeaninternal.server.persist;
import java.sql.PreparedStatement;
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.PstmtBatch;
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.util.BindParamsParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Executes the UpdateSql requests.
*/
public class ExeOrmUpdate {
private static final Logger logger = Logger.getLogger(ExeOrmUpdate.class.getName());
private static final Logger logger = LoggerFactory.getLogger(ExeOrmUpdate.class);
private final Binder binder;
@@ -82,7 +82,7 @@ public class ExeOrmUpdate {
try {
pstmt.close();
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}
@@ -2,8 +2,6 @@ package com.avaje.ebeaninternal.server.persist;
import java.sql.PreparedStatement;
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.PersistRequestUpdateSql.SqlType;
import com.avaje.ebeaninternal.server.core.PstmtBatch;
import com.avaje.ebeaninternal.server.type.DataBind;
import com.avaje.ebeaninternal.server.util.BindParamsParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Executes the UpdateSql requests.
*/
public class ExeUpdateSql {
private static final Logger logger = Logger.getLogger(ExeUpdateSql.class.getName());
private static final Logger logger = LoggerFactory.getLogger(ExeUpdateSql.class);
private final Binder binder;
@@ -80,7 +80,7 @@ public class ExeUpdateSql {
try {
pstmt.close();
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}
@@ -1,8 +1,6 @@
package com.avaje.ebeaninternal.server.persist.dml;
import java.sql.SQLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.PersistenceException;
@@ -11,6 +9,8 @@ import com.avaje.ebeaninternal.server.core.PersistRequest;
import com.avaje.ebeaninternal.server.core.PersistRequestBean;
import com.avaje.ebeaninternal.server.lib.util.StringHelper;
import com.avaje.ebeaninternal.server.persist.BeanPersister;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Bean persister that uses the Handler and Meta objects.
@@ -23,7 +23,7 @@ import com.avaje.ebeaninternal.server.persist.BeanPersister;
*/
public final class DmlBeanPersister implements BeanPersister {
private static final Logger logger = Logger.getLogger(DmlBeanPersister.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DmlBeanPersister.class);
private final UpdateMeta updateMeta;
@@ -101,7 +101,7 @@ public final class DmlBeanPersister implements BeanPersister {
try {
handler.close();
} catch (SQLException e) {
logger.log(Level.SEVERE, null, e);
logger.error(null, e);
}
}
}
@@ -6,8 +6,6 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.persistence.OptimisticLockException;
@@ -19,6 +17,8 @@ import com.avaje.ebeaninternal.server.persist.BatchedPstmt;
import com.avaje.ebeaninternal.server.persist.BatchedPstmtHolder;
import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest;
import com.avaje.ebeaninternal.server.type.DataBind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@@ -26,7 +26,7 @@ import com.avaje.ebeaninternal.server.type.DataBind;
*/
public abstract class DmlHandler implements PersistHandler, BindableRequest {
protected static final Logger logger = Logger.getLogger(DmlHandler.class.getName());
private static final Logger logger = LoggerFactory.getLogger(DmlHandler.class);
/**
* The originating request.
@@ -125,7 +125,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest {
dataBind.close();
}
} catch (SQLException ex) {
logger.log(Level.SEVERE, null, ex);
logger.error(null, ex);
}
}
@@ -7,7 +7,6 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.HashSet;
import java.util.List;
import java.util.logging.Level;
import javax.persistence.OptimisticLockException;
import javax.persistence.PersistenceException;
@@ -21,11 +20,14 @@ import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
import com.avaje.ebeaninternal.server.deploy.BeanProperty;
import com.avaje.ebeaninternal.server.persist.DmlUtil;
import com.avaje.ebeaninternal.server.type.DataBind;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Insert bean handler.
*/
public class InsertHandler extends DmlHandler {
private static final Logger logger = LoggerFactory.getLogger(InsertHandler.class);
/**
* The associated InsertMeta data.
@@ -186,7 +188,7 @@ public class InsertHandler extends DmlHandler {
rset.close();
} catch (SQLException ex) {
String msg = "Error closing rset for returning generatedKeys?";
logger.log(Level.WARNING, msg, ex);
logger.warn(msg, ex);
}
}
}
@@ -219,7 +221,7 @@ public class InsertHandler extends DmlHandler {
}
} catch (SQLException ex) {
String msg = "Error closing rset for fetchGeneratedKeyUsingSelect?";
logger.log(Level.WARNING, msg, ex);
logger.warn(msg, ex);
}
try {
if (stmt != null) {
@@ -227,7 +229,7 @@ public class InsertHandler extends DmlHandler {
}
} catch (SQLException ex) {
String msg = "Error closing stmt for fetchGeneratedKeyUsingSelect?";
logger.log(Level.WARNING, msg, ex);
logger.warn(msg, ex);
}
}
}