Refactor tidy internals for DefaultPersister, BeanDescriptorManager etc

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -1238,7 +1238,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     if (ids != null) {
       return !ids.isEmpty();
     }
-
     try {
       request.initTransIfRequired();
       return !request.findIds().isEmpty();

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -572,7 +572,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
   private ElPropertyValue mapProperty() {
     ElPropertyValue property = beanDescriptor.elGetValue(query.getMapKey());
     if (property == null) {
-      throw new IllegalStateException("Unknown map key property "+query.getMapKey());
+      throw new IllegalStateException("Unknown map key property " + query.getMapKey());
     }
     return property;
   }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -349,10 +349,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
           builder = RawSqlBuilder.unparsed(sql.getQuery());
         }
 
-        for (Map.Entry<String,String> columnMapping : sql.getColumnMapping().entrySet()) {
+        for (Map.Entry<String, String> columnMapping : sql.getColumnMapping().entrySet()) {
           builder.columnMapping(columnMapping.getKey(), columnMapping.getValue());
         }
-        for (Map.Entry<String,String> aliasMapping : sql.getAliasMapping().entrySet()) {
+        for (Map.Entry<String, String> aliasMapping : sql.getAliasMapping().entrySet()) {
           builder.tableAliasMapping(aliasMapping.getKey(), aliasMapping.getValue());
         }
         info.addRawSql(sql.getName(), builder.create());
@@ -410,7 +410,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
   @Override
   public boolean isTableManaged(String tableName) {
     return tableToDescMap.get(tableName.toLowerCase()) != null
-        || tableToViewDescMap.get(tableName.toLowerCase()) != null;
+      || tableToViewDescMap.get(tableName.toLowerCase()) != null;
   }
 
   /**
@@ -618,7 +618,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       DeployBeanInfo<?> info = createDeployBeanInfo(entityClass);
       deployInfoMap.put(entityClass, info);
       Class<?> embeddedIdType = info.getEmbeddedIdType();
-      if (embeddedIdType != null){
+      if (embeddedIdType != null) {
         embeddedIdTypes.add(embeddedIdType);
       }
     }
@@ -788,8 +788,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     Class<?> targetType = prop.getTargetType();
     DeployBeanInfo<?> info = deployInfoMap.get(targetType);
     if (info == null) {
-      String msg = "Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName();
-      throw new PersistenceException(msg);
+      throw new PersistenceException("Can not find descriptor [" + targetType + "] for " + prop.getFullBeanName());
     }
     return info.getDescriptor();
   }
@@ -901,21 +900,17 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     Class<?> owningType = oneToMany.getOwningType();
     if (!oneToMany.getCascadeInfo().isSave()) {
       // The property MUST have persist cascading so that inserts work.
-
       Class<?> targetType = oneToMany.getTargetType();
       String msg = "Error on " + oneToMany.getFullBeanName() + ". @OneToMany MUST have ";
       msg += "Cascade.PERSIST or Cascade.ALL because this is a unidirectional ";
       msg += "relationship. That is, there is no property of type " + owningType + " on " + targetType;
-
       throw new PersistenceException(msg);
     }
 
     // mark this property as unidirectional
     oneToMany.setUnidirectional();
-
     // specify table and table alias...
     BeanTable beanTable = beanTable(owningType);
-
     // define the TableJoin
     DeployTableJoin oneToManyJoin = oneToMany.getTableJoin();
     if (!oneToManyJoin.hasJoinColumns()) {
@@ -951,27 +946,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     String mappedBy = prop.getMappedBy();
     // get the mappedBy property
     DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + targetDesc + "." + mappedBy + "] ";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
-
-    if (!mappedAssocOne.isOneToOne()) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?";
-      throw new PersistenceException(m);
-    }
-
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = mappedOneToOne(prop, mappedBy, targetDesc);
     DeployTableJoin tableJoin = prop.getTableJoin();
     if (!tableJoin.hasJoinColumns()) {
       // define Join as the inverse of the mappedBy property
@@ -987,6 +962,21 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
+  private DeployBeanPropertyAssocOne<?> mappedOneToOne(DeployBeanPropertyAssocOne<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + " Can not find mappedBy property [" + targetDesc + "." + mappedBy + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+    }
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
+    if (!mappedAssocOne.isOneToOne()) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "]is not a OneToOne?");
+    }
+    return mappedAssocOne;
+  }
+
   private void checkUniDirectionalPrimaryKeyJoin(DeployBeanPropertyAssocOne<?> prop) {
     if (prop.isPrimaryKeyJoin()) {
       // uni-directional PrimaryKeyJoin ...
@@ -1008,7 +998,6 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
       return;
     }
     DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-
     if (targetDesc.isDraftableElement()) {
       // automatically turning on orphan removal and CascadeType.ALL
       prop.setModifyListenMode(BeanCollection.ModifyListenMode.REMOVALS);
@@ -1040,23 +1029,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     String mappedBy = prop.getMappedBy();
 
     // get the mappedBy property
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + mappedBy + "] ";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + mappedBy + "]is not a ManyToOne?";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocOne<?> mappedAssocOne = (DeployBeanPropertyAssocOne<?>) mappedProp;
-
+    DeployBeanPropertyAssocOne<?> mappedAssocOne = mappedManyToOne(prop, targetDesc, mappedBy);
     DeployTableJoin tableJoin = prop.getTableJoin();
     if (!tableJoin.hasJoinColumns()) {
       // define Join as the inverse of the mappedBy property
@@ -1079,6 +1052,17 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
+  private DeployBeanPropertyAssocOne<?> mappedManyToOne(DeployBeanPropertyAssocMany<?> prop, DeployBeanDescriptor<?> targetDesc, String mappedBy) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocOne<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + mappedBy + "]is not a ManyToOne?" + "in [" + targetDesc + "]");
+    }
+    return (DeployBeanPropertyAssocOne<?>) mappedProp;
+  }
+
   /**
    * For mappedBy copy the joins from the other side.
    */
@@ -1094,33 +1078,10 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
 
     // get the mappedBy property
     DeployBeanDescriptor<?> targetDesc = targetDescriptor(prop);
-    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
-
-    if (mappedProp == null) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += "  Can not find mappedBy property [" + mappedBy + "] ";
-      m += "in [" + targetDesc + "]";
-      throw new PersistenceException(m);
-    }
-
-    if (!(mappedProp instanceof DeployBeanPropertyAssocMany<?>)) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?";
-      throw new PersistenceException(m);
-    }
-
-    DeployBeanPropertyAssocMany<?> mappedAssocMany = (DeployBeanPropertyAssocMany<?>) mappedProp;
-
-    if (!mappedAssocMany.isManyToMany()) {
-      String m = "Error on " + prop.getFullBeanName();
-      m += ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?";
-      throw new PersistenceException(m);
-    }
+    DeployBeanPropertyAssocMany<?> mappedAssocMany = mappedManyToMany(prop, mappedBy, targetDesc);
 
     // define the relationships/joins on this side as the
     // reverse of the other mappedBy side ...
