o Moving Jenkins XML objects and parsing to it's own package.

o Removing fields from JenkinsBuild that's read from the XML later on.

4 files changed, 29 insertions, 0 deletions

diff --git a/src/main/java/io/trygvis/esper/testing/util/sql/ResultSetF.java b/src/main/java/io/trygvis/esper/testing/util/sql/ResultSetF.java
index 7169372..7169372 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/util/sql/ResultSetF.java
+++ b/src/main/java/io/trygvis/esper/testing/util/sql/ResultSetF.java
diff --git a/src/main/java/io/trygvis/esper/testing/util/sql/SqlF.java b/src/main/java/io/trygvis/esper/testing/util/sql/SqlF.java
index e4e8197..e4e8197 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/util/sql/SqlF.java
+++ b/src/main/java/io/trygvis/esper/testing/util/sql/SqlF.java
diff --git a/src/main/java/io/trygvis/esper/testing/util/sql/SqlOption.java b/src/main/java/io/trygvis/esper/testing/util/sql/SqlOption.java
index 286a872..43fb440 100644..100755
--- a/src/main/java/io/trygvis/esper/testing/util/sql/SqlOption.java
+++ b/src/main/java/io/trygvis/esper/testing/util/sql/SqlOption.java
@@ -1,5 +1,7 @@
 package io.trygvis.esper.testing.util.sql;
 
+import fj.data.*;
+
 import java.sql.*;
 
 public abstract class SqlOption<A> {
@@ -45,6 +47,10 @@ public abstract class SqlOption<A> {
 
     public abstract A getOrElse(A a);
 
+    public abstract A getOrElse(SqlP0<A> p) throws SQLException;
+
+    public abstract Option<A> toFj();
+
     public static <A> SqlOption<A> fromNull(A a) {
         if (a != null) {
             return some(a);
@@ -74,6 +80,14 @@ public abstract class SqlOption<A> {
             return a;
         }
 
+        public A getOrElse(SqlP0<A> p) throws SQLException {
+            return p.apply();
+        }
+
+        public Option<A> toFj() {
+            return Option.none();
+        }
+
         public String toString() {
             return "None";
         }
@@ -102,6 +116,14 @@ public abstract class SqlOption<A> {
             return this.a;
         }
 
+        public A getOrElse(SqlP0<A> p) throws SQLException {
+            return a;
+        }
+
+        public Option<A> toFj() {
+            return Option.some(a);
+        }
+
         public String toString() {
             return "Some(" + a + ")";
         }
diff --git a/src/main/java/io/trygvis/esper/testing/util/sql/SqlP0.java b/src/main/java/io/trygvis/esper/testing/util/sql/SqlP0.java
new file mode 100755
index 0000000..23c48d1
--- /dev/null
+++ b/src/main/java/io/trygvis/esper/testing/util/sql/SqlP0.java
@@ -0,0 +1,7 @@
+package io.trygvis.esper.testing.util.sql;
+
+import java.sql.*;
+
+public abstract class SqlP0<A> {
+    public abstract A apply() throws SQLException;
+}