From 093d111524116a53257350fee7fd91a23ff1eb3d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 22 Nov 2021 14:59:40 +1300 Subject: [PATCH] #2440 - Re-use existing referenceIdPropertyOnly() method --- .../java/io/ebeaninternal/server/deploy/BeanDescriptor.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index 8d047e88e..325213933 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -3038,10 +3038,6 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return ebi.isReference() || referenceIdPropertyOnly(ebi); } - boolean hasIdPropertyOnly(EntityBeanIntercept ebi) { - return propertiesBaseScalar.length > 0 && ebi.hasIdOnly(idPropertyIndex); - } - public boolean referenceIdPropertyOnly(EntityBeanIntercept ebi) { return idOnlyReference && ebi.hasIdOnly(idPropertyIndex); } @@ -3060,7 +3056,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { } void setReferenceIfIdOnly(EntityBeanIntercept ebi) { - if (hasIdPropertyOnly(ebi)) { + if (referenceIdPropertyOnly(ebi)) { ebi.setReference(idPropertyIndex); } }