From ce045ca0fe1e5b2f0da0219a363c6b836f201709 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Thu, 11 Aug 2016 20:22:35 +1200 Subject: [PATCH] No effective change - remove unused methods (from ImportedId) --- .../server/deploy/id/ImportedId.java | 10 ------ .../server/deploy/id/ImportedIdEmbedded.java | 33 ------------------- .../server/deploy/id/ImportedIdSimple.java | 19 ----------- 3 files changed, 62 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java index a4c56587a..77b79de30 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedId.java @@ -22,11 +22,6 @@ public interface ImportedId { */ boolean isScalar(); - /** - * Return the logical property name. - */ - String getLogicalName(); - /** * For scalar id return the related single db column. *

@@ -46,11 +41,6 @@ public interface ImportedId { */ void dmlAppend(GenerateDmlRequest request); - /** - * Append to the DML statement to the where clause. - */ - void dmlWhere(GenerateDmlRequest request, EntityBean bean); - /** * Bind the value from the bean. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index fff0d126c..6a75753c0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -46,11 +46,6 @@ public class ImportedIdEmbedded implements ImportedId { return false; } - public String getLogicalName() { - return owner.getName() + "." + foreignAssocOne.getName(); - } - - public String getDbColumn() { return null; } @@ -68,34 +63,6 @@ public class ImportedIdEmbedded implements ImportedId { } } - public void dmlWhere(GenerateDmlRequest request, EntityBean bean) { - - Object embeddedId = null; - if (bean != null) { - embeddedId = foreignAssocOne.getValue(bean); - } - - if (embeddedId == null) { - for (int i = 0; i < imported.length; i++) { - if (imported[i].owner.isDbUpdatable()) { - request.appendColumnIsNull(imported[i].localDbColumn); - } - } - } else { - EntityBean embedded = (EntityBean) embeddedId; - for (int i = 0; i < imported.length; i++) { - if (imported[i].owner.isDbUpdatable()) { - Object value = imported[i].foreignProperty.getValue(embedded); - if (value == null) { - request.appendColumnIsNull(imported[i].localDbColumn); - } else { - request.appendColumn(imported[i].localDbColumn); - } - } - } - } - } - public Object bind(BindableRequest request, EntityBean bean) throws SQLException { Object embeddedId = null; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java index d706995fc..4241f37d7 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -82,10 +82,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable