inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-01 14:41:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade mybatis/spring integration

Browse Source
This commit is contained in:
pzurek
2023-06-12 13:10:07 +02:00
parent b017ba3d1d
commit 58e407d4dd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repository/pom.xml
View File

@@ -400,12 +400,12 @@
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId> <artifactId>mybatis</artifactId>
<version>3.5.10</version> <version>3.5.13</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis</groupId> <groupId>org.mybatis</groupId>
<artifactId>mybatis-spring</artifactId> <artifactId>mybatis-spring</artifactId>
<version>2.0.7</version> <version>3.0.2</version>
</dependency> </dependency>
<!-- Activiti --> <!-- Activiti -->

5
repository/src/main/java/org/alfresco/ibatis/HierarchicalSqlSessionFactoryBean.java
View File

@@ -49,7 +49,6 @@ import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.type.TypeHandler; import org.apache.ibatis.type.TypeHandler;
import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionFactoryBean;
import org.mybatis.spring.transaction.SpringManagedTransactionFactory; import org.mybatis.spring.transaction.SpringManagedTransactionFactory;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
@@ -564,8 +563,8 @@ public class HierarchicalSqlSessionFactoryBean extends SqlSessionFactoryBean
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public void onApplicationEvent(ApplicationEvent event) { public void onApplicationEvent(ContextRefreshedEvent event) {
if (failFast && event instanceof ContextRefreshedEvent) { if (failFast) {
// fail-fast -> check all statements are completed // fail-fast -> check all statements are completed
this.sqlSessionFactory.getConfiguration().getMappedStatementNames(); this.sqlSessionFactory.getConfiguration().getMappedStatementNames();
} }