From d3f84796505705d491be665192b4bb605ea75ed6 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Wed, 16 Sep 2015 14:53:46 +0200
Subject: [PATCH] [#4565] Add Optional support to org.jooq.tools.Convert

---
 jOOQ/src/main/java/org/jooq/tools/Convert.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java
index ec49d1403d..a3ab6a64c0 100644
--- a/jOOQ/src/main/java/org/jooq/tools/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java
@@ -74,6 +74,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -461,6 +462,13 @@ public final class Convert {
                         return convert(0, toClass);
                     }
                 }
+
+                /* [java-8] */
+                else if (toClass == Optional.class) {
+                    return (U) Optional.empty();
+                }
+                /* [/java-8] */
+
                 else {
                     return null;
                 }
@@ -496,6 +504,12 @@ public final class Convert {
                     }
                 }
 
+                /* [java-8] */
+                else if (toClass == Optional.class) {
+                    return (U) Optional.of(from);
+                }
+                /* [/java-8] */
+
                 // All types can be converted into String
                 else if (toClass == String.class) {
                     if (from instanceof EnumType) {