Skip to content

Commit

Permalink
Use Spring's utilities to retrieve transactions (#43)
Browse files Browse the repository at this point in the history
* Remove dependency on Hibernate and use Spring's utilities to integrate with spring transactions.

* Move the check for an active transaction. Remove an unnecessary try-catch.
  • Loading branch information
tsg21 authored Jun 10, 2020
1 parent 841b515 commit 9e3ab54
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
10 changes: 5 additions & 5 deletions transactionoutbox-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
Expand All @@ -43,11 +48,6 @@
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.4.17.Final</version>
</dependency>

<!-- Compile -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import java.lang.reflect.Proxy;
import java.sql.Connection;
import java.sql.PreparedStatement;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.sql.DataSource;
import lombok.extern.slf4j.Slf4j;
import org.hibernate.internal.SessionImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.datasource.DataSourceUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -22,8 +22,12 @@
public class SpringTransactionManager implements ThreadLocalContextTransactionManager {

private final SpringTransaction transactionInstance = new SpringTransaction();
private final DataSource dataSource;

@PersistenceContext private EntityManager entityManager;
@Autowired
SpringTransactionManager(DataSource dataSource) {
this.dataSource = dataSource;
}

@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
Expand All @@ -35,19 +39,19 @@ public <T, E extends Exception> T inTransactionReturnsThrows(
@Override
public <T, E extends Exception> T requireTransactionReturns(
ThrowingTransactionalSupplier<T, E> work) throws E, NoTransactionActiveException {

if (!TransactionSynchronizationManager.isActualTransactionActive()) {
throw new NoTransactionActiveException();
}

return work.doWork(transactionInstance);
}

private final class SpringTransaction implements Transaction {

@Override
public Connection connection() {
try {
SessionImpl delegate = (SessionImpl) entityManager.getDelegate();
return delegate.connection();
} catch (RuntimeException e) {
throw new NoTransactionActiveException(e);
}
return DataSourceUtils.getConnection(dataSource);
}

@Override
Expand Down

0 comments on commit 9e3ab54

Please sign in to comment.