From 10f0ea9baeada12b7b23dd4d5babc7c5622eaf9e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 2 Jul 2014 23:10:53 +1200 Subject: [PATCH] No effective change - code format and tidy up --- .../api/SpiExpressionFactory.java | 11 ++-- .../deploy/BeanPropertySimpleCollection.java | 18 +++---- .../server/deploy/id/ImportedIdEmbedded.java | 7 ++- .../DeployBeanPropertySimpleCollection.java | 48 +++++++---------- .../server/deploy/parse/AnnotationSql.java | 53 +++++++++---------- .../deploy/parse/DeployCreateProperties.java | 2 +- 6 files changed, 60 insertions(+), 79 deletions(-) diff --git a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java b/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java index 57cdc0726..68dcae25c 100644 --- a/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/api/SpiExpressionFactory.java @@ -1,13 +1,12 @@ package com.avaje.ebeaninternal.api; import com.avaje.ebean.ExpressionFactory; -import com.avaje.ebeaninternal.server.expression.FilterExprPath; public interface SpiExpressionFactory extends ExpressionFactory { - /** - * Create another expression factory with a given sub path. - */ - public ExpressionFactory createExpressionFactory();//FilterExprPath prefix); - + /** + * Create another expression factory with a given sub path. + */ + public ExpressionFactory createExpressionFactory(); + } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java index 44c8f072f..5572c58cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java @@ -1,19 +1,15 @@ package com.avaje.ebeaninternal.server.deploy; import com.avaje.ebeaninternal.server.deploy.meta.DeployBeanPropertySimpleCollection; -import com.avaje.ebeaninternal.server.type.ScalarType; public class BeanPropertySimpleCollection extends BeanPropertyAssocMany { - private final ScalarType collectionScalarType; - - public BeanPropertySimpleCollection(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertySimpleCollection deploy) { - super(owner, descriptor, deploy); - this.collectionScalarType = deploy.getCollectionScalarType(); - } + public BeanPropertySimpleCollection(BeanDescriptorMap owner, BeanDescriptor descriptor, DeployBeanPropertySimpleCollection deploy) { + super(owner, descriptor, deploy); + } + + public void initialise() { + super.initialise(); + } - public void initialise() { - super.initialise(); - } - } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index 59d263dd8..897c4dedc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -13,18 +13,17 @@ import com.avaje.ebeaninternal.server.deploy.DbSqlContext; import com.avaje.ebeaninternal.server.deploy.IntersectionRow; import com.avaje.ebeaninternal.server.persist.dml.GenerateDmlRequest; import com.avaje.ebeaninternal.server.persist.dmlbind.BindableRequest; -import com.avaje.ebeaninternal.util.ValueUtil; /** * Imported Embedded id. */ public class ImportedIdEmbedded implements ImportedId { - final BeanPropertyAssoc owner; + private final BeanPropertyAssoc owner; - final BeanPropertyAssocOne foreignAssocOne; + private final BeanPropertyAssocOne foreignAssocOne; - final ImportedIdSimple[] imported; + private final ImportedIdSimple[] imported; public ImportedIdEmbedded(BeanPropertyAssoc owner, BeanPropertyAssocOne foreignAssocOne, ImportedIdSimple[] imported) { this.owner = owner; diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java index 52be73af4..9382e82a6 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanPropertySimpleCollection.java @@ -2,40 +2,28 @@ package com.avaje.ebeaninternal.server.deploy.meta; import com.avaje.ebean.bean.BeanCollection.ModifyListenMode; import com.avaje.ebeaninternal.server.deploy.ManyType; -import com.avaje.ebeaninternal.server.type.ScalarType; public class DeployBeanPropertySimpleCollection extends DeployBeanPropertyAssocMany { - private final ScalarType collectionScalarType; - - public DeployBeanPropertySimpleCollection(DeployBeanDescriptor desc, Class targetType, ScalarType scalarType, ManyType manyType) { - super(desc, targetType, manyType); - this.collectionScalarType = scalarType; - this.modifyListenMode = ModifyListenMode.ALL; - } + public DeployBeanPropertySimpleCollection(DeployBeanDescriptor desc, Class targetType, ManyType manyType) { + super(desc, targetType, manyType); + this.modifyListenMode = ModifyListenMode.ALL; + } - /** - * Return the scalarType of the collection elements. - */ - public ScalarType getCollectionScalarType() { - return collectionScalarType; - } + /** + * Returns false as never a ManyToMany. + */ + @Override + public boolean isManyToMany() { + return false; + } - /** - * Returns false as never a ManyToMany. - */ - @Override - public boolean isManyToMany() { - return false; - } + /** + * Returns true as always Unidirectional. + */ + @Override + public boolean isUnidirectional() { + return true; + } - /** - * Returns true as always Unidirectional. - */ - @Override - public boolean isUnidirectional() { - return true; - } - - } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java index 660503e34..555717898 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationSql.java @@ -9,34 +9,33 @@ import com.avaje.ebeaninternal.server.deploy.DRawSqlMeta; */ public class AnnotationSql extends AnnotationParser { - public AnnotationSql(DeployBeanInfo info) { - super(info); - } + public AnnotationSql(DeployBeanInfo info) { + super(info); + } - public void parse() { - Class cls = descriptor.getBeanType(); - Sql sql = cls.getAnnotation(Sql.class); - if (sql != null){ - setSql(sql); - } - - - SqlSelect sqlSelect = cls.getAnnotation(SqlSelect.class); - if (sqlSelect != null){ - setSqlSelect(sqlSelect); - } - } - - private void setSql(Sql sql) { - SqlSelect[] select = sql.select(); - for (int i = 0; i < select.length; i++) { - setSqlSelect(select[i]); - } - } + public void parse() { + Class cls = descriptor.getBeanType(); + Sql sql = cls.getAnnotation(Sql.class); + if (sql != null) { + setSql(sql); + } - private void setSqlSelect(SqlSelect sqlSelect) { + SqlSelect sqlSelect = cls.getAnnotation(SqlSelect.class); + if (sqlSelect != null) { + setSqlSelect(sqlSelect); + } + } - DRawSqlMeta rawSqlMeta = new DRawSqlMeta(sqlSelect); - descriptor.add(rawSqlMeta); - } + private void setSql(Sql sql) { + SqlSelect[] select = sql.select(); + for (int i = 0; i < select.length; i++) { + setSqlSelect(select[i]); + } + } + + private void setSqlSelect(SqlSelect sqlSelect) { + + DRawSqlMeta rawSqlMeta = new DRawSqlMeta(sqlSelect); + descriptor.add(rawSqlMeta); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index ebf869e0d..7f66f50cc 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -264,7 +264,7 @@ public class DeployCreateProperties { try { ScalarType scalarType = typeManager.getScalarType(targetType); if (scalarType != null) { - return new DeployBeanPropertySimpleCollection(desc, targetType, scalarType, manyType); + return new DeployBeanPropertySimpleCollection(desc, targetType, manyType); } } catch (NullPointerException e) { logger.debug("expected non-scalar type" + e.getMessage());