Merge pull request #23 from ZorTik/development

Removed QueryNodeRequest.java

Author: ZorTik

core/src/main/java/me/zort/sqllib/internal/query/QueryNode.java

@@ -5,6 +5,8 @@
 import me.zort.sqllib.SQLDatabaseConnectionImpl;
 import me.zort.sqllib.api.*;
 import me.zort.sqllib.api.data.QueryResult;
+import me.zort.sqllib.api.data.QueryRowsResult;
+import me.zort.sqllib.api.data.Row;
 import me.zort.sqllib.internal.exception.InvalidConnectionInstanceException;
 import me.zort.sqllib.internal.exception.NoLinkedConnectionException;
 import org.jetbrains.annotations.Nullable;
@@ -16,6 +18,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+/**
+ * Represents a query builder node, a part of a
+ * query builder flow.
+ *
+ * @param <P> Parent node type.
+ * @author ZorTik
+ */
 @Getter
 public abstract class QueryNode<P extends QueryNode<?>> implements Query, StatementFactory<PreparedStatement> {
 
@@ -130,6 +139,38 @@ public QueryResult execute() {
         return invokeToConnection(connection -> connection.exec(getAncestor()));
     }
 
+    public Optional<Row> obtainOne() {
+        QueryRowsResult<Row> resultList = obtainAll();
+
+        return resultList.isEmpty()
+                ? Optional.empty()
+                : Optional.ofNullable(resultList.get(0));
+    }
+
+    public <T> Optional<T> obtainOne(Class<T> mapTo) {
+        QueryRowsResult<T> resultList = obtainAll(mapTo);
+
+        return resultList.isEmpty()
+                ? Optional.empty()
+                : Optional.ofNullable(resultList.get(0));
+    }
+
+    public QueryRowsResult<Row> obtainAll() {
+        requireResultSetAware();
+        return invokeToConnection(connection -> connection.query(getAncestor()));
+    }
+
+    public <T> QueryRowsResult<T> obtainAll(Class<T> mapTo) {
+        requireResultSetAware();
+        return invokeToConnection(connection -> connection.query(getAncestor(), mapTo));
+    }
+
+    private void requireResultSetAware() {
+        if (!(this instanceof ResultSetAware)) {
+            throw new IllegalStateException("This query node is not ResultSetAware! (Did you mean execute()?)");
+        }
+    }
+
     public QueryNode<?> getAncestor() {
         QueryNode<?> current = this;
         while(current.getParent() != null) {

core/src/main/java/me/zort/sqllib/internal/query/QueryNodeRequest.java

@@ -0,0 +1,26 @@
+package me.zort.sqllib.internal.query;
+
+import me.zort.sqllib.api.Query;
+import me.zort.sqllib.api.data.QueryRowsResult;
+import me.zort.sqllib.api.data.Row;
+
+import java.util.Optional;
+
+/**
+ * Represents a query node that can handle a result set,
+ * simply said can produce a rows result. This is a replacement
+ * for legacy QueryNodeRequest.
+ * <p></p>
+ * Typically, a SELECT query is ResultSetAware, CREATE TABLE
+ * query is not.
+ *
+ * @author ZorTik
+ */
+public interface ResultSetAware extends Query {
+
+    Optional<Row> obtainOne();
+    <T> Optional<T> obtainOne(Class<T> mapTo);
+    QueryRowsResult<Row> obtainAll();
+    <T> QueryRowsResult<T> obtainAll(Class<T> mapTo);
+
+}

core/src/main/java/me/zort/sqllib/internal/query/ResultSetAware.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Objects;
 
-public class SelectQuery extends QueryNodeRequest<QueryNode<?>> implements Executive, Conditional<SelectQuery>, Limitable<SelectQuery> {
+public class SelectQuery extends QueryNode<QueryNode<?>> implements Executive, Conditional<SelectQuery>, Limitable<SelectQuery>, ResultSetAware {
 
     private final List<String> cols;
     private String table;

core/src/main/java/me/zort/sqllib/internal/query/SelectQuery.java

@@ -2,13 +2,13 @@
 
 import me.zort.sqllib.internal.query.QueryDetails;
 import me.zort.sqllib.internal.query.QueryNode;
-import me.zort.sqllib.internal.query.QueryNodeRequest;
+import me.zort.sqllib.internal.query.ResultSetAware;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.List;
 
-public class LimitStatement<P extends QueryNode<?>> extends QueryNodeRequest<P> {
+public class LimitStatement<P extends QueryNode<?>> extends QueryNode<P> implements ResultSetAware {
 
     private final int limit;
 

core/src/main/java/me/zort/sqllib/internal/query/part/LimitStatement.java

@@ -1,15 +1,12 @@
 package me.zort.sqllib.internal.query.part;
 
 import me.zort.sqllib.internal.exception.IllegalStatementOperationException;
-import me.zort.sqllib.internal.query.QueryDetails;
-import me.zort.sqllib.internal.query.QueryNode;
-import me.zort.sqllib.internal.query.QueryNodeRequest;
-import me.zort.sqllib.internal.query.QueryPriority;
+import me.zort.sqllib.internal.query.*;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
-public class WhereStatement<P extends QueryNode<?>> extends QueryNodeRequest<P> {
+public class WhereStatement<P extends QueryNode<?>> extends QueryNode<P> implements ResultSetAware {
 
     private final List<QueryDetails> conditions = new ArrayList<>();
     private int currPhIndex = 0;

core/src/main/java/me/zort/sqllib/internal/query/part/WhereStatement.java

@@ -8,7 +8,7 @@
 import me.zort.sqllib.api.mapping.StatementMappingStrategy;
 import me.zort.sqllib.api.data.QueryResult;
 import me.zort.sqllib.internal.query.QueryNode;
-import me.zort.sqllib.internal.query.QueryNodeRequest;
+import me.zort.sqllib.internal.query.ResultSetAware;
 import me.zort.sqllib.mapping.annotation.Append;
 import me.zort.sqllib.mapping.exception.SQLMappingException;
 import me.zort.sqllib.util.ParameterPair;
@@ -69,7 +69,7 @@ public QueryResult executeQuery(StatementMappingOptions options, Method method,
             return ((SQLDatabaseConnection) connection).query(node);
         }
 
-        if (wrappedAnnotation.isProducesResult() && node instanceof QueryNodeRequest) {
+        if (wrappedAnnotation.isProducesResult() && node instanceof ResultSetAware) {
             return mapTo != null
                     ? ((SQLDatabaseConnection) connection).query(node, mapTo)
                     : ((SQLDatabaseConnection) connection).query(node);