From ea55f25d44da7403f269682149c01f479f9d88db Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Tue, 15 Aug 2023 23:36:59 +1200
Subject: [PATCH] Tidy IdBinderEmbedded - merge use of getIdProperty() and
 idSelect() to use idSelect()

Means we can remove getIdProperty()
---
 .../io/ebeaninternal/server/core/DefaultBeanLoader.java  | 2 +-
 .../ebeaninternal/server/deploy/BeanPropertyAssoc.java   | 2 +-
 .../java/io/ebeaninternal/server/deploy/id/IdBinder.java | 9 ---------
 .../ebeaninternal/server/deploy/id/IdBinderEmbedded.java | 5 -----
 .../io/ebeaninternal/server/deploy/id/IdBinderEmpty.java | 5 -----
 .../ebeaninternal/server/deploy/id/IdBinderSimple.java   | 5 -----
 6 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
index c19790909..a586e571c 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java
@@ -87,7 +87,7 @@ final class DefaultBeanLoader {
       query.setLoadDescription("+lazy", null);
     }
 
-    query.select(parentDesc.idBinder().getIdProperty());
+    query.select(parentDesc.idBinder().idSelect());
     if (onlyIds) {
       query.fetch(many.name(), many.targetIdProperty());
     } else {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
index 1cc67ee15..f4f98740d 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java
@@ -122,7 +122,7 @@ public abstract class BeanPropertyAssoc<T> extends BeanProperty implements STree
       targetInheritInfo = targetDescriptor.inheritInfo();
       saveRecurseSkippable = targetDescriptor.isSaveRecurseSkippable();
       if (!targetIdBinder.isComplexId()) {
-        targetIdProperty = targetIdBinder.getIdProperty();
+        targetIdProperty = targetIdBinder.idSelect();
       }
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
index 8c444fa4a..d396a52d3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinder.java
@@ -43,15 +43,6 @@ public interface IdBinder {
    */
   Object readData(DataInput dataInput) throws IOException;
 
-  /**
-   * Return the name(s) of the Id property(s). Comma delimited if there is more
-   * than one.
-   * <p>
-   * This can be used to include in a query.
-   * </p>
-   */
-  String getIdProperty();
-
   /**
    * Return the Id BeanProperty.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
index bbbe2d1c6..cda86db27 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmbedded.java
@@ -89,11 +89,6 @@ public final class IdBinderEmbedded implements IdBinder {
     return idDesc;
   }
 
-  @Override
-  public String getIdProperty() {
-    return embIdProperty.name();
-  }
-
   @Override
   public void buildRawSqlSelectChain(String prefix, List<String> selectChain) {
     if (!idClass) {
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 251086384..b46884811 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -51,11 +51,6 @@ final class IdBinderEmpty implements IdBinder {
     return null;
   }
 
-  @Override
-  public String getIdProperty() {
-    return null;
-  }
-
   @Override
   public BeanProperty findBeanProperty(String dbColumnName) {
     return null;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
index 511a76c79..efb08aae6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderSimple.java
@@ -78,11 +78,6 @@ public final class IdBinderSimple implements IdBinder {
     return idProperty;
   }
 
-  @Override
-  public String getIdProperty() {
-    return idProperty.name();
-  }
-
   @Override
   public BeanProperty findBeanProperty(String dbColumnName) {
     if (dbColumnName.equalsIgnoreCase(idProperty.dbColumn())) {