Commit: 2529 - ThoughtBase (svn)

Commit MetaInfo

• Revision: 2529 (tree)
• Time: 2023-04-01 16:44:04
• Author: t_nakayama1971

Log Message

(empty log message)

Change Summary

• modified: trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/BaseDao.java

Incremental Difference

--- trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/BaseDao.java	(revision 2528)
+++ trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/BaseDao.java	(revision 2529)
@@ -6,6 +6,7 @@
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -24,9 +25,10 @@
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.exception.DataException;
 import org.hibernate.exception.LockAcquisitionException;
+import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.jdbc.Work;
 import org.hibernate.query.Query;
-import org.hibernate.transform.Transformers;
+import org.hibernate.query.TypedTupleTransformer;
 
 import common.db.dao.Dao;
 import common.db.dao.DaoConstraintException;
@@ -610,9 +612,9 @@
 		if (DaoUtil.isEntity(cls)) {
 			qry.addEntity(cls);
 		} else if (List.class.equals(cls)) {
-			qry.setTupleTransformer(Transformers.TO_LIST);
+			qry.setTupleTransformer(ToListToupleTransformer.INSTANCE);
 		} else if (Map.class.equals(cls) || !isJavaClass(cls)) {
-			qry.setTupleTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
+			qry.setTupleTransformer(ToMapToupleTransformer.INSTANCE);
 		}
 
 		for (var i = 0; i < qlist.size(); i++) {
@@ -731,4 +733,65 @@
 			}
 		}
 	}
+
+	/**
+	 * ToListToupleTransformer
+	 *
+	 * @author Tadashi Nakayama
+	 */
+	static class ToListToupleTransformer implements TypedTupleTransformer<List<Object>> {
+
+		/** インスタンス */
+		public static final ToListToupleTransformer INSTANCE = new ToListToupleTransformer();
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Class<List<Object>> getTransformedType() {
+			return Factory.cast(List.class);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public List<Object> transformTuple(final Object[] tuple, final String[] aliases) {
+			return Arrays.asList(tuple);
+		}
+	}
+
+	/**
+	 * ToMapToupleTransformer
+	 *
+	 * @author Tadashi Nakayama
+	 */
+	static class ToMapToupleTransformer implements TypedTupleTransformer<Map<String, Object>> {
+
+		/** インスタンス */
+		public static final ToMapToupleTransformer INSTANCE = new ToMapToupleTransformer();
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Class<Map<String, Object>> getTransformedType() {
+			return Factory.cast(Map.class);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 */
+		@Override
+		public Map<String, Object> transformTuple(final Object[] tuple, final String[] aliases) {
+			final Map<String, Object> result = CollectionHelper.mapOfSize(tuple.length);
+			for (int i = 0; i < tuple.length && i < aliases.length; i++) {
+				final String alias = aliases[i];
+				if (alias != null) {
+					result.put(alias, tuple[i]);
+				}
+			}
+			return result;
+		}
+	}
 }