This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 05d2cc86da8a3e1b0ecc654e8aeac1b913e0563e Author: James Bognar <[email protected]> AuthorDate: Mon May 11 17:33:52 2026 -0400 refactor(marshall): rename @BeanConfig/@BeanConfigAnnotation to @MarshalledConfig family - Rename BeanConfig.java → MarshalledConfig.java (annotation) - Rename BeanConfigAnnotation.java → MarshalledConfigAnnotation.java (applier) - Update all @ContextApply references, import statements, Javadoc @link tags, and annotation usages across BeanContext, BeanContextable, Context, BeanSession, AnnotationApplier, ContextSession, RestOp/Get/Post/Put/Patch/Options, BasicJson/Json5/JsonHtml/OpenApi/Universal/DefaultConfig, BasicRestOperations, and all test files - Rename BeanConfig_Test.java → MarshalledConfig_Test.java - Rename BeanConfigAnnotation_Test.java → MarshalledConfigAnnotation_Test.java - Rename BeanConfig_Swaps_Test.java → MarshalledConfig_Swaps_Test.java - Rename RestOp_BeanConfig_Test.java → RestOp_MarshalledConfig_Test.java - Update class/method names inside renamed test files Co-authored-by: Cursor <[email protected]> --- .../java/org/apache/juneau/AnnotationApplier.java | 16 +++---- .../main/java/org/apache/juneau/BeanContext.java | 48 ++++++++++----------- .../java/org/apache/juneau/BeanContextable.java | 50 +++++++++++----------- .../main/java/org/apache/juneau/BeanSession.java | 6 +-- .../src/main/java/org/apache/juneau/Context.java | 16 +++---- .../java/org/apache/juneau/ContextSession.java | 2 +- .../org/apache/juneau/annotation/Marshalled.java | 8 ++-- .../{BeanConfig.java => MarshalledConfig.java} | 12 +++--- ...tation.java => MarshalledConfigAnnotation.java} | 16 +++---- .../apache/juneau/annotation/MarshalledProp.java | 4 +- .../rest/config/BasicUniversalJenaConfig.java | 4 +- .../org/apache/juneau/rest/annotation/RestGet.java | 2 +- .../org/apache/juneau/rest/annotation/RestOp.java | 2 +- .../apache/juneau/rest/annotation/RestOptions.java | 2 +- .../apache/juneau/rest/annotation/RestPatch.java | 2 +- .../apache/juneau/rest/annotation/RestPost.java | 2 +- .../org/apache/juneau/rest/annotation/RestPut.java | 2 +- .../juneau/rest/config/BasicJson5Config.java | 4 +- .../apache/juneau/rest/config/BasicJsonConfig.java | 4 +- .../juneau/rest/config/BasicJsonHtmlConfig.java | 4 +- .../juneau/rest/config/BasicOpenApiConfig.java | 4 +- .../juneau/rest/config/BasicUniversalConfig.java | 4 +- .../apache/juneau/rest/config/DefaultConfig.java | 2 +- .../juneau/rest/servlet/BasicRestOperations.java | 2 +- .../java/org/apache/juneau/BasicBeans_Test.java | 2 +- .../java/org/apache/juneau/BeanMapErrors_Test.java | 2 +- ...Config_Test.java => MarshalledConfig_Test.java} | 2 +- ...t.java => MarshalledConfigAnnotation_Test.java} | 8 ++-- .../apache/juneau/annotation/Marshalled_Test.java | 10 ++--- ..._Test.java => MarshalledConfig_Swaps_Test.java} | 12 +++--- ...Test.java => RestOp_MarshalledConfig_Test.java} | 18 ++++---- .../client/RestClient_Config_Context_Test.java | 4 +- .../juneau/transforms/DefaultSwaps_Test.java | 16 +++---- 33 files changed, 146 insertions(+), 146 deletions(-) diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java index 621559ee88..ae07d78ad0 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java @@ -32,7 +32,7 @@ import org.apache.juneau.commons.utils.*; import org.apache.juneau.svl.*; /** - * Class used to add properties to a context builder (e.g. {@link BeanContext.Builder}) from an annotation (e.g. {@link BeanConfig}). + * Class used to add properties to a context builder (e.g. {@link BeanContext.Builder}) from an annotation (e.g. {@link MarshalledConfig}). * * <p> * Used by {@link Context.Builder#applyAnnotations(Class...)} and {@link Context.Builder#applyAnnotations(Object...)} to apply @@ -45,24 +45,24 @@ import org.apache.juneau.svl.*; * <jc>// The annotation applied to classes and methods.</jc> * <ja>@Target</ja>({METHOD,TYPE}) * <ja>@Retention</ja>(<jsf>RUNTIME</jsf>) - * <ja>@ContextApply</ja>(BeanConfigAnnotationApplier.<jk>class</jk>) - * <jk>public</jk> <jk>@interface </jk>BeanConfig { + * <ja>@ContextApply</ja>(MarshalledConfigAnnotationApplier.<jk>class</jk>) + * <jk>public</jk> <jk>@interface </jk>MarshalledConfig { * * String unsortedProperties() <jk>default</jk> <js>""</js>; * * } * * <jc>// The applier that applies the annotation to the bean context builder.</jc> - * <jk>public class</jk> BeanConfigAnnotationApplier <jk>extends</jk> AnnotationApplier<<ja>BeanConfig</ja>,BeanContext.Builder> { + * <jk>public class</jk> MarshalledConfigAnnotationApplier <jk>extends</jk> AnnotationApplier<<ja>MarshalledConfig</ja>,BeanContext.Builder> { * * <jc>// Required constructor. </jc> * <jk>public</jk> Applier(VarResolverSession <jv>vr</jv>) { - * <jk>super</jk>(BeanConfig.<jk>class</jk>, BeanContext.Builder.<jk>class</jk>, <jv>vr</jv>); + * <jk>super</jk>(MarshalledConfig.<jk>class</jk>, BeanContext.Builder.<jk>class</jk>, <jv>vr</jv>); * } * * <ja>@Override</ja> - * <jk>public void</jk> apply(AnnotationInfo<BeanConfig> <jv>annotationInfo</jv>, BeanContext.Builder <jv>builder</jv>) { - * <ja>BeanConfig</ja> <jv>beanConfig</jv> = <jv>annotationInfo</jv>.getAnnotation(); + * <jk>public void</jk> apply(AnnotationInfo<MarshalledConfig> <jv>annotationInfo</jv>, BeanContext.Builder <jv>builder</jv>) { + * <ja>MarshalledConfig</ja> <jv>beanConfig</jv> = <jv>annotationInfo</jv>.getAnnotation(); * * String <jv>unsortedProperties</jv> = <jv>beanConfig</jv>.unsortedProperties(); * <jk>if</jk> (! <jv>unsortedProperties</jv>.isEmpty()) @@ -71,7 +71,7 @@ import org.apache.juneau.svl.*; * } * * <jc>// An annotated class opting out of the default sorted behavior.</jc> - * <ja>@BeanConfig</ja>(unsortedProperties=<js>"true"</js>) + * <ja>@MarshalledConfig</ja>(unsortedProperties=<js>"true"</js>) * <jk>public class</jk> AnnotatedClass {} * * <jc>// Putting it together.</jc> diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java index 72d185ae92..34fd538d5d 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java @@ -439,7 +439,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanClassVisibility()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beanClassVisibility()} * </ul> * * @param value @@ -488,7 +488,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanConstructorVisibility()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beanConstructorVisibility()} * </ul> * * @param value @@ -610,8 +610,8 @@ public class BeanContext extends Context implements ConversionFinder { * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link org.apache.juneau.annotation.Marshalled#dictionary()} * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledProp#dictionary()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#dictionary()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#dictionary_replace()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#dictionary()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#dictionary_replace()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(ClassInfo...)} * </ul> * @@ -684,7 +684,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanFieldVisibility()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beanFieldVisibility()} * </ul> * * @param value @@ -780,7 +780,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanMapPutReturnsOldValue()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beanMapPutReturnsOldValue()} * </ul> * * @return This object. @@ -834,7 +834,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beanMethodVisibility()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beanMethodVisibility()} * </ul> * * @param value @@ -1595,7 +1595,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beansRequireDefaultConstructor()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beansRequireDefaultConstructor()} * </ul> * * @return This object. @@ -1652,7 +1652,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#beansRequireSerializable()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#beansRequireSerializable()} * </ul> * * @return This object. @@ -1865,7 +1865,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableBeansRequireSomeProperties()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#disableBeansRequireSomeProperties()} * </ul> * * @return This object. @@ -1916,7 +1916,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableIgnoreMissingSetters()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#disableIgnoreMissingSetters()} * </ul> * * @return This object. @@ -1964,7 +1964,7 @@ public class BeanContext extends Context implements ConversionFinder { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableIgnoreTransientFields()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#disableIgnoreTransientFields()} * </ul> * * @return This object. @@ -2009,7 +2009,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableIgnoreUnknownNullBeanProperties()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#disableIgnoreUnknownNullBeanProperties()} * </ul> * * @return This object. @@ -2038,7 +2038,7 @@ public class BeanContext extends Context implements ConversionFinder { * Otherwise, throws a {@link BeanRuntimeException}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#disableInterfaceProxies()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#disableInterfaceProxies()} * </ul> * * @return This object. @@ -2197,7 +2197,7 @@ public class BeanContext extends Context implements ConversionFinder { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link org.apache.juneau.annotation.Marshalled#findFluentSetters()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#findFluentSetters()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#findFluentSetters()} * </ul> * * @return This object. @@ -2327,7 +2327,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#ignoreInvocationExceptionsOnGetters()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#ignoreInvocationExceptionsOnGetters()} * </ul> * * @return This object. @@ -2374,7 +2374,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#ignoreInvocationExceptionsOnSetters()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#ignoreInvocationExceptionsOnSetters()} * </ul> * * @return This object. @@ -2419,7 +2419,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#ignoreUnknownBeanProperties()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#ignoreUnknownBeanProperties()} * </ul> * * @return This object. @@ -2446,7 +2446,7 @@ public class BeanContext extends Context implements ConversionFinder { * When enabled, unknown enum values will be set to <jk>null</jk> instead of throwing an exception. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#ignoreUnknownEnumValues()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#ignoreUnknownEnumValues()} * </ul> * * @return This object. @@ -2682,7 +2682,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#locale()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#locale()} * <li class='jm'>{@link org.apache.juneau.BeanSession.Builder#locale(Locale)} * </ul> * @@ -2725,7 +2725,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#mediaType()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#mediaType()} * <li class='jm'>{@link org.apache.juneau.BeanSession.Builder#mediaType(MediaType)} * </ul> * @@ -2806,7 +2806,7 @@ public class BeanContext extends Context implements ConversionFinder { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledIgnore} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#notBeanClasses()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#notBeanClasses()} * </ul> * * @param values @@ -3315,7 +3315,7 @@ public class BeanContext extends Context implements ConversionFinder { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#timeZone()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#timeZone()} * <li class='jm'>{@link org.apache.juneau.BeanSession.Builder#timeZone(TimeZone)} * </ul> * @@ -3475,7 +3475,7 @@ public class BeanContext extends Context implements ConversionFinder { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link org.apache.juneau.annotation.Marshalled#typePropertyName()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#typePropertyName()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#typePropertyName()} * </ul> * * @param value diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java index 5719e4b785..b314c431ee 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContextable.java @@ -171,7 +171,7 @@ public abstract class BeanContextable extends Context { * * <h5 class='section'>See Also:</h5> * <ul> - * <li class='ja'>{@link BeanConfig#beanClassVisibility()} + * <li class='ja'>{@link MarshalledConfig#beanClassVisibility()} * </ul> * * @param value @@ -220,7 +220,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beanConstructorVisibility()} + * <li class='ja'>{@link MarshalledConfig#beanConstructorVisibility()} * </ul> * * @param value @@ -371,8 +371,8 @@ public abstract class BeanContextable extends Context { * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Bean#dictionary()} * <li class='ja'>{@link MarshalledProp#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary_replace()} + * <li class='ja'>{@link MarshalledConfig#dictionary()} + * <li class='ja'>{@link MarshalledConfig#dictionary_replace()} * </ul> * * @param values @@ -430,7 +430,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beanFieldVisibility()} + * <li class='ja'>{@link MarshalledConfig#beanFieldVisibility()} * </ul> * * @param value @@ -525,7 +525,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beanMapPutReturnsOldValue()} + * <li class='ja'>{@link MarshalledConfig#beanMapPutReturnsOldValue()} * <li class='jm'>{@link BeanContext.Builder#beanMapPutReturnsOldValue()} * </ul> * @@ -570,7 +570,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beanMethodVisibility()} + * <li class='ja'>{@link MarshalledConfig#beanMethodVisibility()} * </ul> * * @param value @@ -1321,7 +1321,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beansRequireDefaultConstructor()} + * <li class='ja'>{@link MarshalledConfig#beansRequireDefaultConstructor()} * <li class='jm'>{@link BeanContext.Builder#beansRequireDefaultConstructor()} * </ul> * @@ -1369,7 +1369,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beansRequireSerializable()} + * <li class='ja'>{@link MarshalledConfig#beansRequireSerializable()} * <li class='jm'>{@link BeanContext.Builder#beansRequireSerializable()} * </ul> * @@ -1415,7 +1415,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#beansRequireSettersForGetters()} + * <li class='ja'>{@link MarshalledConfig#beansRequireSettersForGetters()} * <li class='jm'>{@link BeanContext.Builder#beansRequireSettersForGetters()} * </ul> * @@ -1525,7 +1525,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#disableBeansRequireSomeProperties()} + * <li class='ja'>{@link MarshalledConfig#disableBeansRequireSomeProperties()} * <li class='jm'>{@link BeanContext.Builder#disableBeansRequireSomeProperties()} * </ul> * @@ -1567,7 +1567,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#disableIgnoreMissingSetters()} + * <li class='ja'>{@link MarshalledConfig#disableIgnoreMissingSetters()} * <li class='jm'>{@link BeanContext.Builder#disableIgnoreMissingSetters()} * </ul> * @@ -1606,7 +1606,7 @@ public abstract class BeanContextable extends Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#disableIgnoreTransientFields()} + * <li class='ja'>{@link MarshalledConfig#disableIgnoreTransientFields()} * <li class='jm'>{@link BeanContext.Builder#disableIgnoreTransientFields()} * </ul> * @@ -1642,7 +1642,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#disableIgnoreUnknownNullBeanProperties()} + * <li class='ja'>{@link MarshalledConfig#disableIgnoreUnknownNullBeanProperties()} * <li class='jm'>{@link BeanContext.Builder#disableIgnoreUnknownNullBeanProperties()} * </ul> * @@ -1662,7 +1662,7 @@ public abstract class BeanContextable extends Context { * Otherwise, throws a {@link BeanRuntimeException}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#disableInterfaceProxies()} + * <li class='ja'>{@link MarshalledConfig#disableInterfaceProxies()} * <li class='jm'>{@link BeanContext.Builder#disableInterfaceProxies()} * </ul> * @@ -1814,7 +1814,7 @@ public abstract class BeanContextable extends Context { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Bean#findFluentSetters()} - * <li class='ja'>{@link BeanConfig#findFluentSetters()} + * <li class='ja'>{@link MarshalledConfig#findFluentSetters()} * <li class='jm'>{@link BeanContext.Builder#findFluentSetters()} * </ul> * @@ -1904,7 +1904,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#ignoreInvocationExceptionsOnGetters()} + * <li class='ja'>{@link MarshalledConfig#ignoreInvocationExceptionsOnGetters()} * <li class='jm'>{@link BeanContext.Builder#ignoreInvocationExceptionsOnGetters()} * </ul> * @@ -1942,7 +1942,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#ignoreInvocationExceptionsOnSetters()} + * <li class='ja'>{@link MarshalledConfig#ignoreInvocationExceptionsOnSetters()} * <li class='jm'>{@link BeanContext.Builder#ignoreInvocationExceptionsOnSetters()} * </ul> * @@ -1978,7 +1978,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#ignoreUnknownBeanProperties()} + * <li class='ja'>{@link MarshalledConfig#ignoreUnknownBeanProperties()} * <li class='jm'>{@link BeanContext.Builder#ignoreUnknownBeanProperties()} * </ul> * @@ -1996,7 +1996,7 @@ public abstract class BeanContextable extends Context { * When enabled, unknown enum values are set to <jk>null</jk> instead of throwing a parse exception. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#ignoreUnknownEnumValues()} + * <li class='ja'>{@link MarshalledConfig#ignoreUnknownEnumValues()} * <li class='jm'>{@link BeanContext.Builder#ignoreUnknownEnumValues()} * </ul> * @@ -2219,7 +2219,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#locale()} + * <li class='ja'>{@link MarshalledConfig#locale()} * <li class='jm'>{@link BeanContext.Builder#locale(Locale)} * <li class='jm'>{@link BeanSession.Builder#locale(Locale)} * </ul> @@ -2263,7 +2263,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#mediaType()} + * <li class='ja'>{@link MarshalledConfig#mediaType()} * <li class='jm'>{@link BeanContext.Builder#mediaType(MediaType)} * <li class='jm'>{@link BeanSession.Builder#mediaType(MediaType)} * </ul> @@ -2318,7 +2318,7 @@ public abstract class BeanContextable extends Context { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link MarshalledIgnore} - * <li class='ja'>{@link BeanConfig#notBeanClasses()} + * <li class='ja'>{@link MarshalledConfig#notBeanClasses()} * <li class='jf'>{@link BeanContext.Builder#notBeanClasses()} * </ul> * @@ -2752,7 +2752,7 @@ public abstract class BeanContextable extends Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#timeZone()} + * <li class='ja'>{@link MarshalledConfig#timeZone()} * <li class='jm'>{@link BeanContext.Builder#timeZone(TimeZone)} * <li class='jm'>{@link BeanSession.Builder#timeZone(TimeZone)} * </ul> @@ -2909,7 +2909,7 @@ public abstract class BeanContextable extends Context { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Bean#typePropertyName()} - * <li class='ja'>{@link BeanConfig#typePropertyName()} + * <li class='ja'>{@link MarshalledConfig#typePropertyName()} * <li class='jm'>{@link BeanContext.Builder#typePropertyName(String)} * </ul> * diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java index 77a2a82b2d..e44d8f4747 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java @@ -124,7 +124,7 @@ public class BeanSession extends ContextSession implements ConverterSession { * If not specified, defaults to {@link BeanContext.Builder#locale(Locale)}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#locale()} + * <li class='ja'>{@link MarshalledConfig#locale()} * <li class='jm'>{@link BeanContext.Builder#locale(Locale)} * </ul> * @@ -148,7 +148,7 @@ public class BeanSession extends ContextSession implements ConverterSession { * If not specified, defaults to {@link BeanContext.Builder#mediaType(MediaType)}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#mediaType()} + * <li class='ja'>{@link MarshalledConfig#mediaType()} * <li class='jm'>{@link BeanContext.Builder#mediaType(MediaType)} * </ul> * @@ -211,7 +211,7 @@ public class BeanSession extends ContextSession implements ConverterSession { * If not specified, defaults to {@link BeanContext.Builder#timeZone(TimeZone)}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#timeZone()} + * <li class='ja'>{@link MarshalledConfig#timeZone()} * <li class='jm'>{@link BeanContext.Builder#timeZone(TimeZone)} * </ul> * diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java index 1b4046a920..b525b165a4 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java @@ -177,10 +177,10 @@ public abstract class Context { * <ja>@Marshalled</ja>(properties=<js>"street,city,state"</js>) * <jk>public class</jk> A {...} * - * <jc>// Class with annotation applied via @BeanConfig</jc> + * <jc>// Class with annotation applied via @MarshalledConfig</jc> * <jk>public class</jk> B {...} * - * <jc>// Java REST method with @BeanConfig annotation.</jc> + * <jc>// Java REST method with @MarshalledConfig annotation.</jc> * <ja>@RestGet</ja>(...) * <ja>@Marshalled</ja>(on=<js>"B"</js>, properties=<js>"street,city,state"</js>) * <jk>public void</jk> doFoo() {...} @@ -323,7 +323,7 @@ public abstract class Context { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig} + * <li class='ja'>{@link MarshalledConfig} * </ul> * * @param values @@ -360,7 +360,7 @@ public abstract class Context { * <h5 class='section'>Example:</h5> * <p class='bjava'> * <jc>// A class annotated with a config annotation.</jc> - * <ja>@BeanConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) + * <ja>@MarshalledConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) * <jk>public class</jk> MyClass {...} * * <jc>// Find all annotations that themselves are annotated with @ContextPropertiesApply.</jc> @@ -405,7 +405,7 @@ public abstract class Context { * Any annotations found that themselves are annotated with {@link ContextApply} will be resolved and * applied as properties to this builder. These annotations include: * <ul class='javatreec'> - * <li class='ja'>{@link BeanConfig} + * <li class='ja'>{@link MarshalledConfig} * <li class='ja'>{@link BsonConfig} * <li class='ja'>{@link CborConfig} * <li class='ja'>{@link CsvConfig} @@ -460,7 +460,7 @@ public abstract class Context { * <h5 class='section'>Example:</h5> * <p class='bjava'> * <jc>// A class annotated with a config annotation.</jc> - * <ja>@BeanConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) + * <ja>@MarshalledConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) * <jk>public class</jk> MyClass {...} * * <jc>// Apply any settings found on the annotations.</jc> @@ -471,7 +471,7 @@ public abstract class Context { * * <jc>// A method annotated with a config annotation.</jc> * <jk>public class</jk> MyClass { - * <ja>@BeanConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) + * <ja>@MarshalledConfig</ja>(unsortedProperties=<js>"$S{unsortedProperties,false}"</js>) * <jk>public void</jk> myMethod() {...} * } * @@ -657,7 +657,7 @@ public abstract class Context { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#debug()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#debug()} * <li class='jm'>{@link org.apache.juneau.ContextSession.Builder#debug(Boolean)} * </ul> * diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java index 151cf03d6f..853590397f 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ContextSession.java @@ -127,7 +127,7 @@ public abstract class ContextSession { * If not specified, defaults to {@link Context.Builder#debug()}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#debug()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#debug()} * <li class='jm'>{@link org.apache.juneau.Context.Builder#debug()} * * @param value diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java index ecb45f35b4..cb363df6f6 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Marshalled.java @@ -79,8 +79,8 @@ public @interface Marshalled { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link MarshalledProp#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary_replace()} + * <li class='ja'>{@link MarshalledConfig#dictionary()} + * <li class='ja'>{@link MarshalledConfig#dictionary_replace()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)} * </ul> * @@ -206,7 +206,7 @@ public @interface Marshalled { * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#findFluentSetters()} + * <li class='ja'>{@link MarshalledConfig#findFluentSetters()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#findFluentSetters()} * </ul> * @@ -445,7 +445,7 @@ public @interface Marshalled { * </p> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link BeanConfig#typePropertyName()} + * <li class='ja'>{@link MarshalledConfig#typePropertyName()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#typePropertyName(String)} * </ul> * diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfig.java similarity index 98% rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfig.java index 6a012fa21e..361905f3a5 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfig.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfig.java @@ -33,17 +33,17 @@ import org.apache.juneau.swap.*; * Annotation for specifying config properties defined in {@link BeanContext} and {@link BeanTraverseContext}. * * <p> - * Used primarily for specifying bean configuration properties on REST classes and methods. + * Used primarily for specifying marshalling configuration properties on REST classes and methods. * */ @Target({ TYPE, METHOD }) @Retention(RUNTIME) @Inherited -@ContextApply(BeanConfigAnnotation.Applier.class) +@ContextApply(MarshalledConfigAnnotation.Applier.class) @SuppressWarnings({ "java:S100" // Annotation methods use underscore suffix to avoid Java keyword conflicts }) -public @interface BeanConfig { +public @interface MarshalledConfig { /** * Minimum bean class visibility. @@ -332,7 +332,7 @@ public @interface BeanConfig { * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Bean#dictionary()} * <li class='ja'>{@link MarshalledProp#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary_replace()} + * <li class='ja'>{@link MarshalledConfig#dictionary_replace()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)} * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/BeanDictionaryBasics";>Bean Dictionary Basics</a> * </ul> @@ -350,7 +350,7 @@ public @interface BeanConfig { * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Bean#dictionary()} * <li class='ja'>{@link MarshalledProp#dictionary()} - * <li class='ja'>{@link BeanConfig#dictionary()} + * <li class='ja'>{@link MarshalledConfig#dictionary()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)} * </ul> * @@ -635,7 +635,7 @@ public @interface BeanConfig { * } * * <jc>// Apply it to a config</jc> - * <ja>@BeanConfig</ja>( + * <ja>@MarshalledConfig</ja>( * interfaces={ * A.<jk>class</jk> * } diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfigAnnotation.java similarity index 88% rename from juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java rename to juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfigAnnotation.java index 0223cdb48e..ddb48f8fc2 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledConfigAnnotation.java @@ -26,20 +26,20 @@ import org.apache.juneau.commons.reflect.*; import org.apache.juneau.svl.*; /** - * Utility classes and methods for the {@link BeanConfig @BeanConfig} annotation. + * Utility classes and methods for the {@link MarshalledConfig @MarshalledConfig} annotation. * */ -public class BeanConfigAnnotation { +public class MarshalledConfigAnnotation { /** * Prevents instantiation. */ - private BeanConfigAnnotation() {} + private MarshalledConfigAnnotation() {} /** - * Applies {@link BeanConfig} annotations to a {@link org.apache.juneau.BeanContext.Builder}. + * Applies {@link MarshalledConfig} annotations to a {@link org.apache.juneau.BeanContext.Builder}. */ - public static class Applier extends AnnotationApplier<BeanConfig,BeanContext.Builder> { + public static class Applier extends AnnotationApplier<MarshalledConfig,BeanContext.Builder> { /** * Constructor. @@ -47,12 +47,12 @@ public class BeanConfigAnnotation { * @param vr The resolver for resolving values in annotations. */ public Applier(VarResolverSession vr) { - super(BeanConfig.class, BeanContext.Builder.class, vr); + super(MarshalledConfig.class, BeanContext.Builder.class, vr); } @Override - public void apply(AnnotationInfo<BeanConfig> ai, BeanContext.Builder b) { - BeanConfig a = ai.inner(); + public void apply(AnnotationInfo<MarshalledConfig> ai, BeanContext.Builder b) { + MarshalledConfig a = ai.inner(); // @formatter:off string(a.beanClassVisibility()).map(Visibility::valueOf).ifPresent(b::beanClassVisibility); diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledProp.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledProp.java index ddf8812c9b..36be654be5 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledProp.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/MarshalledProp.java @@ -64,8 +64,8 @@ public @interface MarshalledProp { * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link org.apache.juneau.annotation.Marshalled#dictionary()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#dictionary()} - * <li class='ja'>{@link org.apache.juneau.annotation.BeanConfig#dictionary_replace()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#dictionary()} + * <li class='ja'>{@link org.apache.juneau.annotation.MarshalledConfig#dictionary_replace()} * <li class='jm'>{@link org.apache.juneau.BeanContext.Builder#beanDictionary(Class...)} * </ul> * diff --git a/juneau-rest/juneau-rest-server-rdf/src/main/java/org/apache/juneau/rest/config/BasicUniversalJenaConfig.java b/juneau-rest/juneau-rest-server-rdf/src/main/java/org/apache/juneau/rest/config/BasicUniversalJenaConfig.java index 6e43686d02..c805cf27de 100644 --- a/juneau-rest/juneau-rest-server-rdf/src/main/java/org/apache/juneau/rest/config/BasicUniversalJenaConfig.java +++ b/juneau-rest/juneau-rest-server-rdf/src/main/java/org/apache/juneau/rest/config/BasicUniversalJenaConfig.java @@ -95,9 +95,9 @@ import org.apache.juneau.xml.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java index c4ca797dcf..83a7f505a9 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGet.java @@ -89,7 +89,7 @@ public @interface RestGet { * * <jc>// Call this method if Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestGet</ja>(path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java index 8dd0e12a83..56d063d3b4 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOp.java @@ -88,7 +88,7 @@ public @interface RestOp { * * <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestOp</ja>(method=<jsf>GET</jsf>, path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptions.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptions.java index 30106a9364..1f16cbd242 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptions.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptions.java @@ -89,7 +89,7 @@ public @interface RestOptions { * * <jc>// Call this method if Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestOptions</ja>(path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatch.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatch.java index fd98286e71..28fa37a4de 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatch.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatch.java @@ -90,7 +90,7 @@ public @interface RestPatch { * * <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestPatch</ja>(path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java index 9810dcdba7..99dd2a3020 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPost.java @@ -90,7 +90,7 @@ public @interface RestPost { * * <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestPost</ja>(path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java index a9c0aeaa59..4bd2f98e42 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPut.java @@ -90,7 +90,7 @@ public @interface RestPut { * * <jc>// Call this method if X-Client-Version is at least 1.1, but less than 2.0.</jc> * <ja>@RestPut</ja>(path=<js>"/foobar"</js>, clientVersion=<js>"[1.1,2.0)"</js>) - * <ja>@BeanConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) + * <ja>@MarshalledConfig</ja>(swaps=NewToOldSwap.<jk>class</jk>) * <jk>public</jk> NewPojo oldMethod() { * <jk>return</jk> newMethod(); * } diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJson5Config.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJson5Config.java index 7a4655f9d0..bb65f0d187 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJson5Config.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJson5Config.java @@ -44,9 +44,9 @@ import org.apache.juneau.serializer.annotation.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonConfig.java index ad1ed8776d..ad81e239f1 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonConfig.java @@ -47,9 +47,9 @@ import org.apache.juneau.serializer.annotation.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonHtmlConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonHtmlConfig.java index 42c262ad4a..77f82da7b9 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonHtmlConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicJsonHtmlConfig.java @@ -51,9 +51,9 @@ import org.apache.juneau.serializer.annotation.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicOpenApiConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicOpenApiConfig.java index 4492f32bcb..3f34903849 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicOpenApiConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicOpenApiConfig.java @@ -44,9 +44,9 @@ import org.apache.juneau.serializer.annotation.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicUniversalConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicUniversalConfig.java index 8b97435d97..b6cc372451 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicUniversalConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/BasicUniversalConfig.java @@ -88,9 +88,9 @@ import org.apache.juneau.xml.*; * <li class='jma'>{@link Rest#config() config}: <js>"$S{juneau.configFile,SYSTEM_DEFAULT}"</js> * </ul> * </li> - * <li class='ja'>{@link BeanConfig}: + * <li class='ja'>{@link MarshalledConfig}: * <ul> - * <li class='jma'>{@link BeanConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> + * <li class='jma'>{@link MarshalledConfig#ignoreUnknownBeanProperties() ignoreUnknownBeanProperties}: <js>"true"</js> * </ul> * </li> * <li class='ja'>{@link SerializerConfig}: diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java index 152c0b36f8..b5d4f64e7e 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/config/DefaultConfig.java @@ -126,7 +126,7 @@ import org.apache.juneau.serializer.annotation.*; staticFiles=StaticFiles.Void.class, // Defaults to BasicStaticFiles. swaggerProvider=SwaggerProvider.Void.class // Defaults to BasicSwaggerProvider. ) -@BeanConfig( +@MarshalledConfig( // When parsing generated beans, ignore unknown properties that may only exist as getters and not setters. ignoreUnknownBeanProperties="true", ignoreUnknownEnumValues="true" diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java index 48b30bc197..1bbebdb685 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java @@ -175,7 +175,7 @@ public interface BasicRestOperations { // Never show aside contents of page inherited from class. aside="NONE" ) - @BeanConfig( + @MarshalledConfig( // POJO swaps to apply to all serializers/parsers on this method. swaps={ // Use the SwaggerUI swap when rendering Swagger beans. diff --git a/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java b/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java index fc341701a3..695e4b83fb 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BasicBeans_Test.java @@ -43,7 +43,7 @@ class BasicBeans_Test extends TestBase { } } - @BeanConfig(disableIgnoreTransientFields="true") + @MarshalledConfig(disableIgnoreTransientFields="true") public static class A {} @Test void a01_testTransientFieldsIgnored() { diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrors_Test.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrors_Test.java index af084ee692..9a193a3d0e 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrors_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrors_Test.java @@ -103,7 +103,7 @@ class BeanMapErrors_Test extends TestBase { public int f2 = -1; } - @Test void beanPropertyFieldNotInBeanConfig() { + @Test void beanPropertyFieldNotInMarshalledConfig() { var bc = BeanContext.create().applyAnnotations(B2Config.class).build(); var bm = bc.newBeanMap(B2.class); diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java b/juneau-utest/src/test/java/org/apache/juneau/MarshalledConfig_Test.java similarity index 99% rename from juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java rename to juneau-utest/src/test/java/org/apache/juneau/MarshalledConfig_Test.java index 575c61ae38..a8df77acaa 100755 --- a/juneau-utest/src/test/java/org/apache/juneau/BeanConfig_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/MarshalledConfig_Test.java @@ -41,7 +41,7 @@ import org.junit.jupiter.api.*; "java:S5961", // High assertion count acceptable in comprehensive tests "cast" // Explicit cast needed for type testing }) -class BeanConfig_Test extends TestBase { +class MarshalledConfig_Test extends TestBase { //==================================================================================================== // testBasic diff --git a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledConfigAnnotation_Test.java similarity index 98% rename from juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java rename to juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledConfigAnnotation_Test.java index a6e63ce689..965212ef3a 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/annotation/BeanConfigAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/annotation/MarshalledConfigAnnotation_Test.java @@ -34,12 +34,12 @@ import org.apache.juneau.swap.*; import org.junit.jupiter.api.*; /** - * Tests the @BeanConfig annotation. + * Tests the @MarshalledConfig annotation. */ @SuppressWarnings({ "java:S5961" // High assertion count acceptable in comprehensive test }) -class BeanConfigAnnotation_Test extends TestBase { +class MarshalledConfigAnnotation_Test extends TestBase { private static void check(String expected, Object o) { assertEquals(expected, TO_STRING.apply(o)); @@ -114,7 +114,7 @@ class BeanConfigAnnotation_Test extends TestBase { public static class AB3 extends ObjectSwap<String,Integer> { } - @BeanConfig( + @MarshalledConfig( beanClassVisibility="$X{PRIVATE}", beanConstructorVisibility="$X{PRIVATE}", dictionary={A1.class,A2.class}, @@ -191,7 +191,7 @@ class BeanConfigAnnotation_Test extends TestBase { // Annotation with no values. //----------------------------------------------------------------------------------------------------------------- - @BeanConfig() + @MarshalledConfig() static class B {} static ClassInfo b = ClassInfo.of(B.class); diff --git a/juneau-utest/src/test/java/org/apache/juneau/annotation/Marshalled_Test.java b/juneau-utest/src/test/java/org/apache/juneau/annotation/Marshalled_Test.java index f55ffb0e45..9faddeb8d3 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/annotation/Marshalled_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/annotation/Marshalled_Test.java @@ -207,7 +207,7 @@ class Marshalled_Test extends TestBase { private static ClassInfo dConfig = ClassInfo.of(DConfig.class); - @Test void d01_beanPropertiesExcludePropertiesCombined_noBeanConfig() throws Exception { + @Test void d01_beanPropertiesExcludePropertiesCombined_noMarshalledConfig() throws Exception { var json = Json5.of(D1.create()); assertEquals("{a:1,c:3}", json); var x = Json5.DEFAULT.read(json, D1.class); @@ -215,7 +215,7 @@ class Marshalled_Test extends TestBase { assertEquals("{a:1,c:3}", json); } - @Test void d02_beanPXpCombined_noBeanConfig() throws Exception { + @Test void d02_beanPXpCombined_noMarshalledConfig() throws Exception { var json = Json5.of(D2.create()); assertEquals("{a:1,c:3}", json); var x = Json5.DEFAULT.read(json, D2.class); @@ -272,7 +272,7 @@ class Marshalled_Test extends TestBase { } //----------------------------------------------------------------------------------------------------------------- - // @BeanConfig(bpi/bpx) should override @Marshalled(bpi/bpx) + // @MarshalledConfig(bpi/bpx) should override @Marshalled(bpi/bpx) //----------------------------------------------------------------------------------------------------------------- @Marshalled(properties="a,b,c") @@ -318,7 +318,7 @@ class Marshalled_Test extends TestBase { private static ClassInfo eConfig = ClassInfo.of(EConfig.class); - @Test void e01_beanPropertiesExcludePropertiesCombined_multipleMarshalledAnnotations_noBeanConfig() throws Exception { + @Test void e01_beanPropertiesExcludePropertiesCombined_multipleMarshalledAnnotations_noMarshalledConfig() throws Exception { var json = Json5.of(E1.create()); assertEquals("{a:1,c:3}", json); var e = Json5.DEFAULT.read(json, E1.class); @@ -326,7 +326,7 @@ class Marshalled_Test extends TestBase { assertEquals("{a:1,c:3}", json); } - @Test void e02_beanPXpCombined_multipleMarshalledAnnotations_noBeanConfig() throws Exception { + @Test void e02_beanPXpCombined_multipleMarshalledAnnotations_noMarshalledConfig() throws Exception { var json = Json5.of(E2.create()); assertEquals("{a:1,c:3}", json); var e = Json5.DEFAULT.read(json, E2.class); diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/MarshalledConfig_Swaps_Test.java similarity index 94% rename from juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java rename to juneau-utest/src/test/java/org/apache/juneau/rest/annotation/MarshalledConfig_Swaps_Test.java index 925a5b3b9f..cef1fac6b5 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/BeanConfig_Swaps_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/MarshalledConfig_Swaps_Test.java @@ -28,7 +28,7 @@ import org.apache.juneau.serializer.*; import org.apache.juneau.swap.*; import org.junit.jupiter.api.*; -class BeanConfig_Swaps_Test extends TestBase { +class MarshalledConfig_Swaps_Test extends TestBase { //------------------------------------------------------------------------------------------------------------------ // Basic tests @@ -84,11 +84,11 @@ class BeanConfig_Swaps_Test extends TestBase { } @Rest(serializers=Json5Serializer.class, parsers=Json5Parser.class) - @BeanConfig(swaps={SwapA1.class}) + @MarshalledConfig(swaps={SwapA1.class}) public static class A2 {} @Rest - @BeanConfig(swaps={SwapA2.class}) + @MarshalledConfig(swaps={SwapA2.class}) public static class A1 extends A2 { @RestGet @@ -104,17 +104,17 @@ class BeanConfig_Swaps_Test extends TestBase { return a; // Should return "A2-1". } @RestGet - @BeanConfig(swaps={SwapA3.class}) + @MarshalledConfig(swaps={SwapA3.class}) public A d() { return new A(); // Should return "A3-1". } @RestPut - @BeanConfig(swaps={SwapA3.class}) + @MarshalledConfig(swaps={SwapA3.class}) public A e(@Content A a) { return a; // Should return "A3-1". } @RestPut(path="/f/{a}") - @BeanConfig(swaps={SwapA3.class}) + @MarshalledConfig(swaps={SwapA3.class}) public A f(@Path("a") A a) { return a; // Should return "A3-1". } diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_MarshalledConfig_Test.java similarity index 96% rename from juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java rename to juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_MarshalledConfig_Test.java index 24cf94d7c3..b9a368c20d 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_BeanConfig_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/RestOp_MarshalledConfig_Test.java @@ -25,10 +25,10 @@ import org.junit.jupiter.api.*; @SuppressWarnings({ "serial" // Serialization not relevant in test code }) -class RestOp_BeanConfig_Test extends TestBase { +class RestOp_MarshalledConfig_Test extends TestBase { //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpi) + // @MarshalledConfig(bpi) //------------------------------------------------------------------------------------------------------------------ public static class A1 extends BasicRestServlet { @@ -69,7 +69,7 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpx) + // @MarshalledConfig(bpx) //------------------------------------------------------------------------------------------------------------------ public static class A2 extends BasicRestServlet { @@ -110,7 +110,7 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpi) and @Marshalled(bpi) + // @MarshalledConfig(bpi) and @Marshalled(bpi) //------------------------------------------------------------------------------------------------------------------ public static class A3 extends BasicRestServlet { @@ -151,7 +151,7 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpx) and @Marshalled(bpi) + // @MarshalledConfig(bpx) and @Marshalled(bpi) //------------------------------------------------------------------------------------------------------------------ public static class A4 extends BasicRestServlet { @@ -192,7 +192,7 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpi), meta-matching + // @MarshalledConfig(bpi), meta-matching //------------------------------------------------------------------------------------------------------------------ public static class A5 extends BasicRestServlet { @@ -213,12 +213,12 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpi), fully-qualified class name + // @MarshalledConfig(bpi), fully-qualified class name //------------------------------------------------------------------------------------------------------------------ public static class A6 extends BasicRestServlet { @RestGet - @MarshalledApply(on="org.apache.juneau.rest.annotation.RestOp_BeanConfig_Test$X1", value=@Marshalled(p="a")) + @MarshalledApply(on="org.apache.juneau.rest.annotation.RestOp_MarshalledConfig_Test$X1", value=@Marshalled(p="a")) public Object a() { return new X1().init(); } @@ -234,7 +234,7 @@ class RestOp_BeanConfig_Test extends TestBase { } //------------------------------------------------------------------------------------------------------------------ - // @BeanConfig(bpi), negative matching + // @MarshalledConfig(bpi), negative matching //------------------------------------------------------------------------------------------------------------------ public static class A7 extends BasicRestServlet { diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java index 246d5ba733..e8a27a47ca 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_Context_Test.java @@ -100,11 +100,11 @@ class RestClient_Config_Context_Test extends TestBase { @MarshalledApply(on="A6a",value=@Marshalled) public static class A6b {} - @BeanConfig + @MarshalledConfig public static class A6c {} public static class A6d { - @BeanConfig + @MarshalledConfig public void foo() { /* no-op */ } } diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/DefaultSwaps_Test.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/DefaultSwaps_Test.java index b2cf7e4bfb..65fc4141b8 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/transforms/DefaultSwaps_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/DefaultSwaps_Test.java @@ -117,7 +117,7 @@ class DefaultSwaps_Test extends TestBase { @SwapApply(on="Dummy1.f2", value=@Swap(AcSwap.class)) @SwapApply(on="AcBean.f2", value=@Swap(AcSwap.class)) @SwapApply(on="Dummy2.f2", value=@Swap(AcSwap.class)) - private static class AcBeanConfig {} + private static class AcMarshalledConfig {} public static class AcBean { public Enumeration<String> f1 = A.elements(); @@ -126,15 +126,15 @@ class DefaultSwaps_Test extends TestBase { } @Test void a01c_Enumeration_usingConfig() throws Exception { - test2("['foo','bar']", A_C.elements(), AcBeanConfig.class); + test2("['foo','bar']", A_C.elements(), AcMarshalledConfig.class); } @Test void a02c_Enumeration_overrideSwap_usingConfig() throws Exception { - test4("'FOO'", A_C.elements(), AcSwap.class, AcBeanConfig.class); + test4("'FOO'", A_C.elements(), AcSwap.class, AcMarshalledConfig.class); } @Test void a03c_Enumeration_overrideAnnotation_usingConfig() throws Exception { - test2("{f1:['foo','bar'],f2:'FOO'}", new AcBean(), AcBeanConfig.class); + test2("{f1:['foo','bar'],f2:'FOO'}", new AcBean(), AcMarshalledConfig.class); } //------------------------------------------------------------------------------------------------------------------ @@ -179,7 +179,7 @@ class DefaultSwaps_Test extends TestBase { @SwapApply(on="Dummy1.f2", value=@Swap(BcSwap.class)) @SwapApply(on="BcBean.f2", value=@Swap(BcSwap.class)) @SwapApply(on="Dummy2.f2", value=@Swap(BcSwap.class)) - private static class BcBeanConfig {} + private static class BcMarshalledConfig {} public static class BcBean { public Iterator<?> f1 = B.iterator(); @@ -187,15 +187,15 @@ class DefaultSwaps_Test extends TestBase { } @Test void b01c_Iterator_usingConfig() throws Exception { - test2("['foo','bar']", B_C.iterator(), BcBeanConfig.class); + test2("['foo','bar']", B_C.iterator(), BcMarshalledConfig.class); } @Test void b02c_Iterator_overrideSwap_usingConfig() throws Exception { - test4("'FOO'", B_C.iterator(), BcSwap.class, BcBeanConfig.class); + test4("'FOO'", B_C.iterator(), BcSwap.class, BcMarshalledConfig.class); } @Test void b03c_Iterator_overrideAnnotation_usingConfig() throws Exception { - test2("{f1:['foo','bar'],f2:'FOO'}", new BcBean(), BcBeanConfig.class); + test2("{f1:['foo','bar'],f2:'FOO'}", new BcBean(), BcMarshalledConfig.class); } //------------------------------------------------------------------------------------------------------------------
