From bb3be29c06d9e108371489a1895ef0fabc547ca0 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 17 Jun 2014 10:35:07 +0200
Subject: [PATCH] [#3328] Re-create old DefaultConfiguration constructors for
 backwards-compatibility

---
 .../org/jooq/impl/DefaultConfiguration.java   | 97 +++++++++++++++----
 1 file changed, 79 insertions(+), 18 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index d9067f3052..6c43559376 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -166,18 +166,79 @@ public class DefaultConfiguration implements Configuration {
      *
      * @deprecated Use
      *             {@link #DefaultConfiguration(ConnectionProvider, TransactionProvider, RecordMapperProvider, RecordListenerProvider[], ExecuteListenerProvider[], VisitListenerProvider[], SQLDialect, Settings, Map)}
-     *             instead
+     *             instead. This constructor is maintained to provide jOOQ 3.0 backwards-compatibility if called with reflection from Spring configurations.
      */
     @Deprecated
     DefaultConfiguration(
-            ConnectionProvider connectionProvider,
-            RecordMapperProvider recordMapperProvider,
-            RecordListenerProvider[] recordListenerProviders,
-            ExecuteListenerProvider[] executeListenerProviders,
-            VisitListenerProvider[] visitListenerProviders,
-            SQLDialect dialect,
-            Settings settings,
-            Map<Object, Object> data)
+        ConnectionProvider connectionProvider,
+        ExecuteListenerProvider[] executeListenerProviders,
+        SQLDialect dialect,
+        Settings settings,
+        Map<Object, Object> data)
+    {
+        this(
+            connectionProvider,
+            null,
+            null,
+            null,
+            executeListenerProviders,
+            null,
+            dialect,
+            settings,
+            data
+        );
+    }
+
+    /**
+     * This constructor is maintained for backwards-compatibility reasons.
+     * Spring users tend to construct this <code>DefaultConfiguration</code>
+     * through reflection.
+     *
+     * @deprecated Use
+     *             {@link #DefaultConfiguration(ConnectionProvider, TransactionProvider, RecordMapperProvider, RecordListenerProvider[], ExecuteListenerProvider[], VisitListenerProvider[], SQLDialect, Settings, Map)}
+     *             instead. This constructor is maintained to provide jOOQ 3.1 backwards-compatibility if called with reflection from Spring configurations.
+     */
+    @Deprecated
+    DefaultConfiguration(
+        ConnectionProvider connectionProvider,
+        RecordMapperProvider recordMapperProvider,
+        ExecuteListenerProvider[] executeListenerProviders,
+        SQLDialect dialect,
+        Settings settings,
+        Map<Object, Object> data)
+    {
+        this(
+            connectionProvider,
+            null,
+            recordMapperProvider,
+            null,
+            executeListenerProviders,
+            null,
+            dialect,
+            settings,
+            data
+        );
+    }
+
+    /**
+     * This constructor is maintained for backwards-compatibility reasons.
+     * Spring users tend to construct this <code>DefaultConfiguration</code>
+     * through reflection.
+     *
+     * @deprecated Use
+     *             {@link #DefaultConfiguration(ConnectionProvider, TransactionProvider, RecordMapperProvider, RecordListenerProvider[], ExecuteListenerProvider[], VisitListenerProvider[], SQLDialect, Settings, Map)}
+     *             instead. This constructor is maintained to provide jOOQ 3.2, 3.3 backwards-compatibility if called with reflection from Spring configurations.
+     */
+    @Deprecated
+    DefaultConfiguration(
+        ConnectionProvider connectionProvider,
+        RecordMapperProvider recordMapperProvider,
+        RecordListenerProvider[] recordListenerProviders,
+        ExecuteListenerProvider[] executeListenerProviders,
+        VisitListenerProvider[] visitListenerProviders,
+        SQLDialect dialect,
+        Settings settings,
+        Map<Object, Object> data)
     {
         this(
             connectionProvider,
@@ -201,15 +262,15 @@ public class DefaultConfiguration implements Configuration {
      * <code>derive()</code> methods.
      */
     DefaultConfiguration(
-            ConnectionProvider connectionProvider,
-            TransactionProvider transactionProvider,
-            RecordMapperProvider recordMapperProvider,
-            RecordListenerProvider[] recordListenerProviders,
-            ExecuteListenerProvider[] executeListenerProviders,
-            VisitListenerProvider[] visitListenerProviders,
-            SQLDialect dialect,
-            Settings settings,
-            Map<Object, Object> data)
+        ConnectionProvider connectionProvider,
+        TransactionProvider transactionProvider,
+        RecordMapperProvider recordMapperProvider,
+        RecordListenerProvider[] recordListenerProviders,
+        ExecuteListenerProvider[] executeListenerProviders,
+        VisitListenerProvider[] visitListenerProviders,
+        SQLDialect dialect,
+        Settings settings,
+        Map<Object, Object> data)
     {
         set(connectionProvider);
         set(transactionProvider);