Merge 675e5f8 into 0aea17a

future-architect · Feb 16, 2019 · 519f09d · 519f09d
2 parents 0aea17a + 675e5f8
commit 519f09d
Show file tree

Hide file tree

Showing 32 changed files with 3,317 additions and 541 deletions.
diff --git a/src/main/java/jp/co/future/uroborosql/AbstractAgent.java b/src/main/java/jp/co/future/uroborosql/AbstractAgent.java
@@ -21,6 +21,10 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jp.co.future.uroborosql.config.SqlConfig;
 import jp.co.future.uroborosql.context.SqlContext;
 import jp.co.future.uroborosql.coverage.CoverageData;
@@ -47,10 +51,6 @@
 import jp.co.future.uroborosql.utils.CaseFormat;
 import jp.co.future.uroborosql.utils.StringFunction;
 
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * SqlAgentの抽象親クラス
  *
@@ -294,7 +294,8 @@ protected void transformContext(final SqlContext sqlContext, final boolean isQue
 		}
 
 		LOG.trace("Template SQL[{}{}{}]", System.lineSeparator(), originalSql, System.lineSeparator());
-		LOG.debug("Executed SQL[{}{}{}]", System.lineSeparator(), sqlContext.getExecutableSql(), System.lineSeparator());
+		LOG.debug("Executed SQL[{}{}{}]", System.lineSeparator(), sqlContext.getExecutableSql(),
+				System.lineSeparator());
 	}
 
 	/**
@@ -609,9 +610,9 @@ public <E> SqlEntityQuery<E> query(final Class<? extends E> entityType) {
 		try {
 			TableMetadata metadata = handler.getMetadata(this.transactionManager, entityType);
 
-			SqlContext context = handler.createSelectContext(this, metadata, entityType);
+			SqlContext context = handler.createSelectContext(this, metadata, entityType, false);
 
-			return new SqlEntityQueryImpl<>(this, handler, context, entityType);
+			return new SqlEntityQueryImpl<>(this, handler, metadata, context, entityType);
 		} catch (SQLException e) {
 			throw new EntitySqlRuntimeException(EntitySqlRuntimeException.EntityProcKind.SELECT, e);
 		}

diff --git a/src/main/java/jp/co/future/uroborosql/SqlAgentImpl.java b/src/main/java/jp/co/future/uroborosql/SqlAgentImpl.java
@@ -25,6 +25,11 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.apache.commons.lang3.time.StopWatch;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
 import jp.co.future.uroborosql.config.SqlConfig;
 import jp.co.future.uroborosql.context.SqlContext;
 import jp.co.future.uroborosql.context.SqlContextImpl;
@@ -39,11 +44,6 @@
 import jp.co.future.uroborosql.parameter.Parameter;
 import jp.co.future.uroborosql.utils.CaseFormat;
 
-import org.apache.commons.lang3.time.StopWatch;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-
 /**
  * SQL実行用クラス。
  *
@@ -118,7 +118,8 @@ public ResultSet query(final SqlContext sqlContext) throws SQLException {
 						if (maxRetryCount > 0 && getSqlConfig().getDialect().isRollbackToSavepointBeforeRetry()) {
 							setSavepoint(RETRY_SAVEPOINT_NAME);
 						}
-						rs = new InnerResultSet(getSqlFilterManager().doQuery(sqlContext, stmt, stmt.executeQuery()), stmt);
+						rs = new InnerResultSet(getSqlFilterManager().doQuery(sqlContext, stmt, stmt.executeQuery()),
+								stmt);
 						stmt.closeOnCompletion();
 						return rs;
 					} catch (SQLException ex) {
@@ -154,7 +155,7 @@ public ResultSet query(final SqlContext sqlContext) throws SQLException {
 					}
 				} while (maxRetryCount > loopCount++);
 			} catch (SQLException | RuntimeException e) {
-				if(rs != null && !rs.isClosed()) {
+				if (rs != null && !rs.isClosed()) {
 					rs.close();
 				}
 				throw e;
@@ -571,15 +572,15 @@ protected void handleException(final SqlContext sqlContext, final SQLException e
 		if (LOG.isErrorEnabled() && isOutputExceptionLog()) {
 			StringBuilder builder = new StringBuilder();
 			builder.append(System.lineSeparator()).append("Exception occurred in SQL execution.")
-					.append(System.lineSeparator());
+			.append(System.lineSeparator());
 			builder.append("Executed SQL[").append(sqlContext.getExecutableSql()).append("]")
-					.append(System.lineSeparator());
+			.append(System.lineSeparator());
 			if (sqlContext instanceof SqlContextImpl) {
 				Parameter[] bindParameters = ((SqlContextImpl) sqlContext).getBindParameters();
 				for (int i = 0; i < bindParameters.length; i++) {
 					Parameter parameter = getSqlFilterManager().doParameter(bindParameters[i]);
 					builder.append("Bind Parameter.[INDEX[").append(i + 1).append("], ").append(parameter.toString())
-							.append("]").append(System.lineSeparator());
+					.append("]").append(System.lineSeparator());
 				}
 			}
 			LOG.error(builder.toString(), cause);
@@ -631,7 +632,7 @@ public <E> Optional<E> find(final Class<? extends E> entityType, final Object...
 				params.put(keyNames[i], keys[i]);
 			}
 
-			SqlContext context = handler.createSelectContext(this, metadata, entityType);
+			SqlContext context = handler.createSelectContext(this, metadata, entityType, true);
 			context.paramMap(params);
 
 			try (Stream<E> stream = handler.doSelect(this, context, entityType)) {
@@ -684,7 +685,7 @@ public int update(final Object entity) {
 		try {
 			Class<?> type = entity.getClass();
 			TableMetadata metadata = handler.getMetadata(this.transactionManager, type);
-			SqlContext context = handler.createUpdateContext(this, metadata, type);
+			SqlContext context = handler.createUpdateContext(this, metadata, type, true);
 			handler.setUpdateParams(context, entity);
 			int count = handler.doUpdate(this, context, entity);
 
@@ -714,7 +715,7 @@ public int delete(final Object entity) {
 		try {
 			Class<?> type = entity.getClass();
 			TableMetadata metadata = handler.getMetadata(this.transactionManager, type);
-			SqlContext context = handler.createDeleteContext(this, metadata, type);
+			SqlContext context = handler.createDeleteContext(this, metadata, type, true);
 			handler.setDeleteParams(context, entity);
 			return handler.doDelete(this, context, entity);
 		} catch (SQLException e) {
@@ -873,7 +874,7 @@ public boolean tryAdvance(final Consumer<? super T> action) {
 	 */
 	private static class InnerResultSet extends AbstractResultSetWrapper {
 		/** 同期してクローズするStatement */
-		private Statement stmt;
+		private final Statement stmt;
 
 		/**
 		 * コンストラクタ