From ae31117b8f023879fdcd33edbe942c5b6c9c6a16 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Mon, 7 Mar 2016 19:23:50 +1300 Subject: [PATCH] #590 - Refactor internals - Remove duplicate isBatch() logic in JdbcTransaction --- .../server/transaction/JdbcTransaction.java | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java index 8f6676a46..85fbbbbe0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/src/main/java/com/avaje/ebeaninternal/server/transaction/JdbcTransaction.java @@ -555,22 +555,18 @@ public class JdbcTransaction implements SpiTransaction { // implicit transaction, no gain by batching where depth <= 0 return false; } - switch (batchMode) { - case ALL: - return true; - case INSERT: - return type == PersistRequest.Type.INSERT; - default: - return false; - } + return isBatch(batchMode, type); } /** * Return true if JDBC batch should be used on cascade persist. */ private boolean isBatchOnCascade(PersistRequest.Type type) { + return isBatch(batchOnCascadeMode, type); + } - switch (batchOnCascadeMode) { + private boolean isBatch(PersistBatch batch, PersistRequest.Type type) { + switch (batch) { case ALL: return true; case INSERT: @@ -615,20 +611,9 @@ public class JdbcTransaction implements SpiTransaction { batchMode = oldBatchMode; } - private boolean isAlreadyBatching(PersistRequest.Type type) { - switch (batchMode) { - case ALL: - return true; - case INSERT: - return type == PersistRequest.Type.INSERT; - default: - return false; - } - } - public boolean checkBatchEscalationOnCascade(PersistRequestBean request) { - if (isAlreadyBatching(request.getType())) { + if (isBatch(batchMode, request.getType())) { // already batching (at top level) return false; }