diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index b992a954f..5aaf91fc4 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -219,34 +219,6 @@ public class DeployBeanDescriptor { return beanTable; } - /** - * Check all the properties to see if they all have read and write methods - * (required if using "subclassing" but not for "enhancement"). - */ - public boolean checkReadAndWriteMethods() { - - boolean missingMethods = false; - - for (DeployBeanProperty prop : propMap.values()) { - if (!prop.isTransient()) { - String m = ""; - if (prop.getReadMethod() == null) { - m += " missing readMethod "; - } - if (prop.getWriteMethod() == null) { - m += " missing writeMethod "; - } - if (!"".equals(m)) { - m += ". Should it be transient?"; - String msg = "Bean property " + getFullName() + "." + prop.getName() + " has " + m; - logger.error(msg); - missingMethods = true; - } - } - } - return !missingMethods; - } - public void setEntityType(EntityType entityType) { this.entityType = entityType; } diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index ba07c55bc..631ab7c8e 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -195,11 +195,6 @@ public class DeployBeanProperty { */ private Method readMethod; - /** - * The method used to write the property. - */ - private Method writeMethod; - private int propertyIndex; private BeanPropertyGetter getter; @@ -454,13 +449,6 @@ public class DeployBeanProperty { return readMethod; } - /** - * Return the setter method. - */ - public Method getWriteMethod() { - return writeMethod; - } - /** * Set to the owning type form a Inheritance heirarchy. */ @@ -850,17 +838,6 @@ public class DeployBeanProperty { this.readMethod = readMethod; } - /** - * Set the bean write method. - *

- * NB: That a BeanReflectSetter is used to actually perform the setting of - * property values to a bean. This is due to performance considerations. - *

- */ - public void setWriteMethod(Method writeMethod) { - this.writeMethod = writeMethod; - } - /** * Return the property type. */ 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 a8438eb5a..5f320313a 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 @@ -56,20 +56,6 @@ public class DeployCreateProperties { createProperties(desc, desc.getBeanType(), 0); desc.sortProperties(); - - // check the transient properties... - for (DeployBeanProperty prop : desc.propertiesAll()) { - if (prop.isTransient()) { - if (prop.getWriteMethod() == null || prop.getReadMethod() == null) { - // Typically a helper method ... this is expected - logger.trace("... transient: " + prop.getFullBeanName()); - } else { - // dubious, possible error... - String msg = Message.msg("deploy.property.nofield", desc.getFullName(), prop.getName()); - logger.warn(msg); - } - } - } } /** @@ -123,13 +109,9 @@ public class DeployCreateProperties { String initFieldName = initCap(fieldName); Method getter = findGetter(field, initFieldName, declaredMethods, scalaObject); - Method setter = findSetter(field, initFieldName, declaredMethods, scalaObject); - DeployBeanProperty prop = createProp(desc, field, beanType, getter, setter); - if (prop == null) { - // transient annotation on unsupported type - - } else { + DeployBeanProperty prop = createProp(desc, field, beanType, getter); + if (prop != null) { // set a order that gives priority to inherited properties // push Id/EmbeddedId up and CreatedTimestamp/UpdatedTimestamp down int sortOverride = prop.getSortOverride(); @@ -264,7 +246,7 @@ public class DeployCreateProperties { return new DeployBeanPropertySimpleCollection(desc, targetType, manyType); } } catch (NullPointerException e) { - logger.debug("expected non-scalar type" + e.getMessage()); + logger.debug("expected non-scalar type {}", e.getMessage()); } // TODO: Handle Collection of CompoundType and Embedded Type return new DeployBeanPropertyAssocMany(desc, targetType, manyType); @@ -282,7 +264,6 @@ public class DeployCreateProperties { if (tt != null && !tt.equals(void.class)){ propertyType = tt; - logger.debug("target type" + tt); } } Class innerType = propertyType; @@ -372,8 +353,7 @@ public class DeployCreateProperties { return (t != null); } - private DeployBeanProperty createProp(DeployBeanDescriptor desc, Field field, Class beanType, - Method getter, Method setter) { + private DeployBeanProperty createProp(DeployBeanDescriptor desc, Field field, Class beanType, Method getter) { DeployBeanProperty prop = createProp(desc, field); if (prop == null) { @@ -383,11 +363,8 @@ public class DeployCreateProperties { prop.setOwningType(beanType); prop.setName(field.getName()); - // the getter or setter could be null if we are using - // javaagent type enhancement. If we are using subclass - // generation then we do need to find the getter and setter + // interested in the getter for reading annotations prop.setReadMethod(getter); - prop.setWriteMethod(setter); prop.setField(field); return prop; }