Author: simonetripodi
Date: Tue Nov 6 11:48:36 2012
New Revision: 1406102
URL: http://svn.apache.org/viewvc?rev=1406102&view=rev
Log:
[DIGESTER-174] Inner List Annotation has wrong @Target for most of the
predefined annotation rules
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
commons/proper/digester/trunk/src/changes/changes.xml
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/BeanPropertySetter.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Fields annotated with {@code BeanPropertySetter} will be bound with {@code
BeanPropertySetterRule} digester rule.
- *
+ *
* @see
org.apache.commons.digester3.Digester#addBeanPropertySetter(String,String)
* @since 2.1
*/
@@ -57,12 +57,12 @@ public @interface BeanPropertySetter
/**
* Defines several {@code @BeanPropertySetter} annotations on the same
element.
- *
+ *
* @see BeanPropertySetter
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.FIELD )
@DigesterRuleList
@interface List
{
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallMethod.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Methods annotated with {@code CallMethod} will be bound with {@code
CallMethodRule} digester rule.
- *
+ *
* @see
org.apache.commons.digester3.Digester#addCallMethod(String,String,int,Class[])
* @since 2.1
*/
@@ -62,12 +62,12 @@ public @interface CallMethod
/**
* Defines several {@code @CallMethod} annotations on the same element.
- *
+ *
* @see CallMethod
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.METHOD )
@DigesterRuleList
@interface List
{
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/CallParam.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Methods arguments annotated with {@code CallParam} will be bound with
{@code CallParamRule} digester rule.
- *
+ *
* @see org.apache.commons.digester3.Digester#addCallParam(String,int)
* @since 2.1
*/
@@ -78,12 +78,12 @@ public @interface CallParam
/**
* Defines several {@code @CallParam} annotations on the same element.
- *
+ *
* @see CallParam
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.PARAMETER )
@DigesterRuleList
@interface List
{
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/PathCallParam.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Methods arguments annotated with {@code PathCallParam} will be bound with
{@code PathCallParamRule} digester rule.
- *
+ *
* @see org.apache.commons.digester3.Digester#addCallParamPath(String,int)
* @since 2.1
*/
@@ -57,12 +57,12 @@ public @interface PathCallParam
/**
* Defines several {@code @PathCallParam} annotations on the same element.
- *
+ *
* @see PathCallParam
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.PARAMETER )
@DigesterRuleList
@interface List
{
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetProperty.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Fields annotated with {@code SetProperty} will be bound with {@code
SetPropertiesRule} digester rule.
- *
+ *
* @see
org.apache.commons.digester3.Digester#addSetProperties(String,String[],String[])
* @since 2.1
*/
@@ -62,12 +62,12 @@ public @interface SetProperty
/**
* Defines several {@code @SetProperty} annotations on the same element.
- *
+ *
* @see SetProperty
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.FIELD )
@DigesterRuleList
@interface List
{
Modified:
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
---
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
(original)
+++
commons/proper/digester/trunk/core/src/main/java/org/apache/commons/digester3/annotations/rules/SetTop.java
Tue Nov 6 11:48:36 2012
@@ -32,7 +32,7 @@ import org.apache.commons.digester3.anno
/**
* Methods annotated with {@code SetTop} will be bound with {@code SetTopRule}
digester rule.
- *
+ *
* @see org.apache.commons.digester3.Digester#addSetTop(String,String,String)
* @since 2.1
*/
@@ -62,12 +62,12 @@ public @interface SetTop
/**
* Defines several {@code @SetTop} annotations on the same element
- *
+ *
* @see SetTop
*/
@Documented
@Retention( RetentionPolicy.RUNTIME )
- @Target( ElementType.TYPE )
+ @Target( ElementType.METHOD )
@DigesterRuleList
@interface List
{
Modified: commons/proper/digester/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/changes/changes.xml?rev=1406102&r1=1406101&r2=1406102&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/changes/changes.xml (original)
+++ commons/proper/digester/trunk/src/changes/changes.xml Tue Nov 6 11:48:36
2012
@@ -23,6 +23,9 @@
</properties>
<body>
<release version="3.3" date="201?-??-??" description="Maintenance release.">
+ <action dev="simonetripodi" type="fix" issue="DIGESTER-174"
due-to="Andreas Sahlbach">
+ Inner List Annotation has wrong @Target for most of the predefined
annotation rules
+ </action>
<action dev="simonetripodi" type="fix" issue="DIGESTER-170" due-to="Dale
Wijnand">
Digester.pop(String) throws EmptyStackException where API doc says it
returns null
</action>
