From d2ae044d1f7065235d78bb6237b7556841df4876 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 26 Apr 2016 21:35:57 +1200
Subject: [PATCH] #665 - Remove deprecated @DocStoreEmbedded ... should migrate
 to @DocEmbedded

---
 .../ebean/annotation/DocStoreEmbedded.java    | 21 -------------------
 .../server/deploy/parse/AnnotationFields.java |  4 ----
 .../com/avaje/tests/model/basic/Order.java    |  3 +--
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 src/main/java/com/avaje/ebean/annotation/DocStoreEmbedded.java

diff --git a/src/main/java/com/avaje/ebean/annotation/DocStoreEmbedded.java b/src/main/java/com/avaje/ebean/annotation/DocStoreEmbedded.java
deleted file mode 100644
index 09fefda06..000000000
--- a/src/main/java/com/avaje/ebean/annotation/DocStoreEmbedded.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.avaje.ebean.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Deprecated in favor of @DocEmbedded (i.e. renamed to @DocEmbedded)
- */
-@Target({ ElementType.FIELD })
-@Retention(RetentionPolicy.RUNTIME)
-@Deprecated
-public @interface DocStoreEmbedded {
-
-  /**
-   * The properties on the embedded bean to include in the index.
-   */
-  String doc() default "";
-
-}
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java
index 4a5810bea..978fa0694 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -95,10 +95,6 @@ public class AnnotationFields extends AnnotationParser {
     if (docEmbedded != null) {
       prop.setDocStoreEmbedded(docEmbedded.doc());
     }
-    DocStoreEmbedded docStoreEmbedded = get(prop, DocStoreEmbedded.class);
-    if (docStoreEmbedded != null) {
-      prop.setDocStoreEmbedded(docStoreEmbedded.doc());
-    }
 
     if (prop instanceof DeployBeanPropertyAssocOne<?>) {
       if (prop.isId() && !prop.isEmbedded()) {
diff --git a/src/test/java/com/avaje/tests/model/basic/Order.java b/src/test/java/com/avaje/tests/model/basic/Order.java
index 4e63d9780..33ac9f33b 100644
--- a/src/test/java/com/avaje/tests/model/basic/Order.java
+++ b/src/test/java/com/avaje/tests/model/basic/Order.java
@@ -3,7 +3,6 @@ package com.avaje.tests.model.basic;
 import com.avaje.ebean.annotation.ChangeLog;
 import com.avaje.ebean.annotation.DocEmbedded;
 import com.avaje.ebean.annotation.DocStore;
-import com.avaje.ebean.annotation.DocStoreEmbedded;
 import com.avaje.ebean.annotation.Formula;
 import com.avaje.ebean.annotation.WhenCreated;
 import com.avaje.ebean.annotation.Where;
@@ -102,7 +101,7 @@ public class Order implements Serializable {
   @Where(clause = "${ta}.id > 0")
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "order")
   @OrderBy("id asc, orderQty asc, cretime desc")
-  @DocStoreEmbedded
+  @DocEmbedded
   List<OrderDetail> details;
 
   @OneToMany(cascade = CascadeType.ALL, mappedBy = "order")