From b7f0d5103482e2ac76dc3efe86e8b957ea40bed6 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 5 Sep 2019 14:25:32 +0200 Subject: [PATCH] [jOOQ/jOOQ#9166] Deprecate loading settings from /jooq-settings.xml or from -Dorg.jooq.settings --- jOOQ/src/main/java/org/jooq/conf/SettingsTools.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java b/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java index db04f8c0b1..f345fc133a 100644 --- a/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java +++ b/jOOQ/src/main/java/org/jooq/conf/SettingsTools.java @@ -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)