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

[jOOQ/jOOQ#9166] Deprecate loading settings from /jooq-settings.xml or from -Dorg.jooq.settings

Browse Source
This commit is contained in:
lukaseder 2019-09-05 14:25:32 +02:00
parent 99d18b548d
commit b7f0d51034
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jOOQ/src/main/java/org/jooq/conf/SettingsTools.java
View File

@ -50,6 +50,7 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.Locale;
import org.jooq.tools.JooqLogger;
import org.jooq.util.jaxb.tools.MiniJAXB;
/**
@ -59,13 +60,15 @@ import org.jooq.util.jaxb.tools.MiniJAXB;
*/
public final class SettingsTools {
private static final Settings DEFAULT_SETTINGS;
private static final Settings DEFAULT_SETTINGS;
private static final JooqLogger log = JooqLogger.getLogger(SettingsTools.class);
static {
Settings settings = null;
String property = System.getProperty("org.jooq.settings");
if (property != null) {
log.warn("DEPRECATION", "Loading system wide default settings via org.jooq.settings system properties has been deprecated. Please use explicit Settings in your Configuration references, instead.");
// Check classpath first
InputStream in = SettingsTools.class.getResourceAsStream(property);
@ -78,8 +81,10 @@ public final class SettingsTools {
if (settings == null) {
InputStream in = SettingsTools.class.getResourceAsStream("/jooq-settings.xml");
if (in != null)
if (in != null) {
log.warn("DEPRECATION", "Loading system wide default settings via the classpath /jooq-settings.xml resource has been deprecated. Please use explicit Settings in your Configuration references, instead.");
settings = MiniJAXB.unmarshal(in, Settings.class);
}
}
if (settings == null)