Commit: 2588 - ThoughtBase (svn)

Commit MetaInfo

• Revision: 2588 (tree)
• Time: 2023-09-04 18:53:42
• Author: t_nakayama1971

Log Message

(empty log message)

Change Summary

• modified: trunk/framework/fwBase/pom.xml
• modified: trunk/framework/fwRest/pom.xml
• modified: trunk/framework/fwRest/src/main/java/online/jpa/provider/DbcpConnectionProvider.java
• modified: trunk/framework/pjBat/pom.xml
• modified: trunk/framework/pjDb/pom.xml
• modified: trunk/framework/pjMw/pom.xml
• modified: trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/Config.java
• modified: trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/DaoSessionImpl.java
• modified: trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/NoCloseSession.java
• modified: trunk/framework/pjWeb/pom.xml

Incremental Difference

--- trunk/framework/fwBase/pom.xml	(revision 2587)
+++ trunk/framework/fwBase/pom.xml	(revision 2588)
@@ -48,7 +48,7 @@
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>10.12.2</version>
+            <version>10.12.3</version>
           </dependency>
         </dependencies>
         <configuration>

--- trunk/framework/fwRest/pom.xml	(revision 2587)
+++ trunk/framework/fwRest/pom.xml	(revision 2588)
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.2.7.Final</version>
+      <version>6.3.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

--- trunk/framework/fwRest/src/main/java/online/jpa/provider/DbcpConnectionProvider.java	(revision 2587)
+++ trunk/framework/fwRest/src/main/java/online/jpa/provider/DbcpConnectionProvider.java	(revision 2588)
@@ -16,7 +16,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.util.Unbox;
 import org.hibernate.HibernateException;
-import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.cfg.JdbcSettings;
 import org.hibernate.engine.jdbc.connections.internal.ConnectionProviderInitiator;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.UnknownUnwrapTypeException;
@@ -103,19 +103,19 @@
         final var dbcpProperties = new Properties();
 
         // DriverClass & url
-        final var jdbcDriverClass = propMap.get(AvailableSettings.DRIVER);
-        final var jdbcUrl = propMap.get(AvailableSettings.URL);
+        final var jdbcDriverClass = propMap.get(JdbcSettings.JAKARTA_JDBC_DRIVER);
+        final var jdbcUrl = propMap.get(JdbcSettings.JAKARTA_JDBC_URL);
         dbcpProperties.put("driverClassName", jdbcDriverClass);
         dbcpProperties.put("url", jdbcUrl);
 
         // Username / password
-        final var username = propMap.get(AvailableSettings.USER);
-        final var password = propMap.get(AvailableSettings.PASS);
+        final var username = propMap.get(JdbcSettings.JAKARTA_JDBC_USER);
+        final var password = propMap.get(JdbcSettings.JAKARTA_JDBC_PASSWORD);
         dbcpProperties.put("username", username);
         dbcpProperties.put("password", password);
 
         // Isolation level
-        final var isolationLevel = propMap.get(AvailableSettings.ISOLATION);
+        final var isolationLevel = propMap.get(JdbcSettings.ISOLATION);
         if (!Objects.toString(isolationLevel, "").isEmpty()) {
             dbcpProperties.put("defaultTransactionIsolation", isolationLevel);
         }
@@ -159,7 +159,7 @@
      */
     private Integer getPoolSize(final Map<String, Object> propMap) {
         Integer ret = 0;
-        final var val = Objects.toString(propMap.get(AvailableSettings.POOL_SIZE), "");
+        final var val = Objects.toString(propMap.get(JdbcSettings.POOL_SIZE), "");
         if (!val.isEmpty()) {
             try {
                 ret = Integer.valueOf(val);

--- trunk/framework/pjBat/pom.xml	(revision 2587)
+++ trunk/framework/pjBat/pom.xml	(revision 2588)
@@ -118,7 +118,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.2.7.Final</version>
+      <version>6.3.0.Final</version>
       <scope>runtime</scope>
     </dependency>
 

--- trunk/framework/pjDb/pom.xml	(revision 2587)
+++ trunk/framework/pjDb/pom.xml	(revision 2588)
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.2.7.Final</version>
+      <version>6.3.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

--- trunk/framework/pjMw/pom.xml	(revision 2587)
+++ trunk/framework/pjMw/pom.xml	(revision 2588)
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.2.7.Final</version>
+      <version>6.3.0.Final</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

--- trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/Config.java	(revision 2587)
+++ trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/Config.java	(revision 2588)
@@ -5,9 +5,9 @@
 import java.util.function.Function;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
+import org.hibernate.cfg.JdbcSettings;
 import org.hibernate.dialect.Dialect;
 
 import core.config.Factory;
@@ -44,7 +44,7 @@
 	 * @return Dialectインスタンス
 	 */
 	private Dialect getDialectInstance(final Configuration cfg) {
-		final Function<Properties, String> dlct = p -> p.getProperty(AvailableSettings.DIALECT);
+		final Function<Properties, String> dlct = p -> p.getProperty(JdbcSettings.DIALECT);
 
 		final String className = Optional.ofNullable(dlct.apply(cfg.getProperties())).
 								orElseGet(() -> dlct.apply(Environment.getProperties()));

--- trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/DaoSessionImpl.java	(revision 2587)
+++ trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/DaoSessionImpl.java	(revision 2588)
@@ -7,8 +7,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.hibernate.HibernateException;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.TransactionSettings;
 
 import common.db.dao.Dao;
 import common.db.dao.DaoSession;
@@ -79,7 +79,7 @@
 			final var cfg = getConfig(cname);
 			final var prop = cfg.getConfiguration().getProperties();
 			if (prop != null) {
-				if (prop.getProperty(AvailableSettings.JTA_PLATFORM) != null) {
+				if (prop.getProperty(TransactionSettings.JTA_PLATFORM) != null) {
 					final var xa = Factory.create(XATransaction.class);
 					if (xa.isInTransaction()) {
 						bd = new JtaDao(cfg);

--- trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/NoCloseSession.java	(revision 2587)
+++ trunk/framework/pjMw/src/main/java/common/db/dao/hibernate/NoCloseSession.java	(revision 2588)
@@ -1362,4 +1362,52 @@
 	public void lock(final Object object, final LockOptions lockOptions) {
 		this.session.lock(object, lockOptions);
 	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public <T> RootGraph<T> createEntityGraph(final Class<T> rootType, final String graphName) {
+		return this.session.createEntityGraph(rootType, graphName);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public SessionFactory getFactory() {
+		return this.session.getFactory();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int getFetchBatchSize() {
+		return this.session.getFetchBatchSize();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setFetchBatchSize(final int batchSize) {
+		this.session.setFetchBatchSize(batchSize);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean isSubselectFetchingEnabled() {
+		return this.session.isSubselectFetchingEnabled();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void setSubselectFetchingEnabled(final boolean enabled) {
+		this.session.setSubselectFetchingEnabled(enabled);
+	}
 }

--- trunk/framework/pjWeb/pom.xml	(revision 2587)
+++ trunk/framework/pjWeb/pom.xml	(revision 2588)
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>6.2.7.Final</version>
+      <version>6.3.0.Final</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>