-
-    // DeployTableJoin mappedJoin = mappedAssocMany.getTableJoin();
     DeployTableJoin mappedIntJoin = mappedAssocMany.getIntersectionJoin();
     DeployTableJoin mappendInverseJoin = mappedAssocMany.getInverseJoin();
 
@@ -1142,6 +1103,22 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
     }
   }
 
+  private DeployBeanPropertyAssocMany<?> mappedManyToMany(DeployBeanPropertyAssocMany<?> prop, String mappedBy, DeployBeanDescriptor<?> targetDesc) {
+    DeployBeanProperty mappedProp = targetDesc.getBeanProperty(mappedBy);
+    if (mappedProp == null) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + "  Can not find mappedBy property [" + mappedBy + "] " + "in [" + targetDesc + "]");
+    }
+    if (!(mappedProp instanceof DeployBeanPropertyAssocMany<?>)) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+    }
+
+    DeployBeanPropertyAssocMany<?> mappedAssocMany = (DeployBeanPropertyAssocMany<?>) mappedProp;
+    if (!mappedAssocMany.isManyToMany()) {
+      throw new PersistenceException("Error on " + prop.getFullBeanName() + ". mappedBy property [" + targetDesc + "." + mappedBy + "] is not a ManyToMany?");
+    }
+    return mappedAssocMany;
+  }
+
   private <T> void setBeanControllerFinderListener(DeployBeanDescriptor<T> descriptor) {
     persistControllerManager.addPersistControllers(descriptor);
     postLoadManager.addPostLoad(descriptor);

ebean-core/src/main/java/io/ebeaninternal/server/grammer/EqlWhereListener.java

@@ -136,7 +136,7 @@ abstract class EqlWhereListener<T> extends EQLBaseListener {
     }
   }
 
