@@ -69,16 +75,6 @@ public interface BeanState { */ public void removePropertyChangeListener(PropertyChangeListener listener); - /** - * Advanced - Used to programmatically build a reference object. - *
- * You can create a new EntityBean ( - * {@link EbeanServer#createEntityBean(Class)}, set its Id property and then - * call this setReference() method. - *
- */ - public void setReference(); - /** * Advanced - Used to programmatically build a partially or fully loaded * entity bean. First create an entity bean via @@ -90,5 +86,5 @@ public interface BeanState { * the properties that where loaded or null for a fully loaded entity * bean. */ - public void setLoaded(Set@@ -496,29 +504,6 @@ public final class Ebean { serverMgr.getPrimaryServer().update(bean); } - /** - * Force an update using the bean explicitly stating the properties to update. - *
- * If you don't specify explicit properties to use in the update then the - * non-null properties are included in the update. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- * - * @param bean - * The bean holding the values to be included in the update. - * @param updateProps - * the explicit set of properties to include in the update (can be - * null). - */ - public static void update(Object bean, Set- * You can use this method to FORCE an update to occur (even on a bean that - * has not been fetched but say built from JSON or XML). When - * {@link EbeanServer#save(Object)} is used Ebean determines whether to use an - * insert or an update based on the state of the bean. Using this method will - * force an update to occur. - *
- *- * It is expected that this method is most useful in stateless REST services - * or web applications where you have the values you wish to update but no - * existing bean. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- * - *
- *
- * Customer c = new Customer();
- * c.setId(7);
- * c.setName("ModifiedNameNoOCC");
- *
- * // generally you should set the version property
- * // so that Optimistic Concurrency Checking is used.
- * // If a version property is not set then no Optimistic
- * // Concurrency Checking occurs for the update
- * // c.setLastUpdate(lastUpdateTime);
- *
- * // by default the Non-null properties
- * // are included in the update
- * ebeanServer.update(c);
- *
- *
- */
- public void update(Object bean, Set- * You can use this method to FORCE an update to occur (even on a bean that - * has not been fetched but say built from JSON or XML). When - * {@link EbeanServer#save(Object)} is used Ebean determines whether to use an - * insert or an update based on the state of the bean. Using this method will - * force an update to occur. - *
- *- * It is expected that this method is most useful in stateless REST services - * or web applications where you have the values you wish to update but no - * existing bean. - *
- *- * For updates against beans that have not been fetched (say built from JSON - * or XML) this will treat deleteMissingChildren=true and will delete any - * 'missing children'. Refer to - * {@link EbeanServer#update(Object, Set, Transaction, boolean, boolean)}. - *
- */ - public void update(Object bean, Set- * Set a listener to process the query on a row by row basis. - *
- *- * Use this when you want to process a large query and do not want to hold the - * entire query result in memory. - *
- *- * It this case the rows are not loaded into the persistence context and - * instead are processed by the query listener. - *
- * - *- * QueryListener<Order> listener = ...; - * - * Query<Order> query = Ebean.createQuery(Order.class); - * - * // set the listener that will process each order one at a time - * query.setListener(listener); - * - * // execute the query. Note that the returned - * // list (emptyList) will be empty ... - * List<Order> emtyList = query.findList(); - *- * @deprecated Deprecated in favor of {@link #findIterate()} and {@link #findVisit(QueryResultVisitor)} - */ - public Query
@@ -966,13 +936,6 @@ public interface Query
diff --git a/src/main/java/com/avaje/ebean/QueryListener.java b/src/main/java/com/avaje/ebean/QueryListener.java
deleted file mode 100644
index 959a3d09c..000000000
--- a/src/main/java/com/avaje/ebean/QueryListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.avaje.ebean;
-
-/**
- * Deprecated, please migrate to using {@link #findIterate()} or {@link #findVisit(QueryResultVisitor)}
- *
- * Provides a mechanism for processing a query one bean at a time.
- *
- * This is useful when the query will return a large number of results and you
- * want to process the beans one at a time rather than whole all of the beans in
- * memory at once.
- *
- * This bean will not be added to the List Set or Map and nor will it be put
- * into the PersistenceContext. This is what makes this a good way to process
- * a large result set (which could normally use a lot of memory).
- *
- * Refer to {@link Query#setBackgroundFetchAfter(int)}
- *
- * Refer to {@link Query#setBackgroundFetchAfter(int)}
- *
- * Refer to {@link Query#setBackgroundFetchAfter(int)}
- *
@@ -79,31 +83,19 @@ public interface EntityBean extends Serializable {
*/
public Object _ebean_createCopy();
- /**
- * Return the fields in their index order.
- */
- public String[] _ebean_getFieldNames();
-
/**
* Set the value of a field of an entity bean of this type.
*
* Note that using this method bypasses any interception that otherwise occurs
* on entity beans. That means lazy loading and oldValues creation.
*
- * QueryListener<Order> listener = ...;
- *
- * Query<Order> query = Ebean.createQuery(Order.class);
- *
- * // set the listener that will process each order one at a time
- * query.setListener(listener);
- *
- * // execute the query. Note that the returned
- * // list will be empty ... so don't bother assigning it
- * query.findList();
- *
- *
- * @param
- * With interception on the bean will invoke lazy loading and dirty checking. - *
- */ - public boolean isIntercepting() { - return intercepting; - } - - /** - * Turn interception off or on. - *- * This is to support custom serialisation mechanisms that just read all the - * properties on the bean. - *
- * - */ - public void setIntercepting(boolean intercepting) { - this.intercepting = intercepting; - } - /** * Return true if the entity has been loaded. */ public boolean isLoaded() { - return loaded; + return state == STATE_LOADED; } /** @@ -340,12 +335,12 @@ public final class EntityBeanIntercept implements Serializable { * */ public void setLoaded() { - this.loaded = true; - this.oldValues = null; - this.intercepting = true; + this.state = STATE_LOADED; this.owner._ebean_setEmbeddedLoaded(); - this.lazyLoadProperty = null; + this.lazyLoadProperty = -1; + this.origValues = null; this.changedProps = null; + this.dirty = false; } /** @@ -353,22 +348,23 @@ public final class EntityBeanIntercept implements Serializable { * bean. */ public void setLoadedLazy() { - this.loaded = true; - this.intercepting = true; - this.lazyLoadProperty = null; + this.state = STATE_LOADED; + this.lazyLoadProperty = -1; } /** - * Mark this bean as having failed lazy loading due to the underlying row - * being deleted. + * Check if the lazy load succeeded. If not then mark this bean as having + * failed lazy loading due to the underlying row being deleted. ** We mark the bean this way rather than immediately fail as we might be batch * lazy loading and this bean might not be used by the client code at all. * Instead we will fail as soon as the client code tries to use this bean. *
*/ - public void setLazyLoadFailure() { - this.lazyLoadFailure = true; + public void checkLazyLoadFailure() { + if (lazyLoadProperty != -1) { + this.lazyLoadFailure = true; + } } /** @@ -425,40 +421,240 @@ public final class EntityBeanIntercept implements Serializable { } /** - * Set the property names for a partially loaded bean. - * - * @param loadedPropertyNames - * the names of the loaded properties + * Return the original value that was changed via an update. */ - public void setLoadedProps(Set- * This checks if the bean is a reference and should be loaded. - *
*/ - public void preGetter(String propertyName) { - if (!intercepting) { + public void preGetter(int propertyIndex) { + if (state == STATE_NEW || disableLazyLoad) { return; } - - if (!loaded) { - loadBean(propertyName); - } else if (loadedProps != null && !loadedProps.contains(propertyName)) { - loadBean(propertyName); + + if (!isLoadedProperty(propertyIndex)) { + loadBean(propertyIndex); } - if (nodeUsageCollector != null && loaded) { - nodeUsageCollector.addUsed(propertyName); + if (nodeUsageCollector != null) { + nodeUsageCollector.addUsed(getProperty(propertyIndex)); } } @@ -619,245 +797,211 @@ public final class EntityBeanIntercept implements Serializable { * OneToMany and ManyToMany don't have any interception so just check for * PropertyChangeSupport. */ - public PropertyChangeEvent preSetterMany(boolean interceptField, String propertyName, - Object oldValue, Object newValue) { + public PropertyChangeEvent preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) { - // skip setter interception on many's + if (readOnly) { + throw new IllegalStateException("This bean is readOnly"); + } + + setLoadedProperty(propertyIndex); + + // Bean itself not considered dirty when many changed if (pcs != null) { - return new PropertyChangeEvent(owner, propertyName, oldValue, newValue); + return new PropertyChangeEvent(owner, getProperty(propertyIndex), oldValue, newValue); } else { return null; } } + + private void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) { - private final void addDirty(String propertyName) { - - if (!intercepting) { - return; - } if (readOnly) { throw new IllegalStateException("This bean is readOnly"); } + setChangedProperty(propertyIndex); - if (loaded) { - if (oldValues == null) { - // first time this bean is being made dirty - createOldValues(); + if (setDirtyState) { + setOriginalValue(propertyIndex, origValue); + if (!dirty) { + dirty = true; + if (embeddedOwner != null) { + // Cascade dirty state from Embedded bean to parent bean + embeddedOwner._ebean_getIntercept().setEmbeddedDirty(embeddedOwnerIndex); + } + if (nodeUsageCollector != null) { + nodeUsageCollector.setModified(); + } } - if (changedProps == null) { - changedProps = new HashSet* A BeanPersistListener is either found automatically via class path search or - * can be added programmatically via ServerConfiguration.addEntity(). + * can be added programmatically via {@link ServerConfig#add(BeanPersistListener)}. *
+ * @see ServerConfig#add(BeanPersistListener) */ public interface BeanPersistListener- * This is for updates only. - *
+ * Returns a map of the properties that have changed and their new and old values. */ - public T getOldValues(); + public Map- * This is true for background fetching and when using QueryListener. - *
- */ - public boolean createOwnTransaction(); - /** * Set the generated sql for debug purposes. * diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java b/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java index 89588954f..9ac23a9af 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiUpdatePlan.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.api; import java.sql.SQLException; -import java.util.Set; import com.avaje.ebean.annotation.ConcurrencyMode; +import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.persist.dml.DmlHandler; import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; @@ -21,20 +21,20 @@ import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; */ public interface SpiUpdatePlan { - /** - * Return true if the set clause has no columns. - *- * Can occur when the only columns updated have a updatable=false in their - * deployment. - *
- */ - public boolean isEmptySetClause(); + /** + * Return true if the set clause has no columns. + *+ * Can occur when the only columns updated have a updatable=false in their + * deployment. + *
+ */ + public boolean isEmptySetClause(); /** * Bind given the request and bean. The bean could be the oldValues bean * when binding a update or delete where clause with ALL concurrency mode. */ - public void bindSet(DmlHandler bind, Object bean) throws SQLException; + public void bindSet(DmlHandler bind, EntityBean bean) throws SQLException; /** * Return the time this plan was created. @@ -66,10 +66,10 @@ public interface SpiUpdatePlan { */ public Bindable getSet(); - /** - * Return the properties that where changed and should be included in the - * update statement. - */ - public Set+ * This is effectively just the Id values for each of the beans in the collection. + *
+ */ public class CachedManyIds { - private final List