diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index 331b70cad..55e7c146b 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -32,15 +32,7 @@ public interface BeanDocType { /** * Return the FetchPath for the embedded document. */ - default FetchPath embedded(String path) { - return getEmbedded(path); - } - - /** - * Deprecated migrate to embedded(). - */ - @Deprecated - FetchPath getEmbedded(String path); + FetchPath embedded(String path); /** * For embedded 'many' properties we need a FetchPath relative to the root which is used to diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java index e7f324a56..762f077f4 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -22,53 +22,21 @@ public interface BeanType { */ String name(); - /** - * Deprecated migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } - /** * Return the full name of the bean type. */ String fullName(); - /** - * Deprecated migrate to fullName(). - */ - @Deprecated - default String getFullName() { - return fullName(); - } - /** * Return the class type this BeanDescriptor describes. */ Class type(); - /** - * Deprecated migrate to type(). - */ - @Deprecated - default Class getBeanType() { - return type(); - } - /** * Return the type bean for an OneToMany or ManyToOne or ManyToMany property. */ BeanType beanTypeAtPath(String propertyName); - /** - * Deprecated migrate to beanTypeAtPath(). - */ - @Deprecated - default BeanType getBeanTypeAtPath(String propertyName) { - return beanTypeAtPath(propertyName); - } - /** * Return all the properties for this bean type. */ @@ -79,53 +47,21 @@ public interface BeanType { */ Property idProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getIdProperty() { - return idProperty(); - } - /** * Return the when modified property if there is one defined. */ Property whenModifiedProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getWhenModifiedProperty() { - return whenModifiedProperty(); - } - /** * Return the when created property if there is one defined. */ Property whenCreatedProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getWhenCreatedProperty() { - return whenCreatedProperty(); - } - /** * Return the Property to read values from a bean. */ Property property(String propertyName); - /** - * Deprecated migrate to property(). - */ - @Deprecated - default Property getProperty(String propertyName) { - return property(propertyName); - } - /** * Return the ExpressionPath for a given property path. *

@@ -134,14 +70,6 @@ public interface BeanType { */ ExpressionPath expressionPath(String path); - /** - * Deprecated migrate to expressionPath(). - */ - @Deprecated - default ExpressionPath getExpressionPath(String path) { - return expressionPath(path); - } - /** * Return true if the property is a valid known property or path for the given bean type. */ @@ -177,14 +105,6 @@ public interface BeanType { */ String baseTable(); - /** - * Deprecated migrate to baseTable(). - */ - @Deprecated - default String getBaseTable() { - return baseTable(); - } - /** * Create a new instance of the bean. */ @@ -195,98 +115,36 @@ public interface BeanType { */ Object id(Object bean); - /** - * Deprecated migrate to id() - */ - @Deprecated - default Object beanId(Object bean) { - return id(bean); - } - - /** - * Deprecated migrate to id() - */ - @Deprecated - Object getBeanId(T bean); - /** * Set the id value to the bean. */ void setId(T bean, Object idValue); - /** - * Deprecated migrate to setId() - */ - @Deprecated - default void setBeanId(T bean, Object idValue) { - setId(bean, idValue); - } - /** * Return the bean persist controller. */ BeanPersistController persistController(); - /** - * Deprecated migrate to persistController() - */ - @Deprecated - default BeanPersistController getPersistController() { - return persistController(); - } - /** * Return the bean persist listener. */ BeanPersistListener persistListener(); - /** - * Deprecated migrate to persistListener() - */ - @Deprecated - default BeanPersistListener getPersistListener() { - return persistListener(); - } - /** * Return the beanFinder. Usually null unless overriding the finder. */ BeanFindController findController(); - /** - * Deprecated migrate to findController() - */ - @Deprecated - default BeanFindController getFindController() { - return findController(); - } - /** * Return the BeanQueryAdapter or null if none is defined. */ BeanQueryAdapter queryAdapter(); - /** - * Deprecated migrate to queryAdapter() - */ - @Deprecated - default BeanQueryAdapter getQueryAdapter() { - return queryAdapter(); - } - /** * Return the identity generation type. */ IdType idType(); - /** - * Deprecated migrate to idType() - */ - @Deprecated - default IdType getIdType() { - return idType(); - } - /** * Return true if this bean type has doc store backing. */ @@ -301,27 +159,11 @@ public interface BeanType { */ DocMapping docMapping(); - /** - * Deprecated migrate to docMapping() - */ - @Deprecated - default DocMapping getDocMapping() { - return docMapping(); - } - /** * Return the doc store queueId for this bean type. */ String docStoreQueueId(); - /** - * Deprecated migrate to docStoreQueueId() - */ - @Deprecated - default String getDocStoreQueueId() { - return docStoreQueueId(); - } - /** * Return the doc store support for this bean type.\ */ @@ -353,27 +195,11 @@ public interface BeanType { */ List> inheritanceChildren(); - /** - * Deprecated migrate to inheritanceChildren() - */ - @Deprecated - default List> getInheritanceChildren() { - return inheritanceChildren(); - } - /** * Returns the parent in inheritance hierarchy */ BeanType inheritanceParent(); - /** - * Deprecated migrate to inheritanceParent() - */ - @Deprecated - default BeanType getInheritanceParent() { - return inheritanceParent(); - } - /** * Visit all children recursively */ @@ -384,14 +210,6 @@ public interface BeanType { */ String discColumn(); - /** - * Deprecated migrate to discColumn() - */ - @Deprecated - default String getDiscColumn() { - return discColumn(); - } - /** * Create a bean given the discriminator value. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index d7a5f5ff5..4974f221c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -2106,10 +2106,10 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return getId((EntityBean) bean); } - @Override - public Object getBeanId(T bean) { - return getId((EntityBean) bean); - } +// @Override +// public Object beanId(T bean) { +// return getId((EntityBean) bean); +// } /** * Return the Id value for the bean with embeddedId beans converted into maps. @@ -2673,7 +2673,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public PartitionMeta partitionMeta() { return partitionMeta; } - + /** * Return the tablespace details of the bean. */ diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index dead8c43c..626daf1b4 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -266,7 +266,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public FetchPath getEmbedded(String path) { + public FetchPath embedded(String path) { return docStructure.getEmbedded(path); }