#1: Extract 'AbstractQuery' to top level class.

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/AbstractQuery.java

@@ -0,0 +1,46 @@
+/*
+ * Java GPX Library (@__identifier__@).
+ * Copyright (c) @__year__@ Franz Wilhelmstötter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Author:
+ *    Franz Wilhelmstötter (franz.wilhelmstoetter@gmail.com)
+ */
+package io.jenetics.jpx.jdbc;
+
+import static java.util.Objects.requireNonNull;
+
+import java.sql.Connection;
+
+/**
+ * Abstract query class.
+ *
+ * @author <a href="mailto:franz.wilhelmstoetter@gmail.com">Franz Wilhelmstötter</a>
+ * @version !__version__!
+ * @since !__version__!
+ */
+abstract class AbstractQuery {
+	final Connection _conn;
+	final PreparedQuery _query;
+
+	AbstractQuery(final Connection conn, final PreparedQuery query) {
+		_conn = requireNonNull(conn);
+		_query = requireNonNull(query);
+	}
+
+	AbstractQuery(final Connection conn, final String query) {
+		this(conn, PreparedQuery.parse(query));
+	}
+
+}

jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/DAO.java

@@ -106,28 +106,10 @@ public static <T> Param insert(
 		}
 	}
 
-	/**
-	 * Abstract query class.
-	 */
-	static abstract class Query {
-		final Connection _conn;
-		final PreparedQuery _query;
-
-		Query(final Connection conn, final PreparedQuery query) {
-			_conn = requireNonNull(conn);
-			_query = requireNonNull(query);
-		}
-
-		Query(final Connection conn, final String query) {
-			this(conn, PreparedQuery.parse(query));
-		}
-
-	}
-
 	/**
 	 * Represents a select SQL query.
 	 */
-	public static final class SQLQuery extends Query {
+	public static final class SQLQuery extends AbstractQuery {
 		private final List<Param> _params = new ArrayList<>();
 
 		public SQLQuery(final Connection conn, final PreparedQuery query) {