Repository: struts Updated Branches: refs/heads/master d8284846d -> faf72b5a0
WW-4210 Extends annotation to allow use class instead of string Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/47552bdb Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47552bdb Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47552bdb Branch: refs/heads/master Commit: 47552bdb0673a88b0cd76cebc40f65477edd58d0 Parents: 293d2fd Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Thu Apr 20 08:28:46 2017 +0200 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Thu Apr 20 08:28:46 2017 +0200 ---------------------------------------------------------------------- .../xwork2/conversion/annotations/TypeConversion.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/47552bdb/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java index 6640659..db57573 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java @@ -15,6 +15,8 @@ */ package com.opensymphony.xwork2.conversion.annotations; +import com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -175,10 +177,21 @@ public @interface TypeConversion { * Note: This can not be used with ConversionRule.KEY_PROPERTY! * * @return class of the TypeConverter to be used as converter + * @deprecated user {@link #converterClass()} instead */ + @Deprecated String converter() default ""; /** + * The class of the TypeConverter to be used as converter. + * + * Note: This can not be used with ConversionRule.KEY_PROPERTY! + * + * @return class of the TypeConverter to be used as converter + */ + Class<?> converterClass() default XWorkBasicConverter.class; + + /** * If used with ConversionRule.KEY_PROPERTY specify a value here! * * Note: If you use ConversionType.APPLICATION, you can not set a value!