-  @SuppressWarnings("unchecked")
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private List<Object> toList(Object value) {
     if (value == null) return null;
     if (value instanceof List) {

ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java

@@ -1,11 +1,6 @@
 package io.ebeaninternal.server.persist;
 
-import io.ebean.CallableSql;
-import io.ebean.MergeOptions;
-import io.ebean.Query;
-import io.ebean.SqlUpdate;
-import io.ebean.Transaction;
-import io.ebean.Update;
+import io.ebean.*;
 import io.ebean.bean.BeanCollection;
 import io.ebean.bean.BeanCollection.ModifyListenMode;
 import io.ebean.bean.EntityBean;
@@ -13,30 +8,15 @@ import io.ebean.bean.PersistenceContext;
 import io.ebean.event.BeanPersistController;
 import io.ebean.meta.MetricVisitor;
 import io.ebeaninternal.api.*;
-import io.ebeaninternal.server.core.PersistRequest;
+import io.ebeaninternal.server.core.*;
 import io.ebeaninternal.server.core.PersistRequest.Type;
-import io.ebeaninternal.server.core.PersistRequestBean;
-import io.ebeaninternal.server.core.PersistRequestCallableSql;
-import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
-import io.ebeaninternal.server.core.PersistRequestUpdateSql;
-import io.ebeaninternal.server.core.Persister;
-import io.ebeaninternal.server.deploy.BeanDescriptor;
-import io.ebeaninternal.server.deploy.BeanDescriptorManager;
-import io.ebeaninternal.server.deploy.BeanManager;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
-import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
-import io.ebeaninternal.server.deploy.IntersectionRow;
+import io.ebeaninternal.server.deploy.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.PersistenceException;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Persister implementation using DML.
@@ -82,7 +62,6 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public int executeCallable(CallableSql callSql, Transaction t) {
-
     return executeOrQueue(new PersistRequestCallableSql(server, callSql, (SpiTransaction) t, persistExecute));
   }
 
@@ -91,16 +70,8 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public int executeOrmUpdate(Update<?> update, Transaction t) {
-
     SpiUpdate<?> ormUpdate = (SpiUpdate<?>) update;
-
-    BeanManager<?> mgr = beanDescriptorManager.beanManager(ormUpdate.getBeanType());
-
-    if (mgr == null) {
-      String msg = "No BeanManager found for type [" + ormUpdate.getBeanType() + "]. Is it an entity?";
-      throw new PersistenceException(msg);
-    }
-
+    BeanManager<?> mgr = beanManager(ormUpdate.getBeanType());
     return executeOrQueue(new PersistRequestOrmUpdate(server, mgr, ormUpdate, (SpiTransaction) t, persistExecute));
   }
 
@@ -169,10 +140,8 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public <T> List<T> draftRestore(Query<T> query, Transaction transaction) {
-
     Class<T> beanType = query.getBeanType();
     BeanDescriptor<T> desc = server.descriptor(beanType);
-
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> liveBeans = draftHandler.fetchSourceBeans(query, false);
@@ -182,7 +151,6 @@ public final class DefaultPersister implements Persister {
     }
 
     draftHandler.fetchDestinationBeans(liveBeans, true);
-
     BeanManager<T> mgr = beanDescriptorManager.beanManager(beanType);
 
     for (T liveBean : liveBeans) {
@@ -214,10 +182,8 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public <T> List<T> publish(Query<T> query, Transaction transaction) {
-
     Class<T> beanType = query.getBeanType();
     BeanDescriptor<T> desc = server.descriptor(beanType);
-
     DraftHandler<T> draftHandler = new DraftHandler<>(desc, transaction);
 
     List<T> draftBeans = draftHandler.fetchSourceBeans(query, true);
@@ -227,7 +193,6 @@ public final class DefaultPersister implements Persister {
     }
 
     draftHandler.fetchDestinationBeans(draftBeans, false);
-
     BeanManager<T> mgr = beanDescriptorManager.beanManager(beanType);
 
     List<T> livePublish = new ArrayList<>(draftBeans.size());
@@ -251,7 +216,6 @@ public final class DefaultPersister implements Persister {
     }
 
     draftHandler.updateDrafts(transaction, mgr);
-
     PUB.debug("publish - complete for [{}]", desc.name());
     return livePublish;
   }
@@ -330,9 +294,7 @@ public final class DefaultPersister implements Persister {
      * Fetch the destination beans that will be published to.
      */
     void fetchDestinationBeans(List<T> sourceBeans, boolean asDraft) {
-
       List<Object> ids = getBeanIds(desc, sourceBeans);
-
       Query<T> destQuery = server.find(desc.type()).where().idIn(ids).query();
       if (asDraft) {
         destQuery.asDraft();
@@ -376,7 +338,6 @@ public final class DefaultPersister implements Persister {
 
   @Override
   public int merge(BeanDescriptor<?> desc, EntityBean bean, MergeOptions options, SpiTransaction transaction) {
-
     MergeHandler merge = new MergeHandler(server, desc, bean, options, transaction);
     List<EntityBean> deleteBeans = merge.merge();
     if (!deleteBeans.isEmpty()) {
@@ -385,13 +346,11 @@ public final class DefaultPersister implements Persister {
         delete(deleteBean, transaction, options.isDeletePermanent());
       }
     }
-
     // cascade save as normal with forceUpdate flags set
     PersistRequestBean<?> request = createRequestRecurse(bean, transaction, null, Flags.MERGE);
     request.checkBatchEscalationOnCascade();
     saveRecurse(request);
     request.flushBatchOnCascade();
-
     // lambda expects a return
     return 0;
   }
@@ -443,7 +402,6 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public void insert(EntityBean bean, Transaction t) {
-
     PersistRequestBean<?> req = createRequest(bean, t, PersistRequest.Type.INSERT);
     if (req.isSkipReference()) {
       // skip insert on reference bean
@@ -465,7 +423,6 @@ public final class DefaultPersister implements Persister {
   }
 
   void saveRecurse(EntityBean bean, Transaction t, Object parentBean, int flags) {
-
     // determine insert or update taking into account stateless updates
     saveRecurse(createRequestRecurse(bean, t, parentBean, flags));
   }
@@ -493,7 +450,6 @@ public final class DefaultPersister implements Persister {
    * Insert the bean.
    */
   private void insert(PersistRequestBean<?> request) {
-
     if (request.isRegisteredBean()) {
       // skip as already inserted/updated in this request (recursive cascading)
       return;
@@ -520,7 +476,6 @@ public final class DefaultPersister implements Persister {
    * Update the bean.
    */
   private void update(PersistRequestBean<?> request) {
-
     if (request.isRegisteredBean()) {
       // skip as already inserted/updated in this request (recursive cascading)
       return;
@@ -531,21 +486,16 @@ public final class DefaultPersister implements Persister {
         // save associated One beans recursively first
         saveAssocOne(request);
       }
-
       if (request.isDirty()) {
         request.executeOrQueue();
-
       } else if (log.isDebugEnabled()) {
         log.debug("Update skipped as bean is unchanged: {}", request.bean());
       }
-
       if (request.isPersistCascade()) {
         // save all the beans in assocMany's after
         saveAssocMany(request);
       }
-
       request.completeUpdate();
-
     } finally {
       request.unRegisterBean();
     }
@@ -557,7 +507,6 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public int delete(EntityBean bean, Transaction t, boolean permanent) {
-
     Type deleteType = permanent ? Type.DELETE_PERMANENT : Type.DELETE;
     PersistRequestBean<EntityBean> originalRequest = createDeleteRequest(bean, t, deleteType);
     if (originalRequest.isHardDeleteDraft()) {
@@ -601,7 +550,6 @@ public final class DefaultPersister implements Persister {
       }
       req.commitTransIfRequired();
       req.flushBatchOnCascade();
-
       return rows;
 
     } catch (RuntimeException ex) {
@@ -631,23 +579,19 @@ public final class DefaultPersister implements Persister {
    */
   @Override
   public int deleteMany(Class<?> beanType, Collection<?> ids, Transaction transaction, boolean permanent) {
-
     if (ids == null || ids.isEmpty()) {
       return 0;
     }
-
     BeanDescriptor<?> descriptor = beanDescriptorManager.descriptor(beanType);
     DeleteMode deleteMode = (permanent || !descriptor.isSoftDelete()) ? DeleteMode.HARD : DeleteMode.SOFT;
     if (descriptor.isMultiTenant()) {
       return deleteAsBeans(ids, transaction, deleteMode, descriptor);
     }
-
     ArrayList<Object> idList = new ArrayList<>(ids.size());
     for (Object id : ids) {
       // convert to appropriate type if required
       idList.add(descriptor.convertId(id));
     }
-
     return delete(descriptor, null, idList, transaction, deleteMode);
   }
 
@@ -698,7 +642,6 @@ public final class DefaultPersister implements Persister {
    * Delete by Id or a List of Id's.
    */
   private int delete(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction, DeleteMode deleteMode) {
-
     SpiTransaction t = (SpiTransaction) transaction;
     if (t.isPersistCascade()) {
       BeanPropertyAssocOne<?>[] propImportDelete = descriptor.propertiesOneImportedDelete();
@@ -818,7 +761,6 @@ public final class DefaultPersister implements Persister {
   }
 
   private void notifyDeleteById(BeanDescriptor<?> descriptor, Object id, List<Object> idList, Transaction transaction) {
-
     BeanPersistController controller = descriptor.persistController();
     if (controller != null) {
       DeleteIdRequest request = new DeleteIdRequest(server, transaction, descriptor.type(), id);
@@ -838,7 +780,6 @@ public final class DefaultPersister implements Persister {
    * the delete cascades to them (foreign keys).
    */
   private Query<?> deleteRequiresQuery(BeanDescriptor<?> desc, BeanPropertyAssocOne<?>[] propImportDelete, DeleteMode deleteMode) {
-
     Query<?> q = server.createQuery(desc.type());
     StringBuilder sb = new StringBuilder(30);
     for (BeanPropertyAssocOne<?> aPropImportDelete : propImportDelete) {
@@ -860,9 +801,7 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   private int delete(PersistRequestBean<?> request) {
-
     DeleteUnloadedForeignKeys unloadedForeignKeys = null;
-
     if (request.isPersistCascade()) {
       // delete children first ... register the
       // bean to handle bi-directional cascading
@@ -879,16 +818,13 @@ public final class DefaultPersister implements Persister {
 
     int count = request.executeOrQueue();
     request.removeFromPersistenceContext();
-
     if (request.isPersistCascade()) {
       deleteAssocOne(request);
-
       if (unloadedForeignKeys != null) {
         unloadedForeignKeys.deleteCascade();
       }
     }
     request.complete();
-
     // return true if using JDBC batch (as we can't tell until the batch is flushed)
     return count;
   }
@@ -901,11 +837,9 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   private void saveAssocMany(PersistRequestBean<?> request) {
-
     EntityBean parentBean = request.entityBean();
     BeanDescriptor<?> desc = request.descriptor();
     SpiTransaction t = request.transaction();
-
     EntityBean orphanForRemoval = request.importedOrphanForRemoval();
     if (orphanForRemoval != null) {
       delete(orphanForRemoval, request.transaction(), true);
@@ -972,7 +906,6 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   private void deleteAssocMany(PersistRequestBean<?> request) {
-
     SpiTransaction t = request.transaction();
     t.depth(-1);
 
@@ -1014,7 +947,6 @@ public final class DefaultPersister implements Persister {
           deleteManyIntersection(parentBean, many, t, request.isPublish(), false);
         }
       } else {
-
         if (ModifyListenMode.REMOVALS == many.modifyListenMode()) {
           // PrivateOwned ...
           // if soft delete then check target also supports soft delete
@@ -1023,7 +955,6 @@ public final class DefaultPersister implements Persister {
             if (details instanceof BeanCollection<?>) {
               Set<?> modifyRemovals = ((BeanCollection<?>) details).getModifyRemovals();
               if (modifyRemovals != null && !modifyRemovals.isEmpty()) {
-
                 // delete the orphans that have been removed from the collection
                 for (Object detail : modifyRemovals) {
                   EntityBean detailBean = (EntityBean) detail;
@@ -1035,11 +966,9 @@ public final class DefaultPersister implements Persister {
             }
           }
         }
-
         deleteManyDetails(t, desc, parentBean, many, null, deleteMode);
       }
     }
-
     // restore the depth
     t.depth(+1);
   }
@@ -1054,7 +983,6 @@ public final class DefaultPersister implements Persister {
    */
   void deleteManyDetails(SpiTransaction t, BeanDescriptor<?> desc, EntityBean parentBean,
                          BeanPropertyAssocMany<?> many, List<Object> excludeDetailIds, DeleteMode deleteMode) {
-
     if (many.cascadeInfo().isDelete()) {
       // cascade delete the beans in the collection
       BeanDescriptor<?> targetDesc = many.targetDescriptor();
@@ -1083,7 +1011,6 @@ public final class DefaultPersister implements Persister {
    * Will use delete by object if the child entity has manyToMany relationships.
    */
   private void deleteChildrenById(SpiTransaction t, BeanDescriptor<?> targetDesc, List<Object> childIds, DeleteMode deleteMode) {
-
     if (!targetDesc.isDeleteByBulk()) {
       // convert into a list of reference objects and perform delete by object
       List<Object> refList = new ArrayList<>(childIds.size());
@@ -1091,7 +1018,6 @@ public final class DefaultPersister implements Persister {
         refList.add(targetDesc.createReference(id, null));
       }
       deleteList(refList, t, deleteMode, true);
-
     } else {
       // perform delete by statement if possible
       delete(targetDesc, null, childIds, t, deleteMode);
@@ -1102,16 +1028,13 @@ public final class DefaultPersister implements Persister {
    * Save any associated one beans.
    */
   private void saveAssocOne(PersistRequestBean<?> request) {
-
     BeanDescriptor<?> desc = request.descriptor();
-
     // imported ones with save cascade
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneImportedSave()) {
       // check for partial objects
       if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
         request.setImportedOrphanForRemoval(prop);
       }
-
       if (request.isLoadedProperty(prop)) {
         EntityBean detailBean = prop.getValueAsEntityBean(request.entityBean());
         if (detailBean != null
@@ -1125,7 +1048,6 @@ public final class DefaultPersister implements Persister {
         }
       }
     }
-
     for (BeanPropertyAssocOne<?> prop : desc.propertiesOneExportedSave()) {
       if (prop.isOrphanRemoval() && request.isDirtyProperty(prop)) {
         deleteOrphan(request, prop);
@@ -1145,9 +1067,7 @@ public final class DefaultPersister implements Persister {
    * loaded but required for Delete cascade.
    */
   private DeleteUnloadedForeignKeys getDeleteUnloadedForeignKeys(PersistRequestBean<?> request) {
-
     DeleteUnloadedForeignKeys fkeys = null;
-
     for (BeanPropertyAssocOne<?> one : request.descriptor().propertiesOneImportedDelete()) {
       if (!request.isLoadedProperty(one)) {
         // we have cascade Delete on a partially populated bean and
@@ -1158,7 +1078,6 @@ public final class DefaultPersister implements Persister {
         fkeys.add(one);
       }
     }
-
     return fkeys;
   }
 
@@ -1166,9 +1085,7 @@ public final class DefaultPersister implements Persister {
    * Delete any associated one beans.
    */
   private void deleteAssocOne(PersistRequestBean<?> request) {
-
     DeleteMode deleteMode = request.deleteMode();
-
     for (BeanPropertyAssocOne<?> prop : request.descriptor().propertiesOneImportedDelete()) {
       if (deleteMode.isHard() || prop.isTargetSoftDelete()) {
         if (request.isLoadedProperty(prop)) {
@@ -1196,7 +1113,7 @@ public final class DefaultPersister implements Persister {
    * Create the Persist Request Object additionally specifying the publish status.
    */
   private <T> PersistRequestBean<T> createRequestInternal(T bean, Transaction t, PersistRequest.Type type) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
     return createRequest(bean, t, null, mgr, type, Flags.ZERO);
   }
 
@@ -1206,7 +1123,7 @@ public final class DefaultPersister implements Persister {
    * This call determines the PersistRequest.Type based on bean state and the insert flag (root persist type).
    */
   private <T> PersistRequestBean<T> createRequestRecurse(T bean, Transaction t, Object parentBean, int flags) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
     BeanDescriptor<T> desc = mgr.getBeanDescriptor();
     EntityBean entityBean = (EntityBean) bean;
     PersistRequest.Type type;
@@ -1225,7 +1142,7 @@ public final class DefaultPersister implements Persister {
    * Create the Persist Request Object that wraps all the objects used to
    * perform an insert, update or delete.
    */
-  @SuppressWarnings({"unchecked"})
+  @SuppressWarnings({"unchecked", "rawtypes"})
   private <T> PersistRequestBean<T> createRequest(T bean, Transaction t, Object parentBean, BeanManager<?> mgr,
                                                   PersistRequest.Type type, int flags) {
     // no delete requests come here
@@ -1242,7 +1159,7 @@ public final class DefaultPersister implements Persister {
 
   @SuppressWarnings({"unchecked"})
   private <T> PersistRequestBean<T> createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) {
-    BeanManager<T> mgr = getBeanManager(bean);
+    BeanManager<T> mgr = beanManager(bean.getClass());
     if (type == Type.DELETE_PERMANENT) {
       type = Type.DELETE;
     } else if (type == Type.DELETE && mgr.getBeanDescriptor().isSoftDelete()) {
@@ -1256,9 +1173,8 @@ public final class DefaultPersister implements Persister {
   }
 
   private String errNotRegistered(Class<?> beanClass) {
-    String msg = "The type [" + beanClass + "] is not a registered entity?";
-    msg += " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
-    return msg;
+    return "The type [" + beanClass + "] is not a registered entity?"
+      + " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
   }
 
   /**
@@ -1269,10 +1185,10 @@ public final class DefaultPersister implements Persister {
    * </p>
    */
   @SuppressWarnings("unchecked")
-  private <T> BeanManager<T> getBeanManager(Object bean) {
-    BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.beanManager(bean.getClass());
+  private <T> BeanManager<T> beanManager(Class<?> cls) {
+    BeanManager<T> mgr = (BeanManager<T>)beanDescriptorManager.beanManager(cls);
     if (mgr == null) {
-      throw new PersistenceException(errNotRegistered(bean.getClass()));
+      throw new PersistenceException(errNotRegistered(cls));
     }
     return mgr;
   }