[#6355] Improve Kotlin example in manual

jOOQ · Jun 21, 2017 · 5e5d44b · 5e5d44b
1 parent bc05c60
commit 5e5d44b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 41 deletions.
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Public.java
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/Sequences.java
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Author.java
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java b/jOOQ-examples/jOOQ-kotlin-example/src/main/java/org/jooq/example/db/h2/tables/Book.java
diff --git a/...mples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/FunWithKotlinAndJOOQ.kt b/...mples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/FunWithKotlinAndJOOQ.kt
@@ -53,12 +53,11 @@ fun main(args: Array<String>) {
     val properties = Properties();
     properties.load(properties::class.java.getResourceAsStream("/config.properties"));
 
-    DriverManager.getConnection(
+    DSL.using(
         properties.getProperty("db.url"),
         properties.getProperty("db.username"),
         properties.getProperty("db.password")
-    ).use {
+    ).use { ctx ->
-        val ctx = DSL.using(it)
         val a = AUTHOR
         val b = BOOK
 

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.10.xml
@@ -2771,11 +2771,7 @@ fun main(args: Array<String>) {
         properties.getProperty("db.url"),
         properties.getProperty("db.username"),
         properties.getProperty("db.password")
-
+    ).use { ctx ->
-    // The below "use" method is an adapted version of the one in kotlin.io
-    // See also: https://github.com/JetBrains/kotlin/pull/807
-    ).use {
-        val ctx = it
         val a = AUTHOR
         val b = BOOK
 

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.7.xml
@@ -2772,11 +2772,7 @@ fun main(args: Array<String>) {
         properties.getProperty("db.url"),
         properties.getProperty("db.username"),
         properties.getProperty("db.password")
-
+    ).use { ctx ->
-    // The below "use" method is an adapted version of the one in kotlin.io
-    // See also: https://github.com/JetBrains/kotlin/pull/807
-    ).use {
-        val ctx = it
         val a = AUTHOR
         val b = BOOK
 

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.8.xml
@@ -2772,11 +2772,7 @@ fun main(args: Array<String>) {
         properties.getProperty("db.url"),
         properties.getProperty("db.username"),
         properties.getProperty("db.password")
-
+    ).use { ctx ->
-    // The below "use" method is an adapted version of the one in kotlin.io
-    // See also: https://github.com/JetBrains/kotlin/pull/807
-    ).use {
-        val ctx = it
         val a = AUTHOR
         val b = BOOK
 

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml b/jOOQ-manual/src/main/resources/org/jooq/web/manual-3.9.xml
@@ -2771,11 +2771,7 @@ fun main(args: Array<String>) {
         properties.getProperty("db.url"),
         properties.getProperty("db.username"),
         properties.getProperty("db.password")
-
+    ).use { ctx ->
-    // The below "use" method is an adapted version of the one in kotlin.io
-    // See also: https://github.com/JetBrains/kotlin/pull/807
-    ).use {
-        val ctx = it
         val a = AUTHOR
         val b = BOOK