Remove deprecated AnnotationBean, please refer #1485 for the new meth…

…od to replace. (#3232)
apache · Jan 15, 2019 · 3c38f20 · 3c38f20
1 parent 1e1a5ec
commit 3c38f20
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 352 deletions.
diff --git a/.../java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java b/.../java/org/apache/dubbo/config/spring/schema/CompatibleAnnotationBeanDefinitionParser.java
@@ -16,11 +16,9 @@
  */
 package org.apache.dubbo.config.spring.schema;
 
-import org.apache.dubbo.config.spring.AnnotationBean;
 import org.apache.dubbo.config.spring.beans.factory.annotation.CompatibleReferenceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.beans.factory.annotation.CompatibleServiceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.util.BeanRegistrar;
-
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -34,7 +32,7 @@
 import static org.springframework.util.StringUtils.trimArrayElements;
 
 /**
- * {@link AnnotationBean} {@link BeanDefinitionParser}
+ * {@link BeanDefinitionParser}
  *
  * @see CompatibleServiceAnnotationBeanPostProcessor
  * @see CompatibleReferenceAnnotationBeanPostProcessor

diff --git a/...nfig/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java b/...nfig/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java
diff --git a/...g/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java b/...g/src/main/java/org/apache/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java
@@ -16,7 +16,6 @@
  */
 package org.apache.dubbo.config.spring.schema;
 
-import org.apache.dubbo.config.spring.AnnotationBean;
 import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
 import org.apache.dubbo.config.spring.util.BeanRegistrar;
@@ -26,15 +25,14 @@
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 import static org.springframework.util.StringUtils.commaDelimitedListToStringArray;
 import static org.springframework.util.StringUtils.trimArrayElements;
 
 /**
- * {@link AnnotationBean} {@link BeanDefinitionParser}
+ * @link BeanDefinitionParser}
  *
  * @see ServiceAnnotationBeanPostProcessor
  * @see ReferenceAnnotationBeanPostProcessor

diff --git a/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd b/dubbo-config/dubbo-config-spring/src/main/resources/META-INF/compat/dubbo.xsd
@@ -1310,31 +1310,6 @@
         </xsd:complexContent>
     </xsd:complexType>
 
-    <xsd:complexType name="annotationType">
-        <xsd:attribute name="id" type="xsd:ID">
-            <xsd:annotation>
-                <xsd:documentation><![CDATA[ The unique identifier for a bean. ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-        <xsd:attribute name="package" type="xsd:string">
-            <xsd:annotation>
-                <xsd:documentation><![CDATA[ The scan package. ]]></xsd:documentation>
-            </xsd:annotation>
-        </xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:element name="annotation" type="annotationType">
-        <xsd:annotation>
-            <xsd:documentation><![CDATA[ The annotation config ]]></xsd:documentation>
-            <xsd:appinfo>
-                <tool:annotation>
-                    <tool:exports type="org.apache.dubbo.config.ServiceConfig"/>
-                    <tool:exports type="org.apache.dubbo.config.ReferenceConfig"/>
-                </tool:annotation>
-            </xsd:appinfo>
-        </xsd:annotation>
-    </xsd:element>
-
     <xsd:element name="application" type="applicationType">
         <xsd:annotation>
             <xsd:documentation><![CDATA[ The application config ]]></xsd:documentation>