github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied Sergey's patch to support Settings from FactoryProxy

Browse Source
This commit is contained in:
Lukas Eder 2012-04-25 19:27:03 +02:00
parent 7e74511d82
commit 0cdbbb9a11
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jOOQ/src/main/java/org/jooq/impl/FactoryProxy.java
View File

@ -83,7 +83,6 @@ import org.jooq.UpdateQuery;
import org.jooq.UpdateSetStep;
import org.jooq.conf.Settings;
import org.jooq.exception.DataAccessException;
import org.jooq.tools.JooqLogger;
/**
* Thread safe proxy for {@link Factory}.
@ -104,15 +103,11 @@ public final class FactoryProxy implements FactoryOperations {
/**
* Generated UID
*/
private static final long serialVersionUID = -8475057043526340066L;
private static final long serialVersionUID = -8475057043526340066L;
private static JooqLogger log = JooqLogger.getLogger(FactoryProxy.class);
private transient DataSource dataSource;
private SQLDialect dialect;
@SuppressWarnings("deprecation")
private org.jooq.SchemaMapping schemaMapping;
private Settings settings;
private transient DataSource dataSource;
private SQLDialect dialect;
private Settings settings;
// -------------------------------------------------------------------------
// Injected configuration
@ -122,13 +117,6 @@ public final class FactoryProxy implements FactoryOperations {
this.dialect = dialect;
}
@SuppressWarnings("deprecation")
public final void setSchemaMapping(org.jooq.SchemaMapping schemaMapping) {
this.schemaMapping = schemaMapping;
log.warn("DEPRECATION", "org.jooq.SchemaMapping is deprecated as of jOOQ 2.0.5. Consider using jOOQ's runtime configuration org.jooq.conf.Settings instead");
}
public final void setSettings(Settings settings) {
this.settings = settings;
}
@ -153,7 +141,7 @@ public final class FactoryProxy implements FactoryOperations {
@Override
@Deprecated
public final org.jooq.SchemaMapping getSchemaMapping() {
return schemaMapping;
return null;
}
@Override
@ -526,7 +514,6 @@ public final class FactoryProxy implements FactoryOperations {
return getDelegate().executeDeleteOne(table, condition);
}
@SuppressWarnings("deprecation")
private Factory getDelegate() {
if (dataSource == null || dialect == null) {
throw new DataAccessException("Both dataSource and dialect properties should be set");
@ -536,17 +523,15 @@ public final class FactoryProxy implements FactoryOperations {
Connection con = getDataSource().getConnection();
Constructor<? extends Factory> constructor;
if (schemaMapping == null) {
if (settings == null) {
constructor = clazz.getConstructor(Connection.class);
return constructor.newInstance(con);
} else {
constructor = clazz.getConstructor(Connection.class, Settings.class);
return constructor.newInstance(con, settings);
}
else {
constructor = clazz.getConstructor(Connection.class, org.jooq.SchemaMapping.class);
return constructor.newInstance(con, schemaMapping);
}
}
catch (Exception e) {
throw new DataAccessException("Failed to create jOOQ Factory", e);
} catch (Exception exc) {
throw new DataAccessException("Failed to create jOOQ Factory", exc);
}
}
}