mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
migrate from JUL to SLF4j
This commit is contained in:
1 parent
4ce891eb43
commit
0a951165e5
108 files changed
+688
-631
No files matched your search
@@ -1,16 +1,16 @@
|
||||
package com.avaje.ebeaninternal.server.ddl;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanProperty;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Used to generate the drop table DDL script.
|
||||
*/
|
||||
public class CreateSequenceVisitor implements BeanVisitor {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(DropSequenceVisitor.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(CreateSequenceVisitor.class);
|
||||
|
||||
private final DdlGenContext ctx;
|
||||
|
||||
@@ -34,7 +34,7 @@ public class CreateSequenceVisitor implements BeanVisitor {
|
||||
// Hopefully a generic test case
|
||||
String msg = "Not creating sequence "+descriptor.getSequenceName()+" on Bean "+descriptor.getName()
|
||||
+" as DatabasePlatform does not support sequences";
|
||||
logger.warning(msg);
|
||||
logger.warn(msg);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package com.avaje.ebeaninternal.server.ddl;
|
||||
|
||||
import java.sql.Types;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebean.config.dbplatform.DbDdlSyntax;
|
||||
import com.avaje.ebean.config.dbplatform.IdType;
|
||||
@@ -14,13 +12,15 @@ import com.avaje.ebeaninternal.server.deploy.TableJoin;
|
||||
import com.avaje.ebeaninternal.server.deploy.TableJoinColumn;
|
||||
import com.avaje.ebeaninternal.server.deploy.id.ImportedId;
|
||||
import com.avaje.ebeaninternal.server.lib.util.StringHelper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Used as part of CreateTableVisitor to generated the create table DDL script.
|
||||
*/
|
||||
public class CreateTableColumnVisitor extends BaseTablePropertyVisitor {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(CreateTableColumnVisitor.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(CreateTableColumnVisitor.class);
|
||||
|
||||
private final DdlGenContext ctx;
|
||||
|
||||
@@ -213,7 +213,7 @@ public class CreateTableColumnVisitor extends BaseTablePropertyVisitor {
|
||||
}
|
||||
} catch (Exception e){
|
||||
String msg = "Error determining identity on property "+p.getFullBeanName();
|
||||
logger.log(Level.SEVERE, msg, e);
|
||||
logger.error(msg, e);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.avaje.ebeaninternal.server.ddl;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebean.config.dbplatform.DbDdlSyntax;
|
||||
import com.avaje.ebean.config.dbplatform.DbType;
|
||||
@@ -14,13 +13,15 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompound;
|
||||
import com.avaje.ebeaninternal.server.deploy.CompoundUniqueContraint;
|
||||
import com.avaje.ebeaninternal.server.deploy.InheritInfo;
|
||||
import com.avaje.ebeaninternal.server.deploy.parse.SqlReservedWords;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Used to generated the create table DDL script.
|
||||
*/
|
||||
public class CreateTableVisitor extends AbstractBeanVisitor {
|
||||
|
||||
protected static final Logger logger = Logger.getLogger(CreateTableVisitor.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(CreateTableVisitor.class);
|
||||
|
||||
final DdlGenContext ctx;
|
||||
|
||||
@@ -78,7 +79,7 @@ public class CreateTableVisitor extends AbstractBeanVisitor {
|
||||
}
|
||||
|
||||
if (SqlReservedWords.isKeyword(table)) {
|
||||
logger.warning("Table name ["+table+"] is a suspected SQL reserved word for bean "+descriptor.getFullName());
|
||||
logger.warn("Table name ["+table+"] is a suspected SQL reserved word for bean "+descriptor.getFullName());
|
||||
}
|
||||
|
||||
ctx.write(tableName);
|
||||
@@ -102,7 +103,7 @@ public class CreateTableVisitor extends AbstractBeanVisitor {
|
||||
|
||||
if (SqlReservedWords.isKeyword(columnName)) {
|
||||
String propName = p == null ? "(Unknown)" : p.getFullBeanName();
|
||||
logger.warning("Column name ["+columnName+"] is a suspected SQL reserved word for property "+propName);
|
||||
logger.warn("Column name ["+columnName+"] is a suspected SQL reserved word for property "+propName);
|
||||
}
|
||||
|
||||
ctx.write(" ").write(columnName, columnNameWidth).write(" ");
|
||||
|
||||
@@ -13,8 +13,6 @@ import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import javax.persistence.PersistenceException;
|
||||
|
||||
@@ -24,13 +22,15 @@ import com.avaje.ebean.config.ServerConfig;
|
||||
import com.avaje.ebean.config.dbplatform.DatabasePlatform;
|
||||
import com.avaje.ebeaninternal.api.SpiEbeanPlugin;
|
||||
import com.avaje.ebeaninternal.api.SpiEbeanServer;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Controls the generation of DDL and potentially runs the resulting scripts.
|
||||
*/
|
||||
public class DdlGenerator implements SpiEbeanPlugin {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(DdlGenerator.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(DdlGenerator.class);
|
||||
|
||||
private SpiEbeanServer server;
|
||||
|
||||
@@ -258,7 +258,7 @@ public class DdlGenerator implements SpiEbeanPlugin {
|
||||
stmt = stmt.substring(0, stmt.length()-1);
|
||||
}
|
||||
|
||||
logger.log(Level.FINER, "executing "+oneOf+" "+ getSummary(stmt));
|
||||
logger.trace("executing "+oneOf+" "+ getSummary(stmt));
|
||||
|
||||
pstmt = c.prepareStatement(stmt);
|
||||
pstmt.execute();
|
||||
@@ -276,7 +276,7 @@ public class DdlGenerator implements SpiEbeanPlugin {
|
||||
try {
|
||||
pstmt.close();
|
||||
} catch (SQLException e){
|
||||
logger.log(Level.SEVERE, "Error closing pstmt", e);
|
||||
logger.error("Error closing pstmt", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
package com.avaje.ebeaninternal.server.ddl;
|
||||
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import com.avaje.ebean.config.dbplatform.DbDdlSyntax;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanProperty;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Used to generate the drop table DDL script.
|
||||
*/
|
||||
public class DropSequenceVisitor implements BeanVisitor {
|
||||
|
||||
private static final Logger logger = Logger.getLogger(DropSequenceVisitor.class.getName());
|
||||
private static final Logger logger = LoggerFactory.getLogger(DropSequenceVisitor.class);
|
||||
|
||||
private final DdlGenContext ctx;
|
||||
|
||||
@@ -37,7 +37,7 @@ public class DropSequenceVisitor implements BeanVisitor {
|
||||
// Hopefully a generic test case
|
||||
String msg = "Not dropping sequence "+descriptor.getSequenceName()+" on Bean "+descriptor.getName()
|
||||
+" as DatabasePlatform does not support sequences";
|
||||
logger.finer(msg);
|
||||
logger.trace(msg);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user