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 bd1889c1134ac1527956bbbd14702ed61726aa3b Author: James Bognar <[email protected]> AuthorDate: Tue May 12 10:56:10 2026 -0400 docs: simplify annotation links in marshall and rest Javadocs --- .../src/main/java/org/apache/juneau/BeanMap.java | 4 ++-- .../src/main/java/org/apache/juneau/ClassMeta.java | 5 +++-- .../src/main/java/org/apache/juneau/Context.java | 9 +++++--- .../java/org/apache/juneau/MarshalledFilter.java | 24 +++++++++++----------- .../org/apache/juneau/MarshallingContextable.java | 12 +++++------ .../apache/juneau/annotation/MarshalledProp.java | 5 +++-- .../java/org/apache/juneau/annotation/Name.java | 3 ++- .../java/org/apache/juneau/rest/RestContext.java | 10 ++++----- .../org/apache/juneau/rest/annotation/RestGet.java | 5 +++-- .../apache/juneau/rest/annotation/RestInit.java | 6 ++++-- .../org/apache/juneau/rest/annotation/RestOp.java | 7 ++++--- .../apache/juneau/rest/annotation/RestPatch.java | 7 ++++--- 12 files changed, 54 insertions(+), 43 deletions(-) diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java index 5c3c064363..24519be464 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java @@ -369,7 +369,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T * * <p> * Triggers bean creation if bean has read-only properties set through a constructor defined by the - * {@link org.apache.juneau.commons.bean.BeanCtor @BeanCtor} annotation. + * {@link BeanCtor @BeanCtor} annotation. * * @return The inner bean object. */ @@ -410,7 +410,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T * * <p> * If <c>create</c> is <jk>false</jk>, then this method may return <jk>null</jk> if the bean has read-only - * properties set through a constructor defined by the {@link org.apache.juneau.commons.bean.BeanCtor @BeanCtor} annotation. + * properties set through a constructor defined by the {@link BeanCtor @BeanCtor} annotation. * * <p> * This method does NOT always return the bean in it's final state. diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java index dd8393c7f6..cf99d27494 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java @@ -36,6 +36,7 @@ import java.util.function.*; import java.util.stream.*; import org.apache.juneau.annotation.*; +import org.apache.juneau.commons.bean.BeanType; import org.apache.juneau.commons.collections.*; import org.apache.juneau.commons.conversion.*; import org.apache.juneau.commons.function.*; @@ -66,7 +67,7 @@ import org.apache.juneau.swap.*; * * @param <T> The class type of the wrapped class. */ [email protected](properties = "innerClass,elementType,keyType,valueType,notABeanReason,initException,beanMeta") +@BeanType(properties = "innerClass,elementType,keyType,valueType,notABeanReason,initException,beanMeta") @SuppressWarnings({ "java:S1200", // Class has 23 dependencies, acceptable for this core reflection metadata class "java:S1452", // Wildcard required - ClassMeta<?>, ObjectSwap<T,?>, etc. for element/component types @@ -1670,7 +1671,7 @@ public class ClassMeta<T> extends ClassInfoTyped<T> { private MarshalledFilter findMarshalledFilter() { var ap = marshallingContext.getAnnotationProvider(); var l = ap.find(Marshalled.class, this); - var bt = ap.find(org.apache.juneau.commons.bean.BeanType.class, this); + var bt = ap.find(BeanType.class, this); if (l.isEmpty() && bt.isEmpty()) return null; return MarshalledFilter.create(inner()) 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 8093a3e2bd..b1059726c6 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 @@ -27,9 +27,12 @@ import java.lang.reflect.*; import java.util.*; import java.util.function.*; import org.apache.juneau.annotation.*; +import org.apache.juneau.commons.bean.BeanCtorAnnotation; import org.apache.juneau.bson.annotation.BsonConfig; import org.apache.juneau.cbor.annotation.CborConfig; import org.apache.juneau.commons.bean.BeanConfig; +import org.apache.juneau.commons.bean.BeanIgnoreAnnotation; +import org.apache.juneau.commons.bean.BeanPropAnnotation; import org.apache.juneau.commons.collections.*; import org.apache.juneau.commons.reflect.*; import org.apache.juneau.commons.utils.*; @@ -207,10 +210,10 @@ public abstract class Context { * and passed into the builder class: * <ul class='javatreec'> * <li class='ja'>{@link MarshalledAnnotation} - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanCtorAnnotation} - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanIgnoreAnnotation} + * <li class='ja'>{@link BeanCtorAnnotation} + * <li class='ja'>{@link BeanIgnoreAnnotation} * <li class='ja'>{@link MarshalledIgnoreAnnotation} - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanPropAnnotation} + * <li class='ja'>{@link BeanPropAnnotation} * <li class='ja'>{@link MarshalledPropAnnotation} * <li class='ja'>{@link ExampleAnnotation} * <li class='ja'>{@link NamePropertyAnnotation} diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java index 4afd776776..8df0ec7415 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshalledFilter.java @@ -248,7 +248,7 @@ public class MarshalledFilter { * Specifies properties to exclude from the bean class. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#excludeProperties()} + * <li class='ja'>{@link BeanType#excludeProperties()} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesExcludes(Class, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesExcludes(String, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesExcludes(Map)} @@ -273,7 +273,7 @@ public class MarshalledFilter { * When enabled, fluent setters are detected on beans. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#findFluentSetters()} + * <li class='ja'>{@link BeanType#findFluentSetters()} * <li class='jm'>{@link MarshallingContext.Builder#findFluentSetters()} * </ul> * @@ -353,7 +353,7 @@ public class MarshalledFilter { * When specified, only the list of properties defined on the interface class will be used during serialization. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#interfaceClass()} + * <li class='ja'>{@link BeanType#interfaceClass()} * </ul> * * @param value The new value for this setting. @@ -385,7 +385,7 @@ public class MarshalledFilter { * Specifies the set and order of names of properties associated with the bean class. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#properties()} + * <li class='ja'>{@link BeanType#properties()} * <li class='jm'>{@link MarshallingContext.Builder#beanProperties(Class, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanProperties(String, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanProperties(Map)} @@ -410,7 +410,7 @@ public class MarshalledFilter { * The class to use for calculating bean property names. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#propertyNamer()} + * <li class='ja'>{@link BeanType#propertyNamer()} * <li class='jm'>{@link MarshallingContext.Builder#propertyNamer(Class)} * <li class='jc'>{@link PropertyNamer} * </ul> @@ -446,8 +446,8 @@ public class MarshalledFilter { * Specifies one or more properties on a bean that are read-only despite having valid getters. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#readOnlyProperties()} - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanProp#ro()} + * <li class='ja'>{@link BeanType#readOnlyProperties()} + * <li class='ja'>{@link BeanProp#ro()} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesReadOnly(Class, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesReadOnly(String, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesReadOnly(Map)} @@ -469,7 +469,7 @@ public class MarshalledFilter { * Opt out of alphabetical property sorting for this specific bean. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#unsorted()} + * <li class='ja'>{@link BeanType#unsorted()} * <li class='jf'>{@link MarshallingContext.Builder#unsortedProperties()} * </ul> * @@ -484,7 +484,7 @@ public class MarshalledFilter { * Opt out of alphabetical property sorting for this specific bean. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#unsorted()} + * <li class='ja'>{@link BeanType#unsorted()} * <li class='jf'>{@link MarshallingContext.Builder#unsortedProperties()} * </ul> * @@ -506,7 +506,7 @@ public class MarshalledFilter { * Identical in purpose to the stop class specified by {@link Introspector#getBeanInfo(Class, Class)}. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#stopClass()} + * <li class='ja'>{@link BeanType#stopClass()} * </ul> * * @param value The new value for this setting. @@ -556,8 +556,8 @@ public class MarshalledFilter { * Specifies one or more properties on a bean that are write-only despite having valid setters. * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanType#writeOnlyProperties()} - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanProp#wo()} + * <li class='ja'>{@link BeanType#writeOnlyProperties()} + * <li class='ja'>{@link BeanProp#wo()} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesWriteOnly(Class, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesWriteOnly(String, String)} * <li class='jm'>{@link MarshallingContext.Builder#beanPropertiesWriteOnly(Map)} diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java index f40e99b15b..7f345a8138 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MarshallingContextable.java @@ -216,7 +216,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanCtor @BeanCtor} annotation can also be used to expose a non-public constructor. + * <li class='note'>The {@link BeanCtor @BeanCtor} annotation can also be used to expose a non-public constructor. * <li class='note'>The {@link BeanIgnore @BeanIgnore} annotation can also be used on a public bean constructor to ignore it. * </ul> * @@ -426,7 +426,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanProp @BeanProp} annotation can also be used to expose a non-public field. + * <li class='note'>The {@link BeanProp @BeanProp} annotation can also be used to expose a non-public field. * <li class='note'>The {@link BeanIgnore @BeanIgnore} annotation can also be used on a public bean field to ignore it as a bean property. * </ul> * @@ -566,7 +566,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanProp @BeanProp} annotation can also be used to expose a non-public method. + * <li class='note'>The {@link BeanProp @BeanProp} annotation can also be used to expose a non-public method. * <li class='note'>The {@link BeanIgnore @BeanIgnore} annotation can also be used on a public bean getter/setter to ignore it as a bean property. * </ul> * @@ -1411,7 +1411,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanProp @BeanProp} annotation can be used on the getter to override this setting. + * <li class='note'>The {@link BeanProp @BeanProp} annotation can be used on the getter to override this setting. * <li class='note'>The {@link BeanIgnore @BeanIgnore} annotation can also be used on getters to ignore them as bean properties. * </ul> * @@ -1603,7 +1603,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanProp @BeanProp} annotation can also be used on transient fields to keep them from being ignored. + * <li class='note'>The {@link BeanProp @BeanProp} annotation can also be used on transient fields to keep them from being ignored. * </ul> * * <h5 class='section'>See Also:</h5><ul> @@ -1809,7 +1809,7 @@ public abstract class MarshallingContextable extends Context { * </p> * * <h5 class='section'>Notes:</h5><ul> - * <li class='note'>The {@link org.apache.juneau.commons.bean.BeanProp @BeanProp} annotation can also be used on methods to individually identify them as fluent setters. + * <li class='note'>The {@link BeanProp @BeanProp} annotation can also be used on methods to individually identify them as fluent setters. * <li class='note'>The {@link Bean#findFluentSetters() @Marshalled.fluentSetters()} annotation can also be used on classes to specify to look for fluent setters. * </ul> * 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 a817d67a00..a4ebfbf1d1 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 @@ -20,12 +20,13 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; +import org.apache.juneau.commons.bean.BeanProp; /** * Used to tailor how bean properties get marshalled by the framework. * * <p> - * The marshalling-only sibling of {@link org.apache.juneau.commons.bean.BeanProp @BeanProp}. + * The marshalling-only sibling of {@link BeanProp @BeanProp}. * Where {@code @BeanProp} (in <c>juneau-commons</c>) carries the bean-modeling attributes * (such as {@code name}, {@code ro}, {@code wo}, {@code type}, {@code params}, {@code elementType}, * and {@code factory}), this annotation carries the wire-format-specific attributes used by serializers @@ -40,7 +41,7 @@ import java.lang.annotation.*; * </ul> * * <h5 class='section'>See Also:</h5><ul> - * <li class='ja'>{@link org.apache.juneau.commons.bean.BeanProp} + * <li class='ja'>{@link BeanProp} * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/MarshalledPropAnnotation";>@MarshalledProp Annotation</a> * </ul> */ diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java index 24136e5ad9..e07733b8eb 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Name.java @@ -20,6 +20,7 @@ import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; +import org.apache.juneau.commons.inject.BeanStore; /** * Specifies the parameter name for bean property mapping. @@ -68,7 +69,7 @@ import java.lang.annotation.*; * * <h5 class='section'>See Also:</h5><ul> * <li class='ja'>{@link Named} - * <li class='jc'>{@link org.apache.juneau.commons.inject.BeanStore} + * <li class='jc'>{@link BeanStore} * </ul> */ @Documented diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java index 4e0a36e0d2..3d9b8c4efe 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java @@ -101,7 +101,7 @@ import jakarta.servlet.http.*; * * <p> * Configuration is supplied declaratively through the {@link Rest @Rest} annotation on the resource class - * (and inherited from any parent classes), and programmatically through {@link org.apache.juneau.commons.inject.Bean @Bean}-annotated + * (and inherited from any parent classes), and programmatically through {@link Bean @Bean}-annotated * methods/fields that contribute named beans (e.g. <c>encoders</c>, <c>parsers</c>, <c>callLogger</c>) to the REST * resource's bean store. Where direct construction is needed (test rigs, mock clients, embedded usage), * the public constructor takes a {@link RestContext.Args} record carrying the bootstrap state. @@ -374,10 +374,10 @@ public class RestContext extends Context { * * <p> * Default suppliers sit at the bottom of the bean-store resolution order: they fire only when no - * {@link org.apache.juneau.commons.inject.Bean @Bean} method, no programmatic {@code addBean(...)} call, and no Spring/overriding-parent + * {@link Bean @Bean} method, no programmatic {@code addBean(...)} call, and no Spring/overriding-parent * binding has been registered for the type. This is the mechanism that replaces the old * {@code DELAYED_INJECTION} list — by registering the framework's own factories as defaults - * <i>before</i> the {@link org.apache.juneau.commons.inject.Bean @Bean} method walk runs, any {@link org.apache.juneau.commons.inject.Bean @Bean} method whose parameters + * <i>before</i> the {@link Bean @Bean} method walk runs, any {@link Bean @Bean} method whose parameters * include framework types can now resolve those parameters lazily through the bean store without * requiring a hand-maintained skip list. */ @@ -1954,7 +1954,7 @@ public class RestContext extends Context { * <p> * The default call logger is {@link BasicCallLogger}. Override via {@link Rest#callLogger() @Rest(callLogger)} * on the resource class, by registering a {@link CallLogger} bean in the bean store, or by declaring a - * {@link org.apache.juneau.commons.inject.Bean @Bean}-annotated static method on the resource class: + * {@link Bean @Bean}-annotated static method on the resource class: * <p class='bjava'> * <ja>@Bean</ja> <jk>public static</jk> CallLogger myCallLogger(<i><args></i>) {...} * </p> @@ -2465,7 +2465,7 @@ public class RestContext extends Context { * The bootstrap resolver has the same {@link Var} catalog as {@link #getVarResolver()} but does not have * {@link Messages} or {@link Config} beans wired in — it is used to resolve annotation attribute values * (e.g. <c>@Rest(messages=...)</c>) before those beans are built. Override via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="bootstrapVarResolver")} on a static method of the resource class. + * {@link Bean @Bean(name="bootstrapVarResolver")} on a static method of the resource class. * * @return The bootstrap var resolver in use by this resource. */ 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 63bb93ae4e..9d904d6d7b 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 @@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; import org.apache.juneau.commons.annotation.*; +import org.apache.juneau.commons.inject.Bean; import org.apache.juneau.bean.swagger.*; import org.apache.juneau.encoders.*; import org.apache.juneau.rest.*; @@ -365,7 +366,7 @@ public @interface RestGet { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.encoders.EncoderSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/RestServerEncoders";>Encoders</a> @@ -625,7 +626,7 @@ public @interface RestGet { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.serializer.SerializerSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshalling";>Marshalling</a> diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInit.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInit.java index 51b86aa0fa..dce6698d41 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInit.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestInit.java @@ -21,6 +21,8 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; +import org.apache.juneau.commons.inject.Bean; +import org.apache.juneau.commons.inject.BeanStore; import org.apache.juneau.rest.*; import jakarta.servlet.*; @@ -36,9 +38,9 @@ import jakarta.servlet.*; * * <p> * Method parameters are resolved from the - * {@link org.apache.juneau.commons.inject.BeanStore bean store} the same way as any other Juneau-injected + * {@link BeanStore bean store} the same way as any other Juneau-injected * method. {@link jakarta.servlet.ServletConfig}, {@link jakarta.servlet.ServletContext}, the resource instance - * itself, and any bean registered via {@link org.apache.juneau.commons.inject.Bean @Bean} or the + * itself, and any bean registered via {@link Bean @Bean} or the * configured bean-store hooks are all resolvable. Zero-argument variants are also supported. * * <p> 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 9c8a4945de..85808392d5 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 @@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; import org.apache.juneau.commons.annotation.*; +import org.apache.juneau.commons.inject.Bean; import org.apache.juneau.bean.swagger.*; import org.apache.juneau.encoders.*; import org.apache.juneau.http.remote.*; @@ -427,7 +428,7 @@ public @interface RestOp { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.encoders.EncoderSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/RestServerEncoders";>Encoders</a> @@ -586,7 +587,7 @@ public @interface RestOp { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.parser.ParserSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="parsers")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="parsers")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshalling";>Marshalling</a> @@ -854,7 +855,7 @@ public @interface RestOp { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.serializer.SerializerSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshalling";>Marshalling</a> 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 3907934931..9d7a85d406 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 @@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.*; import java.lang.annotation.*; import org.apache.juneau.commons.annotation.*; +import org.apache.juneau.commons.inject.Bean; import org.apache.juneau.bean.swagger.*; import org.apache.juneau.encoders.*; import org.apache.juneau.parser.*; @@ -427,7 +428,7 @@ public @interface RestPatch { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.encoders.EncoderSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="encoders")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/RestServerEncoders";>Encoders</a> @@ -535,7 +536,7 @@ public @interface RestPatch { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.parser.ParserSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="parsers")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="parsers")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshalling";>Marshalling</a> @@ -776,7 +777,7 @@ public @interface RestPatch { * * <p> * For programmatic equivalents, contribute a {@link org.apache.juneau.serializer.SerializerSet} bean via - * {@link org.apache.juneau.commons.inject.Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). + * {@link Bean @Bean(name="serializers")} (use methodScope to scope to specific operation methods). * * <h5 class='section'>See Also:</h5><ul> * <li class='link'><a class="doclink" href="https://juneau.apache.org/docs/topics/Marshalling";>Marshalling</a>
