From 4bd3a0f2936ed6bbd79866c83f3d619bb141c3e8 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Tue, 13 Nov 2018 23:50:13 +1300 Subject: [PATCH] #1546 - Refactor: Swap from entityBean._ebean_intercept() to entityBean._ebean_getIntercept() --- .../io/ebeaninternal/server/cache/CachedBeanDataFromBean.java | 2 +- src/main/java/io/ebeaninternal/server/core/DefaultServer.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java index e894a8710..c91fee62d 100644 --- a/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java +++ b/src/main/java/io/ebeaninternal/server/cache/CachedBeanDataFromBean.java @@ -66,7 +66,7 @@ public class CachedBeanDataFromBean { Object v = aPropertiesNonTransient.getValue(bean); aPropertiesNonTransient.setValue(sharableBean, v); } - EntityBeanIntercept intercept = sharableBean._ebean_intercept(); + EntityBeanIntercept intercept = sharableBean._ebean_getIntercept(); intercept.setReadOnly(true); intercept.setLoaded(); return sharableBean; diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index be4693ff7..df991c343 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -2351,7 +2351,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } Object id = idProperty.getVal(entityBean); - if (entityBean._ebean_intercept().isNew() && id != null) { + if (entityBean._ebean_getIntercept().isNew() && id != null) { // Primary Key is changeable only on new models - so skip check if we are not // new. Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); @@ -2381,7 +2381,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); ExpressionList exprList = query.where(); - if (!entityBean._ebean_intercept().isNew()) { + if (!entityBean._ebean_getIntercept().isNew()) { // if model is not new, exclude ourself. exprList.ne(idProperty.getName(), idProperty.getVal(entityBean)); }