From 63b08af3d2e5e0b8778cd9ab0c7086f60a1e101b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 17 Nov 2016 19:14:02 +1300 Subject: [PATCH] no effective change - format only --- .../server/persist/BatchControl.java | 1 + .../server/persist/BatchedPstmtHolder.java | 5 +- .../server/persist/BeanPersister.java | 4 +- .../ebeaninternal/server/persist/Binder.java | 21 ++-- .../server/persist/DefaultPersister.java | 8 +- .../server/persist/PstmtFactory.java | 6 +- .../server/persist/dml/DeleteHandler.java | 60 +++++------ .../server/persist/dml/DeleteMeta.java | 30 +++--- .../server/persist/dml/DmlBeanPersister.java | 100 +++++++++--------- .../persist/dml/DmlBeanPersisterFactory.java | 42 ++++---- .../server/persist/dml/DmlHandler.java | 6 +- .../server/persist/dml/DmlMode.java | 20 ++-- .../server/persist/dml/UpdateMeta.java | 2 +- .../server/persist/dml/UpdatePlan.java | 2 +- .../server/persist/dml/package.html | 6 +- .../server/persist/dmlbind/Bindable.java | 6 +- .../persist/dmlbind/BindableCompound.java | 8 +- .../dmlbind/BindableDiscriminator.java | 9 +- .../persist/dmlbind/BindableEmbedded.java | 8 +- .../dmlbind/BindableEncryptedProperty.java | 11 +- .../persist/dmlbind/BindableIdEmbedded.java | 15 ++- .../persist/dmlbind/BindableIdEmpty.java | 6 +- .../persist/dmlbind/BindableIdScalar.java | 9 +- .../server/persist/dmlbind/BindableList.java | 5 +- .../persist/dmlbind/BindableProperty.java | 6 +- .../BindablePropertyInsertGenerated.java | 4 +- .../BindablePropertyUpdateGenerated.java | 6 +- .../dmlbind/BindableUnidirectional.java | 9 +- .../persist/dmlbind/FactoryAssocOnes.java | 4 +- .../dmlbind/FactoryBaseProperties.java | 6 +- .../persist/dmlbind/FactoryEmbedded.java | 6 +- .../server/persist/dmlbind/package.html | 6 +- .../ebeaninternal/server/persist/package.html | 10 +- .../properties/BeanPropertiesReader.java | 18 ++-- .../server/properties/BeanPropertyGetter.java | 10 +- .../server/properties/BeanPropertyInfo.java | 28 ++--- .../properties/BeanPropertyInfoFactory.java | 8 +- .../server/properties/BeanPropertySetter.java | 22 ++-- .../properties/EnhanceBeanPropertyInfo.java | 10 +- .../EnhanceBeanPropertyInfoFactory.java | 8 +- .../server/properties/package.html | 10 +- 41 files changed, 275 insertions(+), 286 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java index a6834b0a6..3242809af 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchControl.java @@ -4,6 +4,7 @@ import com.avaje.ebeaninternal.api.SpiTransaction; import com.avaje.ebeaninternal.server.core.PersistRequest; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; + import javax.persistence.PersistenceException; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java index 249910ddf..1cc374303 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -1,11 +1,12 @@ package com.avaje.ebeaninternal.server.persist; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.LinkedHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Used to hold BatchedPstmt objects for batch based execution. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java index 96f75ab7f..c4e192288 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/BeanPersister.java @@ -1,9 +1,9 @@ package com.avaje.ebeaninternal.server.persist; -import javax.persistence.PersistenceException; - import com.avaje.ebeaninternal.server.core.PersistRequestBean; +import javax.persistence.PersistenceException; + /** * Defines bean insert update and delete implementation. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java index 3e46b87fe..4049b26a0 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/Binder.java @@ -1,16 +1,5 @@ package com.avaje.ebeaninternal.server.persist; -import java.math.BigDecimal; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Types; -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.config.dbplatform.DbPlatformType; import com.avaje.ebeaninternal.api.BindParams; import com.avaje.ebeaninternal.server.core.DbExpressionHandler; @@ -22,6 +11,16 @@ import com.avaje.ebeaninternal.server.type.TypeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.persistence.PersistenceException; +import java.math.BigDecimal; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Types; +import java.util.ArrayList; +import java.util.List; + /** * Binds bean values to a PreparedStatement. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java index 402fdd50a..f676bc153 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/DefaultPersister.java @@ -148,7 +148,7 @@ public final class DefaultPersister implements Persister { BeanManager mgr = beanDescriptorManager.getBeanManager(beanType); - for (T liveBean: liveBeans) { + for (T liveBean : liveBeans) { T draftBean = draftHandler.publishToDestinationBean(liveBean); // reset @DraftDirty and @DraftReset properties draftHandler.resetDraft(draftBean); @@ -166,7 +166,7 @@ public final class DefaultPersister implements Persister { */ private List getBeanIds(BeanDescriptor desc, List beans) { List idList = new ArrayList<>(); - for (T liveBean: beans) { + for (T liveBean : beans) { idList.add(desc.getBeanId(liveBean)); } return idList; @@ -194,7 +194,7 @@ public final class DefaultPersister implements Persister { BeanManager mgr = beanDescriptorManager.getBeanManager(beanType); List livePublish = new ArrayList<>(draftBeans.size()); - for (T draftBean: draftBeans) { + for (T draftBean : draftBeans) { T liveBean = draftHandler.publishToDestinationBean(draftBean); livePublish.add(liveBean); @@ -889,7 +889,7 @@ public final class DefaultPersister implements Persister { private void resetModifyState() { Object details = getValue(); if (details instanceof BeanCollection) { - modifyListenReset((BeanCollection)details); + modifyListenReset((BeanCollection) details); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java b/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java index f9f995805..0cfae26b1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/PstmtFactory.java @@ -38,8 +38,7 @@ public class PstmtFactory { /** * Return a prepared statement taking into account batch requirements. */ - public PreparedStatement getPstmt(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) - throws SQLException { + public PreparedStatement getPstmt(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) throws SQLException { BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder(); PreparedStatement stmt = batch.getStmt(sql, batchExe); @@ -63,8 +62,7 @@ public class PstmtFactory { /** * Return a callable statement taking into account batch requirements. */ - public CallableStatement getCstmt(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) - throws SQLException { + public CallableStatement getCstmt(SpiTransaction t, boolean logSql, String sql, BatchPostExecute batchExe) throws SQLException { BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder(); CallableStatement stmt = (CallableStatement) batch.getStmt(sql, batchExe); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java index ffd57b352..677f80112 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -12,41 +12,41 @@ import java.sql.SQLException; */ public class DeleteHandler extends DmlHandler { - private final DeleteMeta meta; + private final DeleteMeta meta; - public DeleteHandler(PersistRequestBean persist, DeleteMeta meta) { - super(persist, meta.isEmptyStringAsNull()); - this.meta = meta; - } + public DeleteHandler(PersistRequestBean persist, DeleteMeta meta) { + super(persist, meta.isEmptyStringAsNull()); + this.meta = meta; + } - /** - * Generate and bind the delete statement. - */ + /** + * Generate and bind the delete statement. + */ @Override - public void bind() throws SQLException { - - sql = meta.getSql(persistRequest); - SpiTransaction t = persistRequest.getTransaction(); + public void bind() throws SQLException { - PreparedStatement pstmt; - if (persistRequest.isBatched()) { - pstmt = getPstmt(t, sql, persistRequest, false); - } else { - pstmt = getPstmt(t, sql, false); - } - dataBind = bind(pstmt); - meta.bind(persistRequest, this); - logSql(sql); - } + sql = meta.getSql(persistRequest); + SpiTransaction t = persistRequest.getTransaction(); - /** - * Execute the delete non-batch. - */ + PreparedStatement pstmt; + if (persistRequest.isBatched()) { + pstmt = getPstmt(t, sql, persistRequest, false); + } else { + pstmt = getPstmt(t, sql, false); + } + dataBind = bind(pstmt); + meta.bind(persistRequest, this); + logSql(sql); + } + + /** + * Execute the delete non-batch. + */ @Override - public int execute() throws SQLException, OptimisticLockException { - int rowCount = dataBind.executeUpdate(); - checkRowCount(rowCount); + public int execute() throws SQLException, OptimisticLockException { + int rowCount = dataBind.executeUpdate(); + checkRowCount(rowCount); return rowCount; - } - + } + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java index 8b6684586..f09b41531 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DeleteMeta.java @@ -1,14 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dml; -import java.sql.SQLException; - -import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; import com.avaje.ebeaninternal.server.persist.dmlbind.BindableId; +import java.sql.SQLException; + /** * Meta data for delete handler. The meta data is for a particular bean type. It * is considered immutable and is thread safe. @@ -69,12 +69,12 @@ public final class DeleteMeta { id.dmlBind(bind, bean); switch (persist.getConcurrencyMode()) { - case VERSION: - version.dmlBind(bind, bean); - break; + case VERSION: + version.dmlBind(bind, bean); + break; - default: - break; + default: + break; } } @@ -89,14 +89,14 @@ public final class DeleteMeta { boolean publish = request.isPublish(); switch (request.determineConcurrencyMode()) { - case NONE: - return publish ? sqlNone : sqlDraftNone; + case NONE: + return publish ? sqlNone : sqlDraftNone; - case VERSION: - return publish ? sqlVersion : sqlDraftVersion; + case VERSION: + return publish ? sqlVersion : sqlDraftVersion; - default: - throw new RuntimeException("Invalid mode " + request.determineConcurrencyMode()); + default: + throw new RuntimeException("Invalid mode " + request.determineConcurrencyMode()); } } @@ -118,7 +118,7 @@ public final class DeleteMeta { } version.dmlAppend(request); } - + return request.toString(); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java index 737e8000a..c37a60098 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersister.java @@ -18,77 +18,77 @@ import java.sql.SQLException; */ public final class DmlBeanPersister implements BeanPersister { - private final UpdateMeta updateMeta; + private final UpdateMeta updateMeta; - private final InsertMeta insertMeta; + private final InsertMeta insertMeta; - private final DeleteMeta deleteMeta; + private final DeleteMeta deleteMeta; - - public DmlBeanPersister(UpdateMeta updateMeta, InsertMeta insertMeta, DeleteMeta deleteMeta) { - this.updateMeta = updateMeta; - this.insertMeta = insertMeta; - this.deleteMeta = deleteMeta; - } + public DmlBeanPersister(UpdateMeta updateMeta, InsertMeta insertMeta, DeleteMeta deleteMeta) { - /** - * execute the bean delete request. - */ - public int delete(PersistRequestBean request) { + this.updateMeta = updateMeta; + this.insertMeta = insertMeta; + this.deleteMeta = deleteMeta; + } - DeleteHandler delete = new DeleteHandler(request, deleteMeta); - return execute(request, delete); - } + /** + * execute the bean delete request. + */ + public int delete(PersistRequestBean request) { - /** - * execute the bean insert request. - */ - public void insert(PersistRequestBean request) { + DeleteHandler delete = new DeleteHandler(request, deleteMeta); + return execute(request, delete); + } - InsertHandler insert = new InsertHandler(request, insertMeta); - execute(request, insert); - } + /** + * execute the bean insert request. + */ + public void insert(PersistRequestBean request) { - /** - * execute the bean update request. - */ - public void update(PersistRequestBean request) { + InsertHandler insert = new InsertHandler(request, insertMeta); + execute(request, insert); + } - UpdateHandler update = new UpdateHandler(request, updateMeta); - execute(request, update); - } + /** + * execute the bean update request. + */ + public void update(PersistRequestBean request) { - /** - * execute request taking batching into account. - */ - private int execute(PersistRequestBean request, PersistHandler handler) { + UpdateHandler update = new UpdateHandler(request, updateMeta); + execute(request, update); + } + + /** + * execute request taking batching into account. + */ + private int execute(PersistRequestBean request, PersistHandler handler) { boolean batched = request.isBatched(); - try { - handler.bind(); - if (batched) { - handler.addBatch(); + try { + handler.bind(); + if (batched) { + handler.addBatch(); return -1; - } else { - return handler.execute(); - } + } else { + return handler.execute(); + } - } catch (SQLException e) { + } catch (SQLException e) { // log the error to the transaction log - String errMsg = StringHelper.replaceStringMulti(e.getMessage(), new String[]{"\r","\n"}, "\\n "); - String msg = "ERROR executing DML bindLog["+handler.getBindLog()+"] error["+errMsg+"]"; + String errMsg = StringHelper.replaceStringMulti(e.getMessage(), new String[]{"\r", "\n"}, "\\n "); + String msg = "ERROR executing DML bindLog[" + handler.getBindLog() + "] error[" + errMsg + "]"; if (request.getTransaction().isLogSummary()) { request.getTransaction().logSummary(msg); } - throw new PersistenceException(msg, e); + throw new PersistenceException(msg, e); - } finally { - if (!batched && handler != null) { + } finally { + if (!batched && handler != null) { handler.close(); - } - } - } + } + } + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java index 5bfcf5957..d4b9fcebd 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlBeanPersisterFactory.java @@ -9,25 +9,25 @@ import com.avaje.ebeaninternal.server.persist.BeanPersisterFactory; * Factory for creating a DmlBeanPersister for a bean type. */ public class DmlBeanPersisterFactory implements BeanPersisterFactory { - - private final MetaFactory metaFactory; - - public DmlBeanPersisterFactory(DatabasePlatform dbPlatform) { - this.metaFactory = new MetaFactory(dbPlatform); - } - - - /** - * Create a DmlBeanPersister for the given bean type. - */ - public BeanPersister create(BeanDescriptor desc) { - - UpdateMeta updMeta = metaFactory.createUpdate(desc); - DeleteMeta delMeta = metaFactory.createDelete(desc); - InsertMeta insMeta = metaFactory.createInsert(desc); - - return new DmlBeanPersister(updMeta, insMeta, delMeta); - - } - + + private final MetaFactory metaFactory; + + public DmlBeanPersisterFactory(DatabasePlatform dbPlatform) { + this.metaFactory = new MetaFactory(dbPlatform); + } + + + /** + * Create a DmlBeanPersister for the given bean type. + */ + public BeanPersister create(BeanDescriptor desc) { + + UpdateMeta updMeta = metaFactory.createUpdate(desc); + DeleteMeta delMeta = metaFactory.createDelete(desc); + InsertMeta insMeta = metaFactory.createInsert(desc); + + return new DmlBeanPersister(updMeta, insMeta, delMeta); + + } + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java index f49c35936..98721b20d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlHandler.java @@ -254,13 +254,13 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { * Check with useGeneratedKeys to get appropriate PreparedStatement. */ protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean genKeys) throws SQLException { - + Connection conn = t.getInternalConnection(); if (genKeys) { // the Id generated is always the first column // Required to stop Oracle10 giving us Oracle rowId?? // Other jdbc drivers seem fine without this hint. - int[] columns = { 1 }; + int[] columns = {1}; return conn.prepareStatement(sql, columns); } else { @@ -272,7 +272,7 @@ public abstract class DmlHandler implements PersistHandler, BindableRequest { * Return a prepared statement taking into account batch requirements. */ protected PreparedStatement getPstmt(SpiTransaction t, String sql, PersistRequestBean request, - boolean genKeys) throws SQLException { + boolean genKeys) throws SQLException { BatchedPstmtHolder batch = t.getBatchControl().getPstmtHolder(); PreparedStatement stmt = batch.getStmt(sql, request); diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java index 797bfcf01..c29af82e9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/DmlMode.java @@ -5,14 +5,14 @@ package com.avaje.ebeaninternal.server.persist.dml; */ public enum DmlMode { - /** - * The Insert SET. - */ - INSERT, - - /** - * The Update SET. - */ - UPDATE, - + /** + * The Insert SET. + */ + INSERT, + + /** + * The Update SET. + */ + UPDATE, + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java index 32bc1f022..2d5680599 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdateMeta.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebeaninternal.api.SpiUpdatePlan; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java index 596a4a5e7..012548a7e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/UpdatePlan.java @@ -1,7 +1,7 @@ package com.avaje.ebeaninternal.server.persist.dml; -import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebean.bean.EntityBean; +import com.avaje.ebeaninternal.api.ConcurrencyMode; import com.avaje.ebeaninternal.api.SpiUpdatePlan; import com.avaje.ebeaninternal.server.persist.dmlbind.Bindable; diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html index 05ba5dce1..7a60e6148 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dml/package.html @@ -1,10 +1,10 @@ - - Bean DML persistence implementation + + Bean DML persistence implementation Bean DML persistence implementation - \ No newline at end of file + diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java index 797b31609..a3d877203 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/Bindable.java @@ -1,12 +1,12 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.List; + /** * Item held by Meta objects used to generate and bind bean insert update and * delete statements. diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableCompound.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableCompound.java index 39f00c1a0..f40d6275e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableCompound.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableCompound.java @@ -1,14 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompound; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.List; + /** * Bindable for a Immutable Compound value object. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 21235b5f9..881875ff6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.InheritInfo; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; +import java.util.List; + /** * Bindable for inserting a discriminator value. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java index b1b707f8b..9461ab30c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEmbedded.java @@ -1,14 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.List; + /** * Bindable for a Embedded bean. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java index 4863f7e51..03ffe0392 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableEncryptedProperty.java @@ -1,14 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.sql.Types; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.sql.Types; +import java.util.List; + /** * Bindable for a DB encrypted BeanProperty. */ @@ -48,8 +48,7 @@ public class BindableEncryptedProperty implements Bindable { /** * Bind a value in a Insert SET clause. */ - public void dmlBind(BindableRequest request, EntityBean bean) - throws SQLException { + public void dmlBind(BindableRequest request, EntityBean bean) throws SQLException { Object value = null; if (bean != null) { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 5466754bf..e0bd48f6c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -1,11 +1,5 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; @@ -13,6 +7,11 @@ import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.List; + /** * Bindable for a EmbeddedId. */ @@ -83,8 +82,8 @@ public final class BindableIdEmbedded implements BindableId { if (matches == null) { String m = "Matches for the concatenated key columns where not found?" - + " I expect that the concatenated key was null, and this bean does" - + " not have ManyToOne assoc beans matching the primary key columns?"; + + " I expect that the concatenated key was null, and this bean does" + + " not have ManyToOne assoc beans matching the primary key columns?"; throw new PersistenceException(m); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java index 3c2584a70..357b5bbb9 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java @@ -1,12 +1,12 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.List; + public class BindableIdEmpty implements BindableId { public boolean isEmpty() { diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 2cba8c20a..1db027f63 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -1,15 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; +import java.util.List; + /** * Bindable for a single scalar id property. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java index 79f8fbc03..2843c8684 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableList.java @@ -49,15 +49,12 @@ public class BindableList implements Bindable { } public void dmlAppend(GenerateDmlRequest request) { - for (Bindable item : items) { item.dmlAppend(request); } } - public void dmlBind(BindableRequest bindRequest, EntityBean bean) - throws SQLException { - + public void dmlBind(BindableRequest bindRequest, EntityBean bean) throws SQLException { for (Bindable item : items) { item.dmlBind(bindRequest, bean); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java index 5b3b85d1b..d5286035d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableProperty.java @@ -1,13 +1,13 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.List; + /** * Bindable for a single BeanProperty. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java index c7b6e8016..f036e3031 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyInsertGenerated.java @@ -1,12 +1,12 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; + /** * Bindable for insert on a property with a GeneratedProperty. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java index 5d28a68af..68331e690 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindablePropertyUpdateGenerated.java @@ -1,14 +1,14 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.generatedproperty.GeneratedProperty; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import java.sql.SQLException; +import java.util.List; + /** * Bindable for update on a property with a GeneratedProperty. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index c980c9be6..cd87ec737 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -1,10 +1,5 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.sql.SQLException; -import java.util.List; - -import javax.persistence.PersistenceException; - import com.avaje.ebean.bean.EntityBean; import com.avaje.ebeaninternal.server.core.PersistRequestBean; import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; @@ -12,6 +7,10 @@ import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.deploy.id.ImportedId; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; +import javax.persistence.PersistenceException; +import java.sql.SQLException; +import java.util.List; + /** * Bindable for a unidirectional relationship. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java index e3dc4ad01..58c8a57ba 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java @@ -1,11 +1,11 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.util.List; - import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import java.util.List; + /** * A factory that builds Bindable for BeanPropertyAssocOne properties. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java index 57ea2f4c7..e0c75fdac 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryBaseProperties.java @@ -1,13 +1,13 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.util.ArrayList; -import java.util.List; - import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.BeanPropertyCompound; import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import java.util.ArrayList; +import java.util.List; + /** * Add base properties to the BindableList for a bean type. *

diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java index 52beeccc4..709c5524c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/FactoryEmbedded.java @@ -1,13 +1,13 @@ package com.avaje.ebeaninternal.server.persist.dmlbind; -import java.util.ArrayList; -import java.util.List; - import com.avaje.ebeaninternal.server.deploy.BeanDescriptor; import com.avaje.ebeaninternal.server.deploy.BeanProperty; import com.avaje.ebeaninternal.server.deploy.BeanPropertyAssocOne; import com.avaje.ebeaninternal.server.persist.dml.DmlMode; +import java.util.ArrayList; +import java.util.List; + /** * A factory that builds Bindable for embedded bean properties. */ diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html index 829152eca..e2b530d0f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/dmlbind/package.html @@ -1,10 +1,10 @@ - - Bindable objects to support Bean DML + + Bindable objects to support Bean DML Bindable objects to support Bean DML - \ No newline at end of file + diff --git a/src/main/java/com/avaje/ebeaninternal/server/persist/package.html b/src/main/java/com/avaje/ebeaninternal/server/persist/package.html index 5faa44c3e..589539fc1 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/persist/package.html +++ b/src/main/java/com/avaje/ebeaninternal/server/persist/package.html @@ -1,15 +1,15 @@ - - Persistence Implementation + + Persistence Implementation Persistence Implementation

-Implementing the saving and deleting of beans, and the executing of -updateable and callable sql. + Implementing the saving and deleting of beans, and the executing of + updateable and callable sql.

- \ No newline at end of file + diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java index d466fb7cb..62c23aa7c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -10,21 +10,21 @@ import java.util.Map; */ public class BeanPropertiesReader { - private final Map propertyIndexMap = new HashMap<>(); - + private final Map propertyIndexMap = new HashMap<>(); + private final String[] props; - + public BeanPropertiesReader(Class clazz) { this.props = getProperties(clazz); - for (int i=0; i clazz) { try { Field field = clazz.getField("_ebean_props"); return (String[]) field.get(null); } catch (Exception e) { - throw new IllegalStateException("Error getting _ebean_props field on type "+clazz, e); + throw new IllegalStateException("Error getting _ebean_props field on type " + clazz, e); } } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java index 652735249..65687da8b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyGetter.java @@ -7,11 +7,11 @@ import com.avaje.ebean.bean.EntityBean; */ public interface BeanPropertyGetter { - /** - * Return the value of a given bean property. - */ - Object get(EntityBean bean); + /** + * Return the value of a given bean property. + */ + Object get(EntityBean bean); - Object getIntercept(EntityBean bean); + Object getIntercept(EntityBean bean); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfo.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfo.java index ebe1764c1..d40a4f607 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfo.java @@ -9,18 +9,18 @@ package com.avaje.ebeaninternal.server.properties; */ public interface BeanPropertyInfo { - /** - * Create an EntityBean for this type. - */ - Object createEntityBean(); - - /** - * Return the getter for a given bean property. - */ - BeanPropertyGetter getGetter(int position); - - /** - * Return the setter for a given bean property. - */ - BeanPropertySetter getSetter(int position); + /** + * Create an EntityBean for this type. + */ + Object createEntityBean(); + + /** + * Return the getter for a given bean property. + */ + BeanPropertyGetter getGetter(int position); + + /** + * Return the setter for a given bean property. + */ + BeanPropertySetter getSetter(int position); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfoFactory.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfoFactory.java index 5b2befa02..1f5e550e3 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfoFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertyInfoFactory.java @@ -7,8 +7,8 @@ package com.avaje.ebeaninternal.server.properties; */ public interface BeanPropertyInfoFactory { - /** - * Create the BeanReflect for the given plain bean and its EntityBean equivalent. - */ - BeanPropertyInfo create(Class entityBeanType); + /** + * Create the BeanReflect for the given plain bean and its EntityBean equivalent. + */ + BeanPropertyInfo create(Class entityBeanType); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java index c66a4cc0c..a3e31b331 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/BeanPropertySetter.java @@ -7,17 +7,17 @@ import com.avaje.ebean.bean.EntityBean; */ public interface BeanPropertySetter { - /** - * Set the property value of a bean. - */ - void set(EntityBean bean, Object value); + /** + * Set the property value of a bean. + */ + void set(EntityBean bean, Object value); - /** - * Set the property value of a bean with interception checks. - *

- * This could invoke lazy loading and or oldValues creation. - *

- */ - void setIntercept(EntityBean bean, Object value); + /** + * Set the property value of a bean with interception checks. + *

+ * This could invoke lazy loading and or oldValues creation. + *

+ */ + void setIntercept(EntityBean bean, Object value); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfo.java b/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfo.java index 69429e449..0ff037f1c 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfo.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfo.java @@ -1,11 +1,10 @@ package com.avaje.ebeaninternal.server.properties; -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; +import com.avaje.ebean.bean.EntityBean; import javax.persistence.PersistenceException; - -import com.avaje.ebean.bean.EntityBean; +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; /** * A BeanReflect implementation based on the enhancement that creates EntityBean @@ -20,11 +19,10 @@ public final class EnhanceBeanPropertyInfo implements BeanPropertyInfo { public EnhanceBeanPropertyInfo(Class clazz) { try { if (Modifier.isAbstract(clazz.getModifiers())) { - this.constructor = null; + this.constructor = null; } else { this.constructor = defaultConstructor(clazz); } - } catch (Exception e) { throw new PersistenceException(e); } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfoFactory.java b/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfoFactory.java index d70911890..fe8fa1fec 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfoFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/EnhanceBeanPropertyInfoFactory.java @@ -1,13 +1,13 @@ package com.avaje.ebeaninternal.server.properties; /** - * Creates a BeanReflectFactory based on the enhancement that + * Creates a BeanReflectFactory based on the enhancement that * creates EntityBean implementations. */ public final class EnhanceBeanPropertyInfoFactory implements BeanPropertyInfoFactory { - public BeanPropertyInfo create(Class entityBeanType) { - return new EnhanceBeanPropertyInfo(entityBeanType); - } + public BeanPropertyInfo create(Class entityBeanType) { + return new EnhanceBeanPropertyInfo(entityBeanType); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/properties/package.html b/src/main/java/com/avaje/ebeaninternal/server/properties/package.html index 4c4321727..a0f5dda50 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/properties/package.html +++ b/src/main/java/com/avaje/ebeaninternal/server/properties/package.html @@ -1,15 +1,15 @@ - - Bean Reflection + + Bean Reflection Bean reflection Implementation

-Abstracts the bean property getter and setter methods. -Allows Code generation or reflection to be used. + Abstracts the bean property getter and setter methods. + Allows Code generation or reflection to be used.

- \ No newline at end of file +