#1747 - Refactor tidy on AnnotationParser, DeployBeanInfo

src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -25,11 +25,11 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   protected final Class<?> beanType;
 
-  protected final boolean validationAnnotations;
+  final boolean validationAnnotations;
 
-  protected final ReadAnnotationConfig readConfig;
+  final ReadAnnotationConfig readConfig;
 
-  public AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
+  AnnotationParser(DeployBeanInfo<?> info, ReadAnnotationConfig readConfig) {
     super(info.getUtil());
     this.readConfig = readConfig;
     this.validationAnnotations = readConfig.isJavaxValidationAnnotations();
@@ -47,7 +47,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read the Id annotation on an embeddedId.
    */
-  protected void readIdAssocOne(DeployBeanPropertyAssoc<?> prop) {
+  void readIdAssocOne(DeployBeanPropertyAssoc<?> prop) {
     prop.setNullable(false);
     if (prop.isIdClass()) {
       prop.setImportedPrimaryKey();
@@ -61,7 +61,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read the Id annotation on scalar property.
    */
-  protected void readIdScalar(DeployBeanProperty prop) {
+  void readIdScalar(DeployBeanProperty prop) {
     prop.setNullable(false);
     if (prop.isIdClass()) {
       prop.setImportedPrimaryKey();
@@ -78,7 +78,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Helper method to set cascade types to the CascadeInfo on BeanProperty.
    */
-  protected void setCascadeTypes(CascadeType[] cascadeTypes, BeanCascadeInfo cascadeInfo) {
+  void setCascadeTypes(CascadeType[] cascadeTypes, BeanCascadeInfo cascadeInfo) {
     if (cascadeTypes != null && cascadeTypes.length > 0) {
       cascadeInfo.setTypes(cascadeTypes);
     }
@@ -87,7 +87,7 @@ public abstract class AnnotationParser extends AnnotationBase {
   /**
    * Read an AttributeOverrides if they exist for this embedded bean.
    */
-  protected void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
+  void readEmbeddedAttributeOverrides(DeployBeanPropertyAssocOne<?> prop) {
 
     Set<AttributeOverride> attrOverrides = getAll(prop, AttributeOverride.class);
     if (!attrOverrides.isEmpty()) {
@@ -100,7 +100,7 @@ public abstract class AnnotationParser extends AnnotationBase {
 
   }
 
-  protected void readColumn(Column columnAnn, DeployBeanProperty prop) {
+  void readColumn(Column columnAnn, DeployBeanProperty prop) {
 
     if (!isEmpty(columnAnn.name())) {
       String dbColumn = databasePlatform.convertQuotedIdentifiers(columnAnn.name());
@@ -132,14 +132,10 @@ public abstract class AnnotationParser extends AnnotationBase {
    * Return true if the validation groups are {@link Default} (respectively empty)
    * can be applied to DDL generation.
    */
-  protected boolean isEbeanValidationGroups(Class<?>[] groups) {
+  boolean isEbeanValidationGroups(Class<?>[] groups) {
     if (!util.isUseJavaxValidationNotNull()) {
       return false;
     }
-    if (groups.length == 0
-      || groups.length == 1 && javax.validation.groups.Default.class.isAssignableFrom(groups[0])) {
-      return true;
-    }
-    return false;
+    return groups.length == 0 || groups.length == 1 && Default.class.isAssignableFrom(groups[0]);
   }
 }

src/main/java/io/ebeaninternal/server/deploy/parse/DeployBeanInfo.java

@@ -4,22 +4,13 @@ import io.ebean.RawSql;
 import io.ebeaninternal.server.deploy.TableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
-import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
-import io.ebeaninternal.server.query.SqlJoinType;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
-import java.util.HashMap;
-
 /**
  * Wraps information about a bean during deployment parsing.
  */
 public class DeployBeanInfo<T> {
 
-  /**
-   * Holds TableJoins for secondary table properties.
-   */
-  private final HashMap<String, DeployTableJoin> tableJoinMap = new HashMap<>();
-
   private final DeployUtil util;
 
   private final DeployBeanDescriptor<T> descriptor;
@@ -53,25 +44,6 @@ public class DeployBeanInfo<T> {
     return util;
   }
 
-  /**
-   * Appropriate TableJoin for a property mapped to a secondary table.
-   */
-  public DeployTableJoin getTableJoin(String tableName) {
-
-    String key = tableName.toLowerCase();
-
-    DeployTableJoin tableJoin = tableJoinMap.get(key);
-    if (tableJoin == null) {
-      tableJoin = new DeployTableJoin();
-      tableJoin.setTable(tableName);
-      tableJoin.setType(SqlJoinType.INNER);
-      descriptor.addTableJoin(tableJoin);
-
-      tableJoinMap.put(key, tableJoin);
-    }
-    return tableJoin;
-  }
-
   /**
    * Add named RawSql from ebean.xml.
    */

src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java

@@ -138,7 +138,7 @@ public class DeployInheritInfo {
   /**
    * Set the sql type of the discriminator.
    */
-  public void setColumnType(DiscriminatorType type) {
+  void setColumnType(DiscriminatorType type) {
     if (type == DiscriminatorType.INTEGER) {
       this.columnType = Types.INTEGER;
     } else {

src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java

@@ -50,7 +50,7 @@ class ReadAnnotationConfig {
     return eagerFetchLobs;
   }
 
-  public boolean isIdGeneratorAutomatic() {
+  boolean isIdGeneratorAutomatic() {
     return idGeneratorAutomatic;
   }