From 331d28b512a39f4fe2398c361d50d419972b0725 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Fri, 31 Jul 2015 13:33:35 +1200 Subject: [PATCH] No effective change - Code cleanup, remove unused param --- .../java/com/avaje/ebeaninternal/server/core/BeanRequest.java | 2 +- .../com/avaje/ebeaninternal/server/core/PersistRequest.java | 2 +- .../com/avaje/ebeaninternal/server/core/PersistRequestBean.java | 2 +- .../server/deploy/BeanPropertyAssocManyJsonTransient.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java index f261bdee2..8740ec70a 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/BeanRequest.java @@ -54,7 +54,7 @@ public abstract class BeanRequest { * not then create one implicitly to handle the request. *

*/ - public void createImplicitTransIfRequired(boolean readOnlyTransaction) { + public void createImplicitTransIfRequired() { if (transaction == null) { transaction = ebeanServer.getCurrentServerTransaction(); if (transaction == null || !transaction.isActive()) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java index 1eebc690c..26885e1e6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequest.java @@ -86,7 +86,7 @@ public abstract class PersistRequest extends BeanRequest implements BatchPostExe } public void initTransIfRequired() { - createImplicitTransIfRequired(false); + createImplicitTransIfRequired(); persistCascade = transaction.isPersistCascade(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java index 22772b056..ebd089b06 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java +++ b/src/main/java/com/avaje/ebeaninternal/server/core/PersistRequestBean.java @@ -157,7 +157,7 @@ public final class PersistRequestBean extends PersistRequest implements BeanP * Init the transaction and also check for batch on cascade escalation. */ public void initTransIfRequiredWithBatchCascade() { - createImplicitTransIfRequired(false); + createImplicitTransIfRequired(); if (transaction.checkBatchEscalationOnCascade(this)) { // we escalated to use batch mode so flush when done // but if createdTransaction then commit will flush it diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java index 529ed602e..7c7a8df3f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonTransient.java @@ -30,7 +30,7 @@ public class BeanPropertyAssocManyJsonTransient { // read map using Jackson object mapper with unknown key type TypeFactory typeFactory = mapper.getTypeFactory(); JavaType target = typeFactory.constructType(many.getTargetType()); - MapType jacksonType = typeFactory.constructMapType(LinkedHashMap.class, typeFactory.unknownType(), target); + MapType jacksonType = typeFactory.constructMapType(LinkedHashMap.class, TypeFactory.unknownType(), target); value = mapper.readValue(readJson.getParser(), jacksonType); } else {