Spring/spring-data-neo4j
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAGRAPH-1276 - Explicitly Pass READ_ONLY mode to Session.query.

Browse Source
This commit is contained in:
Michael Simons
2019-12-11 21:52:17 +01:00
parent bbf7ec1c6f
commit af886623d9
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SharedSessionCreator.java
View File

@@ -19,10 +19,12 @@ import static org.neo4j.ogm.transaction.Transaction.Status.*;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
import java.lang.reflect.Proxy;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
@@ -81,8 +83,12 @@ public class SharedSessionCreator {
private final SessionFactory sessionFactory;
private final Method queryMethod;
public SharedSessionInvocationHandler(SessionFactory sessionFactory) {
this.sessionFactory = sessionFactory;
this.queryMethod = ReflectionUtils
.findMethod(Session.class, "query", String.class, Map.class, boolean.class);
}
@Override
@@ -102,14 +108,29 @@ public class SharedSessionCreator {
return this.sessionFactory.metaData();
case "beginTransaction":
throw new IllegalStateException(
"Not allowed to create transaction on shared Session - " + "use Spring transactions instead");
"Not allowed to create transaction on shared Session - "
+ "use Spring transactions instead");
default:
Function<Session, Object> methodCall = targetSession -> ReflectionUtils.invokeMethod(method, targetSession,
args);
Function<Session, Object> methodCall;
if (isGenericQueryMethod(method)) {
Object[] newArgs = new Object[args.length + 1];
System.arraycopy(args, 0, newArgs, 0, args.length);
newArgs[newArgs.length - 1] = TransactionSynchronizationManager.isCurrentTransactionReadOnly();
methodCall = targetSession -> ReflectionUtils.invokeMethod(queryMethod, targetSession, newArgs);
} else {
methodCall = targetSession -> ReflectionUtils.invokeMethod(method, targetSession, args);
}
return invokeInTransaction(methodName, methodCall);
}
}
private static boolean isGenericQueryMethod(Method method) {
Parameter[] parameters = method.getParameters();
return "query".equals(method.getName()) && method.getParameterCount() == 2 &&
parameters[0].getType() == String.class && parameters[1].getType() == Map.class;
}
private Object invokeInTransaction(String methodName, Function<Session, Object> methodCall) {
// Determine current Session: either the transactional one
@@ -118,8 +139,10 @@ public class SharedSessionCreator {
if (TRANSACTION_REQUIRING_METHODS.contains(methodName)) {
if (targetSession == null
|| (!TransactionSynchronizationManager.isActualTransactionActive() && targetSession.getTransaction() != null
&& EnumSet.of(CLOSED, COMMITTED, ROLLEDBACK).contains(targetSession.getTransaction().status()))) {
|| (!TransactionSynchronizationManager.isActualTransactionActive()
&& targetSession.getTransaction() != null
&& EnumSet.of(CLOSED, COMMITTED, ROLLEDBACK)
.contains(targetSession.getTransaction().status()))) {
throw new IllegalStateException("No Session with actual transaction available "
+ "for current thread - cannot reliably process '" + methodName + "' call");
}