From 5730c6e67fb901665a795bcf71c459759189d0dd Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Thu, 19 Oct 2017 11:31:55 +0200
Subject: [PATCH] [#6720] Refactor some internals to use Scope.dsl() or
 Configuration.dsl()

---
 .../main/java/org/jooq/util/JavaGenerator.java  |  6 ++----
 .../jooq/util/SQLCatalogVersionProvider.java    | 17 ++++++++---------
 .../org/jooq/util/SQLSchemaVersionProvider.java | 17 ++++++++---------
 .../jooq/example/chart/SakilaReportService.java |  2 +-
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index 7468f9e4a3..c5aba8375b 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -5305,16 +5305,14 @@ public class JavaGenerator extends AbstractGenerator {
 
         if (scala) {
             out.println(") : %s[%s] = {", Result.class, recordClassName);
-            out.tab(2).print("%s.using(%s).selectFrom(%s.call(",
-                DSL.class,
+            out.tab(2).print("%s.dsl().selectFrom(%s.call(",
                 configurationArgument,
                 // [#5765] To prevent name clashes, this identifier is not imported
                 getStrategy().getFullJavaIdentifier(function));
         }
         else {
             out.println(") {");
-            out.tab(2).print("return %s.using(%s).selectFrom(%s.call(",
-                DSL.class,
+            out.tab(2).print("return %s.dsl().selectFrom(%s.call(",
                 configurationArgument,
                 // [#5765] To prevent name clashes, this identifier is not imported
                 getStrategy().getFullJavaIdentifier(function));
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/SQLCatalogVersionProvider.java b/jOOQ-codegen/src/main/java/org/jooq/util/SQLCatalogVersionProvider.java
index 064c007d7d..b1b3c6b640 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/SQLCatalogVersionProvider.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/SQLCatalogVersionProvider.java
@@ -40,7 +40,6 @@ import static org.jooq.impl.DSL.param;
 import java.sql.Connection;
 
 import org.jooq.conf.Settings;
-import org.jooq.impl.DSL;
 import org.jooq.impl.DefaultConfiguration;
 
 /**
@@ -59,13 +58,13 @@ class SQLCatalogVersionProvider implements CatalogVersionProvider {
     @Override
     public String version(CatalogDefinition catalog) {
         return "" +
-            DSL.using(
-                new DefaultConfiguration()
-                    .set(connection)
-                    .set(new Settings().withStatementType(STATIC_STATEMENT))
-            ).fetchValue(
-                // [#2906] TODO Plain SQL statements do not yet support named parameters
-                sql.replace(":catalog_name", "?"), param("catalog_name", catalog.getInputName())
-            );
+            new DefaultConfiguration()
+                .set(connection)
+                .set(new Settings().withStatementType(STATIC_STATEMENT))
+                .dsl()
+                .fetchValue(
+                    // [#2906] TODO Plain SQL statements do not yet support named parameters
+                    sql.replace(":catalog_name", "?"), param("catalog_name", catalog.getInputName())
+                );
     }
 }
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/SQLSchemaVersionProvider.java b/jOOQ-codegen/src/main/java/org/jooq/util/SQLSchemaVersionProvider.java
index b22b7d9f03..4bca97059e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/SQLSchemaVersionProvider.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/SQLSchemaVersionProvider.java
@@ -40,7 +40,6 @@ import static org.jooq.impl.DSL.param;
 import java.sql.Connection;
 
 import org.jooq.conf.Settings;
-import org.jooq.impl.DSL;
 import org.jooq.impl.DefaultConfiguration;
 
 /**
@@ -59,13 +58,13 @@ class SQLSchemaVersionProvider implements SchemaVersionProvider {
     @Override
     public String version(SchemaDefinition schema) {
         return "" +
-            DSL.using(
-                new DefaultConfiguration()
-                    .set(connection)
-                    .set(new Settings().withStatementType(STATIC_STATEMENT))
-            ).fetchValue(
-                // [#2906] TODO Plain SQL statements do not yet support named parameters
-                sql.replace(":schema_name", "?"), param("schema_name", schema.getInputName())
-            );
+            new DefaultConfiguration()
+                .set(connection)
+                .set(new Settings().withStatementType(STATIC_STATEMENT))
+                .dsl()
+                .fetchValue(
+                    // [#2906] TODO Plain SQL statements do not yet support named parameters
+                    sql.replace(":schema_name", "?"), param("schema_name", schema.getInputName())
+                );
     }
 }
diff --git a/jOOQ-examples/jOOQ-spark-chart-example/src/main/java/org/jooq/example/chart/SakilaReportService.java b/jOOQ-examples/jOOQ-spark-chart-example/src/main/java/org/jooq/example/chart/SakilaReportService.java
index a66b885ad7..aa8ed03fdc 100644
--- a/jOOQ-examples/jOOQ-spark-chart-example/src/main/java/org/jooq/example/chart/SakilaReportService.java
+++ b/jOOQ-examples/jOOQ-spark-chart-example/src/main/java/org/jooq/example/chart/SakilaReportService.java
@@ -94,7 +94,7 @@ public class SakilaReportService {
                 public void executeEnd(ExecuteContext ctx) {
                     Configuration config = ctx.configuration().derive();
                     config.settings().setRenderFormatted(true);
-                    log.info("\n" + DSL.using(config).renderInlined(ctx.query()));
+                    log.info("\n" + config.dsl().renderInlined(ctx.query()));
                 }
 
                 @Override