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
The following commit(s) were added to refs/heads/master by this push:
new 29f04fb Remove redundancy in HttpPart annotations.
29f04fb is described below
commit 29f04fb254c931c669d9b4d7d355bdc09d48df2a
Author: JamesBognar <[email protected]>
AuthorDate: Mon Nov 22 10:50:24 2021 -0500
Remove redundancy in HttpPart annotations.
---
.../org/apache/juneau/http/annotation/Body.java | 3 +-
.../juneau/http/annotation/BodyAnnotation.java | 20 +-----
.../org/apache/juneau/http/annotation/Contact.java | 9 +--
.../juneau/http/annotation/ExternalDocs.java | 9 +--
.../apache/juneau/http/annotation/FormData.java | 3 +-
.../juneau/http/annotation/FormDataAnnotation.java | 26 +-------
.../org/apache/juneau/http/annotation/Header.java | 3 +-
.../juneau/http/annotation/HeaderAnnotation.java | 26 +-------
.../org/apache/juneau/http/annotation/Items.java | 54 ----------------
.../org/apache/juneau/http/annotation/License.java | 9 +--
.../org/apache/juneau/http/annotation/Path.java | 3 +-
.../juneau/http/annotation/PathAnnotation.java | 25 +-------
.../org/apache/juneau/http/annotation/Query.java | 3 +-
.../juneau/http/annotation/QueryAnnotation.java | 26 +-------
.../apache/juneau/http/annotation/Response.java | 12 ++--
.../juneau/http/annotation/ResponseAnnotation.java | 30 +--------
.../http/annotation/ResponseBodyAnnotation.java | 18 +-----
.../juneau/http/annotation/ResponseHeader.java | 3 +-
.../http/annotation/ResponseHeaderAnnotation.java | 39 +-----------
.../org/apache/juneau/http/annotation/Schema.java | 42 +-----------
.../juneau/http/annotation/SchemaAnnotation.java | 74 +---------------------
.../apache/juneau/http/annotation/SubItems.java | 54 ----------------
.../org/apache/juneau/http/annotation/Tag.java | 9 +--
23 files changed, 30 insertions(+), 470 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
index aa93137..98fb9df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Body.java
@@ -179,8 +179,7 @@ public @interface Body {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
index 8b6de9e..cd36a1e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/BodyAnnotation.java
@@ -66,24 +66,6 @@ public class BodyAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Body copy(Body a, VarResolverSession r) {
- return
- create()
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -245,7 +227,7 @@ public class BodyAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
index 9208363..fb7850c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Contact.java
@@ -71,8 +71,7 @@ public @interface Contact {
* <li>
* The format is an email string.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String email() default "";
@@ -87,8 +86,7 @@ public @interface Contact {
* <li>
* The format is a plain-text string.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String name() default "";
@@ -175,8 +173,7 @@ public @interface Contact {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
index a48af78..5e5b8dc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ExternalDocs.java
@@ -69,8 +69,7 @@ public @interface ExternalDocs {
* The format is a plain-text string.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
@@ -87,8 +86,7 @@ public @interface ExternalDocs {
* <li>
* The format is a URL string.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String url() default "";
@@ -158,8 +156,7 @@ public @interface ExternalDocs {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
index 942e234..3cb7838 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormData.java
@@ -142,8 +142,7 @@ public @interface FormData {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
index ecafc78..1369eca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/FormDataAnnotation.java
@@ -67,30 +67,6 @@ public class FormDataAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static FormData copy(FormData a, VarResolverSession r) {
- return
- create()
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .multi(a.multi())
- .n(r.resolve(a.n()))
- .name(r.resolve(a.name()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .parser(a.parser())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(r.resolve(a.value()))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -368,7 +344,7 @@ public class FormDataAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
index 2568fb9..7da7af0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Header.java
@@ -108,8 +108,7 @@ public @interface Header {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 7d1e6d2..73758df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -67,30 +67,6 @@ public class HeaderAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Header copy(Header a, VarResolverSession r) {
- return
- create()
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .multi(a.multi())
- .n(r.resolve(a.n()))
- .name(r.resolve(a.name()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .parser(a.parser())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(r.resolve(a.value()))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -368,7 +344,7 @@ public class HeaderAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
index dff958e..8820a23 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Items.java
@@ -87,9 +87,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] _default() default {};
@@ -100,9 +97,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] _enum() default {};
@@ -113,9 +107,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String $ref() default "";
@@ -131,9 +122,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String collectionFormat() default "";
@@ -164,9 +152,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean exclusiveMaximum() default false;
@@ -177,9 +162,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean exclusiveMinimum() default false;
@@ -195,9 +177,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String format() default "";
@@ -226,9 +205,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String maximum() default "";
@@ -239,9 +215,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long maxItems() default -1;
@@ -257,9 +230,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long maxLength() default -1;
@@ -280,9 +250,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String minimum() default "";
@@ -293,9 +260,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long minItems() default -1;
@@ -311,9 +275,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long minLength() default -1;
@@ -329,9 +290,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String multipleOf() default "";
@@ -347,9 +305,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String pattern() default "";
@@ -365,9 +320,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String type() default "";
@@ -383,9 +335,6 @@ public @interface Items {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean uniqueItems() default false;
@@ -473,9 +422,6 @@ public @interface Items {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
index 284f4c5..cb0e2c9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/License.java
@@ -65,8 +65,7 @@ public @interface License {
* <li>
* The format is a plain-text string.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String name() default "";
@@ -78,8 +77,7 @@ public @interface License {
* <li>
* The format is a plain-text string.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String url() default "";
@@ -147,8 +145,7 @@ public @interface License {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
index 2554b3f..3081f17 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Path.java
@@ -105,8 +105,7 @@ public @interface Path {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index 8fa8896..39e9d7f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -67,29 +67,6 @@ public class PathAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Path copy(Path a, VarResolverSession r) {
- return
- create()
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .n(r.resolve(a.n()))
- .name(r.resolve(a.name()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .parser(a.parser())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(r.resolve(a.value()))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -348,7 +325,7 @@ public class PathAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
index 34ff34a..7a7bad3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Query.java
@@ -116,8 +116,7 @@ public @interface Query {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index d7dbabd..09b036e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -67,30 +67,6 @@ public class QueryAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Query copy(Query a, VarResolverSession r) {
- return
- create()
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .multi(a.multi())
- .n(r.resolve(a.n()))
- .name(r.resolve(a.name()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .parser(a.parser())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(r.resolve(a.value()))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -368,7 +344,7 @@ public class QueryAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
index 682c880..0f6895a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Response.java
@@ -134,8 +134,7 @@ public @interface Response {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
@@ -168,8 +167,7 @@ public @interface Response {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
@@ -288,8 +286,7 @@ public @interface Response {
* <li>
* The format of this object can also be a simple String
if the body has a schema associated with it, meaning it's meant to be treated
as an HTTP part.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] example() default {};
@@ -328,8 +325,7 @@ public @interface Response {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable:
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* <li>
* Resolution of variables is delayed until request time
and occurs before parsing.
* <br>This allows you to, for example, pull in a JSON
construct from a properties file based on the locale of the HTTP request.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
index 938c7a9..3d8ee9b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseAnnotation.java
@@ -68,34 +68,6 @@ public class ResponseAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Response copy(Response a, VarResolverSession r) {
- return
- create()
- .api(r.resolve(a.api()))
- .code(a.code())
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .ex(r.resolve(a.ex()))
- .example(r.resolve(a.example()))
- .examples(r.resolve(a.examples()))
- .exs(r.resolve(a.exs()))
- .headers(ResponseHeaderAnnotation.copy(a.headers(), r))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .parser(a.parser())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(a.value())
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -435,7 +407,7 @@ public class ResponseAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
index ba41c16..81b7503 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseBodyAnnotation.java
@@ -63,22 +63,6 @@ public class ResponseBodyAnnotation {
return create().on(on);
}
- /**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static ResponseBody copy(ResponseBody a, VarResolverSession r) {
- return
- create()
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .build();
- }
-
//-----------------------------------------------------------------------------------------------------------------
// Builder
//-----------------------------------------------------------------------------------------------------------------
@@ -195,7 +179,7 @@ public class ResponseBodyAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
index e452c0f..e6bf99d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeader.java
@@ -164,8 +164,7 @@ public @interface ResponseHeader {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
index 15368f5..8af68f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/ResponseHeaderAnnotation.java
@@ -68,43 +68,6 @@ public class ResponseHeaderAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static ResponseHeader copy(ResponseHeader a, VarResolverSession
r) {
- return
- create()
- .code(a.code())
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .n(r.resolve(a.n()))
- .name(r.resolve(a.name()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .schema(SchemaAnnotation.copy(a.schema(), r))
- .serializer(a.serializer())
- .value(r.resolve(a.value()))
- .build();
- }
-
- /**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static ResponseHeader[] copy(ResponseHeader[] a,
VarResolverSession r) {
- ResponseHeader[] b = new ResponseHeader[a.length];
- for (int i = 0; i < a.length; i++)
- b[i] = copy(a[i], r);
- return b;
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -357,7 +320,7 @@ public class ResponseHeaderAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
index 1379200..a956f73 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Schema.java
@@ -174,9 +174,6 @@ public @interface Schema {
* <ul class='notes'>
* <li>
* The format is a <a
href='https://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03'>JSON
Reference</a>.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String $ref() default "";
@@ -188,9 +185,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] additionalProperties() default {};
@@ -202,9 +196,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] allOf() default {};
@@ -321,8 +312,7 @@ public @interface Schema {
* The format is plain text.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
@@ -339,9 +329,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String discriminator() default "";
@@ -422,9 +409,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
ExternalDocs externalDocs() default @ExternalDocs;
@@ -507,9 +491,6 @@ public @interface Schema {
* <ul class='notes'>
* <li>
* The format is plain text.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*
* <ul class='seealso'>
@@ -653,9 +634,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long maxProperties() default -1;
@@ -768,9 +746,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long minProperties() default -1;
@@ -948,9 +923,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] properties() default {};
@@ -967,9 +939,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean readOnly() default false;
@@ -1049,9 +1018,6 @@ public @interface Schema {
* <ul class='notes'>
* <li>
* The format is plain text.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String title() default "";
@@ -1217,9 +1183,6 @@ public @interface Schema {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
*/
@@ -1232,9 +1195,6 @@ public @interface Schema {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] xml() default {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
index f04620e..4052178 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SchemaAnnotation.java
@@ -69,78 +69,6 @@ public class SchemaAnnotation {
}
/**
- * Creates a copy of the specified annotation.
- *
- * @param a The annotation to copy.
- * @param r The var resolver for resolving any variables.
- * @return A copy of the specified annotation.
- */
- public static Schema copy(Schema a, VarResolverSession r) {
- return
- create()
- ._default(r.resolve(a._default()))
- ._enum(r.resolve(a._enum()))
- .$ref(r.resolve(a.$ref()))
-
.additionalProperties(r.resolve(a.additionalProperties()))
- .allOf(r.resolve(a.allOf()))
- .aev(a.aev())
- .allowEmptyValue(a.allowEmptyValue())
- .cf(r.resolve(a.cf()))
- .collectionFormat(r.resolve(a.collectionFormat()))
- .d(r.resolve(a.d()))
- .description(r.resolve(a.description()))
- .df(r.resolve(a.df()))
- .discriminator(r.resolve(a.discriminator()))
- .e(r.resolve(a.e()))
- .emax(a.emax())
- .emin(a.emin())
- .exclusiveMaximum(a.exclusiveMaximum())
- .exclusiveMinimum(a.exclusiveMinimum())
-
.externalDocs(ExternalDocsAnnotation.copy(a.externalDocs(), r))
- .f(r.resolve(a.f()))
- .format(r.resolve(a.format()))
- .ignore(a.ignore())
- .items(ItemsAnnotation.copy(a.items(), r))
- .max(r.resolve(a.max()))
- .maxi(a.maxi())
- .maximum(r.resolve(a.maximum()))
- .maxItems(a.maxItems())
- .maxl(a.maxLength())
- .maxLength(a.maxLength())
- .maxp(a.maxp())
- .maxProperties(a.maxProperties())
- .min(r.resolve(a.min()))
- .mini(a.mini())
- .minimum(r.resolve(a.minimum()))
- .minItems(a.minItems())
- .minl(a.minl())
- .minLength(a.minLength())
- .minp(a.minp())
- .minProperties(a.minProperties())
- .mo(r.resolve(a.mo()))
- .multipleOf(r.resolve(a.mo()))
- .on(r.resolve(a.on()))
- .onClass(a.onClass())
- .p(r.resolve(a.p()))
- .pattern(r.resolve(a.pattern()))
- .properties(r.resolve(a.properties()))
- .r(a.r())
- .readOnly(a.readOnly())
- .required(a.required())
- .ro(a.ro())
- .sie(a.sie())
- .skipIfEmpty(a.skipIfEmpty())
- .t(r.resolve(a.t()))
- .title(r.resolve(a.title()))
- .type(r.resolve(a.type()))
- .ui(a.ui())
- .uniqueItems(a.uniqueItems())
- .value(r.resolve(a.value()))
- .xml(r.resolve(a.xml()))
- .build();
- }
-
- /**
* Returns <jk>true</jk> if the specified annotation contains all
default values.
*
* @param a The annotation to check.
@@ -1311,7 +1239,7 @@ public class SchemaAnnotation {
if (isEmpty(a.on()) && isEmpty(a.onClass()))
return;
- b.annotations(copy(a, vr()));
+ b.annotations(a);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
index fbe0e38..446f0a4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/SubItems.java
@@ -41,9 +41,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] _default() default {};
@@ -54,9 +51,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String[] _enum() default {};
@@ -67,9 +61,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String $ref() default "";
@@ -85,9 +76,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String collectionFormat() default "";
@@ -118,9 +106,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean exclusiveMaximum() default false;
@@ -131,9 +116,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean exclusiveMinimum() default false;
@@ -149,9 +131,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String format() default "";
@@ -184,9 +163,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String maximum() default "";
@@ -197,9 +173,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long maxItems() default -1;
@@ -215,9 +188,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long maxLength() default -1;
@@ -238,9 +208,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String minimum() default "";
@@ -251,9 +218,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long minItems() default -1;
@@ -269,9 +233,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
long minLength() default -1;
@@ -287,9 +248,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String multipleOf() default "";
@@ -305,9 +263,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String pattern() default "";
@@ -323,9 +278,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
String type() default "";
@@ -341,9 +293,6 @@ public @interface SubItems {
* <ul class='notes'>
* <li>
* The format is a plain-text string.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
boolean uniqueItems() default false;
@@ -431,9 +380,6 @@ public @interface SubItems {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
index 69c3353..e645bb7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/Tag.java
@@ -71,8 +71,7 @@ public @interface Tag {
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
+ * Supports {@doc RestSvlVariables} (e.g.
<js>"$L{my.localized.variable}"</js>) for the swagger generator.
* </ul>
*/
String[] description() default {};
@@ -84,9 +83,6 @@ public @interface Tag {
* <li>
* The format is a {@doc SimplifiedJson} object.
* <br>Multiple lines are concatenated with newlines.
- * <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
* </ul>
*/
ExternalDocs externalDocs() default @ExternalDocs;
@@ -180,9 +176,6 @@ public @interface Tag {
* <li>
* Multiple lines are concatenated with newlines so that
you can format the value to be readable:
* <li>
- * Supports {@doc RestSvlVariables}
- * (e.g. <js>"$L{my.localized.variable}"</js>).
- * <li>
* Values defined in this field supersede values pulled
from the Swagger JSON file and are superseded by individual values defined on
this annotation.
* </ul>
*/
