diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java index 04b5c101d..9204a0613 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java @@ -547,17 +547,6 @@ public class BeanProperty implements ElPropertyValue { } } - /** - * Convert the type to the bean type if required. - *

- * Generally only used to ensure id properties are converted for - * Query.setId() use. - *

- */ - public Object toBeanType(Object value) { - return scalarType.toBeanType(value); - } - @SuppressWarnings("unchecked") public void bind(DataBind b, Object value) throws SQLException { scalarType.bind(b, value); diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java index a4c49e65c..ea5fde515 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -63,8 +63,6 @@ public abstract class BeanPropertyAssoc extends BeanProperty { boolean saveRecurseSkippable; - boolean deleteRecurseSkippable; - /** * Construct the property. */ @@ -91,9 +89,7 @@ public abstract class BeanPropertyAssoc extends BeanProperty { targetDescriptor = descriptor.getBeanDescriptor(targetType); targetIdBinder = targetDescriptor.getIdBinder(); targetInheritInfo = targetDescriptor.getInheritInfo(); - saveRecurseSkippable = targetDescriptor.isSaveRecurseSkippable(); - deleteRecurseSkippable = targetDescriptor.isDeleteRecurseSkippable(); if (!targetIdBinder.isComplexId()){ targetIdProperty = targetIdBinder.getIdProperty(); @@ -240,17 +236,6 @@ public abstract class BeanPropertyAssoc extends BeanProperty { return tableJoin; } - /** - * Return the BeanTable for this association. - *

- * This has the table name which is used to determine the relationship for - * this association. - *

- */ - public BeanTable getBeanTable() { - return beanTable; - } - /** * Get the persist info. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 7bc61a97c..6b5f6d9c4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -409,20 +409,6 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc { help.add(collection, bean); } - /** - * Refresh the appropriate list set or map. - */ - public void refresh(EbeanServer server, Query query, Transaction t, EntityBean parentBean) { - help.refresh(server, query, t, parentBean); - } - - /** - * Apply the refreshed BeanCollection to the property of the parentBean. - */ - public void refresh(BeanCollection bc, EntityBean parentBean) { - help.refresh(bc, parentBean); - } - /** * Return the Id values from the given bean. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java index 4f50558ca..4745e7f6b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/ChainedBeanQueryAdapter.java @@ -16,21 +16,11 @@ public class ChainedBeanQueryAdapter implements BeanQueryAdapter { private static final Sorter SORTER = new Sorter(); private final List list; + private final BeanQueryAdapter[] chain; - - /** - * Helper method used to create a list from 2 BeanQueryAdapter. - */ - private static List addList(BeanQueryAdapter c1, BeanQueryAdapter c2) { - ArrayList addList = new ArrayList(2); - addList.add(c1); - addList.add(c2); - return addList; - } - + /** * Construct given the list of BeanQueryAdapter's. - * @param list */ public ChainedBeanQueryAdapter(List list) { this.list = list;