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 6b6ba7274d FilteredMap/MapBuilder improvements
6b6ba7274d is described below
commit 6b6ba7274d5425f8ad92f752706d76c147153994
Author: James Bognar <[email protected]>
AuthorDate: Sun Dec 14 19:00:21 2025 -0500
FilteredMap/MapBuilder improvements
---
.../java/org/apache/juneau/bean/html5/Track.java | 4 +-
.../apache/juneau/bean/jsonschema/JsonSchema.java | 80 ++++++++--------
.../juneau/bean/jsonschema/JsonSchemaProperty.java | 12 +--
.../jsonschema/JsonSchemaPropertySimpleArray.java | 12 +--
.../juneau/bean/jsonschema/JsonSchemaRef.java | 12 +--
.../org/apache/juneau/bean/openapi3/Items.java | 32 +++----
.../apache/juneau/bean/openapi3/SchemaInfo.java | 30 +++---
.../juneau/bean/openapi3/ServerVariable.java | 30 +++---
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 26 +++---
.../java/org/apache/juneau/bean/swagger/Items.java | 26 +++---
.../apache/juneau/bean/swagger/ParameterInfo.java | 34 +++----
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 28 +++---
.../java/org/apache/juneau/annotation/Items.java | 12 +--
.../apache/juneau/annotation/ItemsAnnotation.java | 28 +++---
.../java/org/apache/juneau/annotation/Schema.java | 28 +++---
.../apache/juneau/annotation/SchemaAnnotation.java | 96 +++++++++----------
.../org/apache/juneau/annotation/SubItems.java | 8 +-
.../juneau/annotation/SubItemsAnnotation.java | 32 +++----
.../org/apache/juneau/httppart/HttpPartSchema.java | 104 ++++++++++-----------
.../apache/juneau/http/header/ContentEncoding.java | 2 +-
.../java/org/apache/juneau/rest/RestOpContext.java | 2 +-
.../rest/swagger/BasicSwaggerProviderSession.java | 12 +--
.../org/apache/juneau/bean/html5/Track_Test.java | 2 +-
.../apache/juneau/http/SerializedHeader_Test.java | 4 +-
.../apache/juneau/http/SerializedPart_Test.java | 4 +-
.../http/annotation/AnnotationUtils_Test.java | 12 +--
.../juneau/httppart/HttpPartSchema_Body_Test.java | 4 +-
.../juneau/httppart/OpenApiPartParser_Test.java | 10 +-
.../httppart/OpenApiPartSerializer_Test.java | 10 +-
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 10 +-
.../annotation/ItemsAnnotation_Test.java | 18 ++--
.../annotation/SchemaAnnotation_Test.java | 52 +++++------
.../annotation/SubItemsAnnotation_Test.java | 18 ++--
.../juneau/rest/annotation/FormData_Test.java | 4 +-
.../apache/juneau/rest/annotation/Header_Test.java | 6 +-
.../juneau/rest/annotation/Swagger_Path_Test.java | 4 +-
.../rest/client/RestClient_FormData_Test.java | 2 +-
37 files changed, 405 insertions(+), 405 deletions(-)
diff --git
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
index e05337a096..49116a6f11 100644
---
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
+++
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/Track.java
@@ -45,7 +45,7 @@ import org.apache.juneau.annotation.*;
* .src(<js>"/media/captions-en.vtt"</js>)
* .srclang(<js>"en"</js>)
* .label(<js>"English Captions"</js>)
- * ._default(<jk>true</jk>);
+ * .default_(<jk>true</jk>);
*
* <jc>// Descriptions track (for audio descriptions)</jc>
* Track <jv>descriptions</jv> = <jsm>track</jsm>()
@@ -130,7 +130,7 @@ public class Track extends HtmlElementVoid {
* @param value Whether this track should be enabled by default.
* @return This object.
*/
- public Track _default(String value) { // NOSONAR - Intentional naming.
+ public Track default_(String value) {
attr("default", value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index f242b36efd..cc39f7a61d 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -344,16 +344,16 @@ public class JsonSchema {
private Boolean additionalPropertiesBoolean; // Boolean
representation of additionalProperties
private JsonSchema additionalPropertiesSchema; // JsonSchema
representation of additionalProperties
private JsonSchema unevaluatedProperties; // Draft 2019-09+
- private List<Object> _enum; // NOSONAR -
Intentional naming. Changed to Object to support any type
- private Object _const; // NOSONAR -
Intentional naming. Draft 06+
+ private List<Object> enum_; // Changed to
Object to support any type
+ private Object const_; // Draft 06+
private List<Object> examples; // Draft 06+
private List<JsonSchema> allOf;
private List<JsonSchema> anyOf;
private List<JsonSchema> oneOf;
private JsonSchema not;
- private JsonSchema _if; // NOSONAR -
Intentional naming. Draft 07+
- private JsonSchema _then; // NOSONAR -
Intentional naming. Draft 07+
- private JsonSchema _else; // NOSONAR -
Intentional naming. Draft 07+
+ private JsonSchema if_; // Draft 07+
+ private JsonSchema then_; // Draft 07+
+ private JsonSchema else_; // Draft 07+
private Boolean readOnly; // Draft 07+
private Boolean writeOnly; // Draft 07+
private String contentMediaType; // Draft 07+
@@ -491,14 +491,14 @@ public class JsonSchema {
/**
* Bean property appender: <property>enum</property>.
*
- * @param _enum The list of items to append to the
<property>enum</property> property on this bean.
+ * @param enum_ The list of items to append to the
<property>enum</property> property on this bean.
* @return This object.
*/
- public JsonSchema addEnum(Object..._enum) { // NOSONAR - Intentional
naming.
- if (this._enum == null)
- this._enum = new LinkedList<>();
- for (var e : _enum)
- this._enum.add(e);
+ public JsonSchema addEnum(Object...enum_) {
+ if (this.enum_ == null)
+ this.enum_ = new LinkedList<>();
+ for (var e : enum_)
+ this.enum_.add(e);
return this;
}
@@ -757,7 +757,7 @@ public class JsonSchema {
*
* @return The value of the <property>const</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
- public Object getConst() { return _const; }
+ public Object getConst() { return const_; }
/**
* Bean property getter: <property>contentEncoding</property>.
@@ -851,14 +851,14 @@ public class JsonSchema {
* @return The value of the <property>else</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
@Beanp("else")
- public JsonSchema getElse() { return _else; }
+ public JsonSchema getElse() { return else_; }
/**
* Bean property getter: <property>enum</property>.
*
* @return The value of the <property>enum</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
- public List<Object> getEnum() { return _enum; }
+ public List<Object> getEnum() { return enum_; }
/**
* Bean property getter: <property>examples</property>.
@@ -933,7 +933,7 @@ public class JsonSchema {
* @return The value of the <property>if</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
@Beanp("if")
- public JsonSchema getIf() { return _if; }
+ public JsonSchema getIf() { return if_; }
/**
* Bean property getter: <property>items</property>.
@@ -1174,7 +1174,7 @@ public class JsonSchema {
* @return The value of the <property>then</property> property on this
bean, or <jk>null</jk> if it is not set.
*/
@Beanp("then")
- public JsonSchema getThen() { return _then; }
+ public JsonSchema getThen() { return then_; }
/**
* Bean property getter: <property>title</property>.
@@ -1357,11 +1357,11 @@ public class JsonSchema {
* <p>
* This property was added in Draft 06.
*
- * @param _const The new value for the <property>const</property>
property on this bean.
+ * @param const_ The new value for the <property>const</property>
property on this bean.
* @return This object.
*/
- public JsonSchema setConst(Object _const) { // NOSONAR - Intentional
naming.
- this._const = _const;
+ public JsonSchema setConst(Object const_) {
+ this.const_ = const_;
return this;
}
@@ -1484,24 +1484,24 @@ public class JsonSchema {
* <p>
* This property was added in Draft 07 for conditional schema
application.
*
- * @param _else The new value for the <property>else</property>
property on this bean.
+ * @param else_ The new value for the <property>else</property>
property on this bean.
* @return This object.
*/
@Beanp("else")
- public JsonSchema setElse(JsonSchema _else) { // NOSONAR - Intentional
naming.
- this._else = _else;
- setMasterOn(_else);
+ public JsonSchema setElse(JsonSchema else_) {
+ this.else_ = else_;
+ setMasterOn(else_);
return this;
}
/**
* Bean property setter: <property>enum</property>.
*
- * @param _enum The new value for the <property>enum</property>
property on this bean.
+ * @param enum_ The new value for the <property>enum</property>
property on this bean.
* @return This object.
*/
- public JsonSchema setEnum(List<Object> _enum) { // NOSONAR -
Intentional naming.
- this._enum = _enum;
+ public JsonSchema setEnum(List<Object> enum_) {
+ this.enum_ = enum_;
return this;
}
@@ -1601,13 +1601,13 @@ public class JsonSchema {
* <p>
* This property was added in Draft 07 for conditional schema
application.
*
- * @param _if The new value for the <property>if</property> property on
this bean.
+ * @param if_ The new value for the <property>if</property> property on
this bean.
* @return This object.
*/
@Beanp("if")
- public JsonSchema setIf(JsonSchema _if) { // NOSONAR - Intentional
naming.
- this._if = _if;
- setMasterOn(_if);
+ public JsonSchema setIf(JsonSchema if_) {
+ this.if_ = if_;
+ setMasterOn(if_);
return this;
}
@@ -1919,13 +1919,13 @@ public class JsonSchema {
* <p>
* This property was added in Draft 07 for conditional schema
application.
*
- * @param _then The new value for the <property>then</property>
property on this bean.
+ * @param then_ The new value for the <property>then</property>
property on this bean.
* @return This object.
*/
@Beanp("then")
- public JsonSchema setThen(JsonSchema _then) { // NOSONAR - Intentional
naming.
- this._then = _then;
- setMasterOn(_then);
+ public JsonSchema setThen(JsonSchema then_) {
+ this.then_ = then_;
+ setMasterOn(then_);
return this;
}
@@ -2089,11 +2089,11 @@ public class JsonSchema {
oneOf.forEach(x -> x.setMaster(master));
if (nn(not))
not.setMaster(master);
- if (nn(_if))
- _if.setMaster(master);
- if (nn(_then))
- _then.setMaster(master);
- if (nn(_else))
- _else.setMaster(master);
+ if (nn(if_))
+ if_.setMaster(master);
+ if (nn(then_))
+ then_.setMaster(master);
+ if (nn(else_))
+ else_.setMaster(master);
}
}
\ No newline at end of file
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
index 51e18e8a8c..1b08b4fcf4 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
@@ -97,8 +97,8 @@ public class JsonSchemaProperty extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaProperty addEnum(Object..._enum) {
- super.addEnum(_enum);
+ public JsonSchemaProperty addEnum(Object...enum_) {
+ super.addEnum(enum_);
return this;
}
@@ -186,8 +186,8 @@ public class JsonSchemaProperty extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaProperty setConst(Object _const) {
- super.setConst(_const);
+ public JsonSchemaProperty setConst(Object const_) {
+ super.setConst(const_);
return this;
}
@@ -234,8 +234,8 @@ public class JsonSchemaProperty extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaProperty setEnum(List<Object> _enum) {
- super.setEnum(_enum);
+ public JsonSchemaProperty setEnum(List<Object> enum_) {
+ super.setEnum(enum_);
return this;
}
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
index 26bdbeaa76..749dffd2e2 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaPropertySimpleArray.java
@@ -95,8 +95,8 @@ public class JsonSchemaPropertySimpleArray extends
JsonSchemaProperty {
}
@Override /* Overridden from JsonSchemaProperty */
- public JsonSchemaPropertySimpleArray addEnum(Object..._enum) {
- super.addEnum(_enum);
+ public JsonSchemaPropertySimpleArray addEnum(Object...enum_) {
+ super.addEnum(enum_);
return this;
}
@@ -173,8 +173,8 @@ public class JsonSchemaPropertySimpleArray extends
JsonSchemaProperty {
}
@Override /* Overridden from JsonSchemaProperty */
- public JsonSchemaPropertySimpleArray setConst(Object _const) {
- super.setConst(_const);
+ public JsonSchemaPropertySimpleArray setConst(Object const_) {
+ super.setConst(const_);
return this;
}
@@ -221,8 +221,8 @@ public class JsonSchemaPropertySimpleArray extends
JsonSchemaProperty {
}
@Override /* Overridden from JsonSchemaProperty */
- public JsonSchemaPropertySimpleArray setEnum(List<Object> _enum) {
- super.setEnum(_enum);
+ public JsonSchemaPropertySimpleArray setEnum(List<Object> enum_) {
+ super.setEnum(enum_);
return this;
}
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
index 7aa7fd1581..d85e26aa62 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
@@ -98,8 +98,8 @@ public class JsonSchemaRef extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaRef addEnum(Object..._enum) {
- super.addEnum(_enum);
+ public JsonSchemaRef addEnum(Object...enum_) {
+ super.addEnum(enum_);
return this;
}
@@ -187,8 +187,8 @@ public class JsonSchemaRef extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaRef setConst(Object _const) {
- super.setConst(_const);
+ public JsonSchemaRef setConst(Object const_) {
+ super.setConst(const_);
return this;
}
@@ -235,8 +235,8 @@ public class JsonSchemaRef extends JsonSchema {
}
@Override /* Overridden from JsonSchema */
- public JsonSchemaRef setEnum(List<Object> _enum) {
- super.setEnum(_enum);
+ public JsonSchemaRef setEnum(List<Object> enum_) {
+ super.setEnum(enum_);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index ee2febbcc2..59c2bdaba0 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -89,8 +89,8 @@ public class Items extends OpenApiElement {
private Integer maxLength, minLength, maxItems, minItems;
private Boolean exclusiveMaximum, exclusiveMinimum, uniqueItems;
private Items items; // NOSONAR - Intentional naming.
- private Object _default; // NOSONAR - Intentional naming.
- private List<Object> _enum = list(); // NOSONAR - Intentional naming.
+ private Object default_;
+ private List<Object> enum_ = list();
/**
* Default constructor.
@@ -120,9 +120,9 @@ public class Items extends OpenApiElement {
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
this.uniqueItems = copyFrom.uniqueItems;
this.items = copyFrom.items == null ? null :
copyFrom.items.copy();
- this._default = copyFrom._default;
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
+ this.default_ = copyFrom.default_;
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
this.ref = copyFrom.ref;
}
@@ -138,7 +138,7 @@ public class Items extends OpenApiElement {
if (nn(values))
for (var v : values)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -203,14 +203,14 @@ public class Items extends OpenApiElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>enum</property>.
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public List<Object> getEnum() { return nullIfEmpty(_enum); }
+ public List<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>exclusiveMaximum</property>.
@@ -333,8 +333,8 @@ public class Items extends OpenApiElement {
var s = setb(String.class)
.addIf(nn(ref), "$ref")
.addIf(nn(collectionFormat), "collectionFormat")
- .addIf(nn(_default), "default")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(nn(default_), "default")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
.addIf(nn(exclusiveMinimum), "exclusiveMinimum")
.addIf(nn(format), "format")
@@ -463,7 +463,7 @@ public class Items extends OpenApiElement {
* @return This object
*/
public Items setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -476,9 +476,9 @@ public class Items extends OpenApiElement {
* @return This object
*/
public Items setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
@@ -494,19 +494,19 @@ public class Items extends OpenApiElement {
* <li><code>String</code> - JSON array representation of
<code>Collection<Object></code>
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"['foo','bar']"</js>);
+ * enum_(<js>"['foo','bar']"</js>);
* </p>
* <li><code>String</code> - Individual values
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"foo"</js>, <js>"bar"</js>);
+ * enum_(<js>"foo"</js>, <js>"bar"</js>);
* </p>
* </ul>
* <br>Ignored if <jk>null</jk>.
* @return This object
*/
public Items setEnum(Object...values) { // NOSONAR - Intentional
naming.
- _enum = listb(Object.class).sparse().addAny(_enum,
values).build();
+ enum_ = listb(Object.class).sparse().addAny(enum_,
values).build();
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
index 0faf80ddbf..0d8348eb66 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
@@ -102,12 +102,12 @@ public class SchemaInfo extends OpenApiElement {
private Number multipleOf, maximum, minimum;
private Integer maxLength, minLength, maxItems, minItems,
maxProperties, minProperties;
private Boolean exclusiveMaximum, exclusiveMinimum, uniqueItems,
nullable, writeOnly, readOnly, deprecated;
- private Object _default, // NOSONAR - Intentional naming.
+ private Object default_,
example;
private Items items;
private Xml xml;
private ExternalDocumentation externalDocs;
- private List<Object> allOf = list(), oneOf = list(), anyOf = list(),
_enum = list(); // NOSONAR - Intentional naming.
+ private List<Object> allOf = list(), oneOf = list(), anyOf = list(),
enum_ = list();
private List<String> required = list();
private Discriminator discriminator;
private Map<String,SchemaInfo> properties;
@@ -150,13 +150,13 @@ public class SchemaInfo extends OpenApiElement {
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
this.uniqueItems = copyFrom.uniqueItems;
this.readOnly = copyFrom.readOnly;
- this._default = copyFrom._default;
+ this.default_ = copyFrom.default_;
this.example = copyFrom.example;
this.items = copyFrom.items == null ? null :
copyFrom.items.copy();
this.xml = copyFrom.xml == null ? null : copyFrom.xml.copy();
this.externalDocs = copyFrom.externalDocs == null ? null :
copyFrom.externalDocs.copy();
- if (nn(copyFrom._enum))
- _enum.addAll(copyFrom._enum);
+ if (nn(copyFrom.enum_))
+ enum_.addAll(copyFrom.enum_);
if (nn(copyFrom.allOf))
allOf.addAll(copyFrom.allOf);
if (nn(copyFrom.required))
@@ -244,12 +244,12 @@ public class SchemaInfo extends OpenApiElement {
* <li><code>String</code> - JSON array representation of
<code>Collection<Object></code>
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"['foo','bar']"</js>);
+ * enum_(<js>"['foo','bar']"</js>);
* </p>
* <li><code>String</code> - Individual values
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"foo"</js>, <js>"bar"</js>);
+ * enum_(<js>"foo"</js>, <js>"bar"</js>);
* </p>
* </ul>
* <br>Ignored if <jk>null</jk>.
@@ -259,7 +259,7 @@ public class SchemaInfo extends OpenApiElement {
if (nn(values))
for (var v : values)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -405,7 +405,7 @@ public class SchemaInfo extends OpenApiElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>deprecated</property>.
@@ -433,7 +433,7 @@ public class SchemaInfo extends OpenApiElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public List<Object> getEnum() { return nullIfEmpty(_enum); }
+ public List<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>example</property>.
@@ -643,11 +643,11 @@ public class SchemaInfo extends OpenApiElement {
.addIf(nn(additionalProperties), "additionalProperties")
.addIf(isNotEmpty(allOf), "allOf")
.addIf(isNotEmpty(anyOf), "anyOf")
- .addIf(nn(_default), "default")
+ .addIf(nn(default_), "default")
.addIf(nn(deprecated), "deprecated")
.addIf(nn(description), "description")
.addIf(nn(discriminator), "discriminator")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(example), "example")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
.addIf(nn(exclusiveMinimum), "exclusiveMinimum")
@@ -822,7 +822,7 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -874,9 +874,9 @@ public class SchemaInfo extends OpenApiElement {
* @return This object
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
index ae2be6a857..0a34bd61d2 100644
---
a/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
+++
b/juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
@@ -73,8 +73,8 @@ import org.apache.juneau.commons.collections.*;
*/
public class ServerVariable extends OpenApiElement {
- private List<Object> _enum = list(); // NOSONAR - Intentional naming.
- private String _default; // NOSONAR - Intentional naming.
+ private List<Object> enum_ = list();
+ private String default_;
private String description;
/**
@@ -90,9 +90,9 @@ public class ServerVariable extends OpenApiElement {
public ServerVariable(ServerVariable copyFrom) {
super(copyFrom);
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
- this._default = copyFrom._default;
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
+ this.default_ = copyFrom.default_;
this.description = copyFrom.description;
}
@@ -108,12 +108,12 @@ public class ServerVariable extends OpenApiElement {
* <li><code>String</code> - JSON array representation of
<code>Collection<Object></code>
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"['foo','bar']"</js>);
+ * enum_(<js>"['foo','bar']"</js>);
* </p>
* <li><code>String</code> - Individual values
* <h5 class='figure'>Example:</h5>
* <p class='bcode'>
- * _enum(<js>"foo"</js>, <js>"bar"</js>);
+ * enum_(<js>"foo"</js>, <js>"bar"</js>);
* </p>
* </ul>
* <br>Ignored if <jk>null</jk>.
@@ -123,7 +123,7 @@ public class ServerVariable extends OpenApiElement {
if (nn(values))
for (var v : values)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -162,7 +162,7 @@ public class ServerVariable extends OpenApiElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public String getDefault() { return _default; }
+ public String getDefault() { return default_; }
/**
* Bean property getter: <property>description</property>.
@@ -187,15 +187,15 @@ public class ServerVariable extends OpenApiElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public List<Object> getEnum() { return nullIfEmpty(_enum); }
+ public List<Object> getEnum() { return nullIfEmpty(enum_); }
@Override /* Overridden from OpenApiElement */
public Set<String> keySet() {
// @formatter:off
var s = setb(String.class)
- .addIf(nn(_default),"default" )
+ .addIf(nn(default_),"default" )
.addIf(nn(description), "description")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(isNotEmpty(enum_), "enum")
.build();
// @formatter:on
return new MultiSet<>(s, super.keySet());
@@ -235,7 +235,7 @@ public class ServerVariable extends OpenApiElement {
* @return This object
*/
public ServerVariable setDefault(String value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -272,9 +272,9 @@ public class ServerVariable extends OpenApiElement {
* @return This object
*/
public ServerVariable setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index 06ce2b70ab..9d9ea2a833 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -88,8 +88,8 @@ public class HeaderInfo extends SwaggerElement {
private Integer maxLength, minLength, maxItems, minItems;
private Boolean exclusiveMaximum, exclusiveMinimum, uniqueItems;
private Items items;
- private Object _default; // NOSONAR - Intentional naming.
- private Set<Object> _enum = new LinkedHashSet<>(); // NOSONAR -
Intentional naming.
+ private Object default_;
+ private Set<Object> enum_ = new LinkedHashSet<>();
private Object example;
/**
@@ -106,10 +106,10 @@ public class HeaderInfo extends SwaggerElement {
super(copyFrom);
this.collectionFormat = copyFrom.collectionFormat;
- this._default = copyFrom._default;
+ this.default_ = copyFrom.default_;
this.description = copyFrom.description;
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
this.example = copyFrom.example;
this.exclusiveMaximum = copyFrom.exclusiveMaximum;
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
@@ -140,7 +140,7 @@ public class HeaderInfo extends SwaggerElement {
if (nn(value))
for (var v : value)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -206,7 +206,7 @@ public class HeaderInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>description</property>.
@@ -223,7 +223,7 @@ public class HeaderInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Set<Object> getEnum() { return nullIfEmpty(_enum); }
+ public Set<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>example</property>.
@@ -352,9 +352,9 @@ public class HeaderInfo extends SwaggerElement {
// @formatter:off
var s = setb(String.class)
.addIf(nn(collectionFormat), "collectionFormat")
- .addIf(nn(_default), "default")
+ .addIf(nn(default_), "default")
.addIf(nn(description), "description")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(example), "example")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
.addIf(nn(exclusiveMinimum), "exclusiveMinimum")
@@ -481,7 +481,7 @@ public class HeaderInfo extends SwaggerElement {
* @return This object.
*/
public HeaderInfo setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -510,9 +510,9 @@ public class HeaderInfo extends SwaggerElement {
* @return This object.
*/
public HeaderInfo setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
index 7d75710e07..0fba5a81e3 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -87,8 +87,8 @@ public class Items extends SwaggerElement {
private Integer maxLength, minLength, maxItems, minItems;
private Boolean exclusiveMaximum, exclusiveMinimum, uniqueItems;
private Items items; // NOSONAR - Intentional naming.
- private Object _default; // NOSONAR - Intentional naming.
- private Set<Object> _enum = new LinkedHashSet<>(); // NOSONAR -
Intentional naming.
+ private Object default_;
+ private Set<Object> enum_ = new LinkedHashSet<>();
/**
* Default constructor.
@@ -104,9 +104,9 @@ public class Items extends SwaggerElement {
super(copyFrom);
this.collectionFormat = copyFrom.collectionFormat;
- this._default = copyFrom._default;
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
+ this.default_ = copyFrom.default_;
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
this.exclusiveMaximum = copyFrom.exclusiveMaximum;
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
this.format = copyFrom.format;
@@ -136,7 +136,7 @@ public class Items extends SwaggerElement {
if (nn(value))
for (var v : value)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -200,14 +200,14 @@ public class Items extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>enum</property>.
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Set<Object> getEnum() { return nullIfEmpty(_enum); }
+ public Set<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>exclusiveMaximum</property>.
@@ -329,8 +329,8 @@ public class Items extends SwaggerElement {
// @formatter:off
var s = setb(String.class)
.addIf(nn(collectionFormat), "collectionFormat")
- .addIf(nn(_default), "default")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(nn(default_), "default")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
.addIf(nn(exclusiveMinimum), "exclusiveMinimum")
.addIf(nn(format), "format")
@@ -454,7 +454,7 @@ public class Items extends SwaggerElement {
* @return This object.
*/
public Items setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -467,9 +467,9 @@ public class Items extends SwaggerElement {
* @return This object.
*/
public Items setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index 22cf6da2c5..2930b0c2d3 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -132,8 +132,8 @@ public class ParameterInfo extends SwaggerElement {
private Boolean required, allowEmptyValue, exclusiveMaximum,
exclusiveMinimum, uniqueItems;
private SchemaInfo schema;
private Items items;
- private Object _default; // NOSONAR - Intentional naming.
- private Set<Object> _enum = new LinkedHashSet<>(); // NOSONAR -
Intentional naming.
+ private Object default_;
+ private Set<Object> enum_ = new LinkedHashSet<>();
private Object example;
private Map<String,String> examples;
@@ -152,10 +152,10 @@ public class ParameterInfo extends SwaggerElement {
this.allowEmptyValue = copyFrom.allowEmptyValue;
this.collectionFormat = copyFrom.collectionFormat;
- this._default = copyFrom._default;
+ this.default_ = copyFrom.default_;
this.description = copyFrom.description;
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
this.example = copyFrom.example;
this.exclusiveMaximum = copyFrom.exclusiveMaximum;
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
@@ -191,7 +191,7 @@ public class ParameterInfo extends SwaggerElement {
if (nn(value))
for (var v : value)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -256,10 +256,10 @@ public class ParameterInfo extends SwaggerElement {
schema = p.schema;
if (nn(p.items))
items = p.items;
- if (nn(p._default))
- _default = p._default;
- if (nn(p._enum))
- _enum = p._enum;
+ if (nn(p.default_))
+ default_ = p.default_;
+ if (nn(p.enum_))
+ enum_ = p.enum_;
if (nn(p.example))
example = p.example;
if (nn(p.examples))
@@ -337,7 +337,7 @@ public class ParameterInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>description</property>.
@@ -354,7 +354,7 @@ public class ParameterInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Set<Object> getEnum() { return nullIfEmpty(_enum); }
+ public Set<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>example</property>.
@@ -540,9 +540,9 @@ public class ParameterInfo extends SwaggerElement {
var s = setb(String.class)
.addIf(nn(allowEmptyValue), "allowEmptyValue")
.addIf(nn(collectionFormat), "collectionFormat")
- .addIf(nn(_default), "default")
+ .addIf(nn(default_), "default")
.addIf(nn(description), "description")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(example), "example")
.addIf(nn(examples), "examples")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
@@ -688,7 +688,7 @@ public class ParameterInfo extends SwaggerElement {
* @return This object.
*/
public ParameterInfo setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -718,9 +718,9 @@ public class ParameterInfo extends SwaggerElement {
* @return This object.
*/
public ParameterInfo setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index dabb7ea761..3450de04ca 100644
---
a/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-swagger-v2/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -102,12 +102,12 @@ public class SchemaInfo extends SwaggerElement {
private Number multipleOf, maximum, minimum;
private Integer maxLength, minLength, maxItems, minItems,
maxProperties, minProperties;
private Boolean exclusiveMaximum, exclusiveMinimum, uniqueItems,
readOnly, required;
- private Object _default, // NOSONAR - Intentional naming.
+ private Object default_,
example;
private Items items;
private Xml xml;
private ExternalDocumentation externalDocs;
- private Set<Object> _enum = new LinkedHashSet<>(); // NOSONAR -
Intentional naming.
+ private Set<Object> enum_ = new LinkedHashSet<>();
private Set<SchemaInfo> allOf = new LinkedHashSet<>();
private Set<String> requiredProperties = new LinkedHashSet<>();
private Map<String,SchemaInfo> properties = map();
@@ -129,11 +129,11 @@ public class SchemaInfo extends SwaggerElement {
this.additionalProperties = copyFrom.additionalProperties ==
null ? null : copyFrom.additionalProperties.copy();
if (nn(copyFrom.allOf))
this.allOf.addAll(copyOf(copyFrom.allOf,
SchemaInfo::copy));
- this._default = copyFrom._default;
+ this.default_ = copyFrom.default_;
this.description = copyFrom.description;
this.discriminator = copyFrom.discriminator;
- if (nn(copyFrom._enum))
- this._enum.addAll(copyOf(copyFrom._enum));
+ if (nn(copyFrom.enum_))
+ this.enum_.addAll(copyOf(copyFrom.enum_));
this.example = copyFrom.example;
this.exclusiveMaximum = copyFrom.exclusiveMaximum;
this.exclusiveMinimum = copyFrom.exclusiveMinimum;
@@ -211,7 +211,7 @@ public class SchemaInfo extends SwaggerElement {
*/
public SchemaInfo addEnum(Collection<Object> values) {
if (nn(values))
- _enum.addAll(values);
+ enum_.addAll(values);
return this;
}
@@ -227,7 +227,7 @@ public class SchemaInfo extends SwaggerElement {
if (nn(value))
for (var v : value)
if (nn(v))
- _enum.add(v);
+ enum_.add(v);
return this;
}
@@ -351,7 +351,7 @@ public class SchemaInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Object getDefault() { return _default; }
+ public Object getDefault() { return default_; }
/**
* Bean property getter: <property>description</property>.
@@ -372,7 +372,7 @@ public class SchemaInfo extends SwaggerElement {
*
* @return The property value, or <jk>null</jk> if it is not set.
*/
- public Set<Object> getEnum() { return nullIfEmpty(_enum); }
+ public Set<Object> getEnum() { return nullIfEmpty(enum_); }
/**
* Bean property getter: <property>example</property>.
@@ -559,10 +559,10 @@ public class SchemaInfo extends SwaggerElement {
var s = setb(String.class)
.addIf(nn(additionalProperties), "additionalProperties")
.addIf(isNotEmpty(allOf), "allOf")
- .addIf(nn(_default), "default")
+ .addIf(nn(default_), "default")
.addIf(nn(description), "description")
.addIf(nn(discriminator), "discriminator")
- .addIf(isNotEmpty(_enum), "enum")
+ .addIf(isNotEmpty(enum_), "enum")
.addIf(nn(example), "example")
.addIf(nn(exclusiveMaximum), "exclusiveMaximum")
.addIf(nn(exclusiveMinimum), "exclusiveMinimum")
@@ -726,7 +726,7 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setDefault(Object value) {
- _default = value;
+ default_ = value;
return this;
}
@@ -766,9 +766,9 @@ public class SchemaInfo extends SwaggerElement {
* @return This object.
*/
public SchemaInfo setEnum(Collection<Object> value) {
- _enum.clear();
+ enum_.clear();
if (nn(value))
- _enum.addAll(value);
+ enum_.addAll(value);
return this;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
index ee2075059f..4c5a4a75d5 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Items.java
@@ -42,8 +42,8 @@ import org.apache.juneau.oapi.*;
* collectionFormat=<js>"csv"</js>,
* items=<ja>@Items</ja>(
* type=<js>"string"</js>,
- * _enum=<js>"AVAILABLE,PENDING,SOLD"</js>,
- * _default=<js>"AVAILABLE"</js>
+ * enum_=<js>"AVAILABLE,PENDING,SOLD"</js>,
+ * default_=<js>"AVAILABLE"</js>
* )
* )
* )
@@ -87,7 +87,7 @@ public @interface Items {
*
* @return The annotation value.
*/
- String[] _default() default {};
+ String[] default_() default {};
/**
* <mk>enum</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#itemsObject";>Swagger Items Object</a>.
@@ -99,7 +99,7 @@ public @interface Items {
*
* @return The annotation value.
*/
- String[] _enum() default {};
+ String[] enum_() default {};
/**
* <mk>$ref</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#itemsObject";>Swagger Items Object</a>.
@@ -141,14 +141,14 @@ public @interface Items {
String[] description() default {};
/**
- * Synonym for {@link #_default()}.
+ * Synonym for {@link #default_()}.
*
* @return The annotation value.
*/
String[] df() default {};
/**
- * Synonym for {@link #_enum()}.
+ * Synonym for {@link #enum_()}.
*
* @return The annotation value.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
index b00b0332d3..95cfbc4cd7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/ItemsAnnotation.java
@@ -41,7 +41,7 @@ public class ItemsAnnotation {
private long maxItems = -1, maxLength = -1, maxi = -1, maxl =
-1, minItems = -1, minLength = -1, mini = -1, minl = -1;
private String $ref = "", cf = "", collectionFormat = "", f =
"", format = "", max = "", maximum = "", min = "", minimum = "", mo = "",
multipleOf = "", p = "", pattern = "", t = "",
type = "";
- private String[] _default = {}, _enum = {}, df = {}, e = {};
+ private String[] default_ = {}, enum_ = {}, df = {}, e = {};
private SubItems items = SubItemsAnnotation.DEFAULT;
/**
@@ -52,24 +52,24 @@ public class ItemsAnnotation {
}
/**
- * Sets the {@link Items#_default} property on this annotation.
+ * Sets the {@link Items#default_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _default(String...value) {
- this._default = value;
+ public Builder default_(String...value) {
+ this.default_ = value;
return this;
}
/**
- * Sets the {@link Items#_enum} property on this annotation.
+ * Sets the {@link Items#enum_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _enum(String...value) {
- this._enum = value;
+ public Builder enum_(String...value) {
+ this.enum_ = value;
return this;
}
@@ -453,15 +453,15 @@ public class ItemsAnnotation {
private final boolean emax, emin, exclusiveMaximum,
exclusiveMinimum, ui, uniqueItems;
private final long maxi, maxItems, maxl, maxLength, mini,
minItems, minl, minLength;
private final String $ref, cf, collectionFormat, f, format,
max, maximum, min, minimum, mo, multipleOf, p, pattern, t, type;
- private final String[] _default, _enum, df, e;
+ private final String[] default_, enum_, df, e;
private final SubItems items;
Object(ItemsAnnotation.Builder b) {
super(b);
description = copyOf(b.description);
$ref = b.$ref;
- _default = copyOf(b._default);
- _enum = copyOf(b._enum);
+ default_ = copyOf(b.default_);
+ enum_ = copyOf(b.enum_);
cf = b.cf;
collectionFormat = b.collectionFormat;
df = copyOf(b.df);
@@ -496,13 +496,13 @@ public class ItemsAnnotation {
}
@Override /* Overridden from Items */
- public String[] _default() {
- return _default;
+ public String[] default_() {
+ return default_;
}
@Override /* Overridden from Items */
- public String[] _enum() {
- return _enum;
+ public String[] enum_() {
+ return enum_;
}
@Override /* Overridden from Items */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
index 8b0cafdbc5..7a78febe0d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
@@ -113,12 +113,12 @@ public @interface Schema {
* <h5 class='section'>Examples:</h5>
* <p class='bjava'>
* <jc>// A constant string value</jc>
- * <ja>@Schema</ja>(_const=<js>"fixed-value"</js>)
+ * <ja>@Schema</ja>(const_=<js>"fixed-value"</js>)
* <jk>public</jk> String getStatus() {...}
* </p>
* <p class='bjava'>
* <jc>// A constant numeric value</jc>
- * <ja>@Schema</ja>(_const=<js>"42"</js>)
+ * <ja>@Schema</ja>(const_=<js>"42"</js>)
* <jk>public int</jk> getMagicNumber() {...}
* </p>
*
@@ -138,7 +138,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _const() default {};
+ String[] const_() default {};
/**
* <mk>default</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#schemaObject";>Swagger Schema
Object</a>.
@@ -159,15 +159,15 @@ public @interface Schema {
* <p class='bjava'>
* <jk>public</jk> Order placeOrder(
* <ja>@Header</ja>(<js>"X-PetId"</js>)
- * <ja>@Schema</ja>(_default=<js>"100"</js>)
+ * <ja>@Schema</ja>(default_=<js>"100"</js>)
* <jk>long</jk> <jv>petId</jv>,
*
* <ja>@Header</ja>(<js>"X-AdditionalInfo"</js>)
- * <ja>@Schema</ja>(format=<js>"uon"</js>,
_default=<js>"(rushOrder=false)"</js>)
+ * <ja>@Schema</ja>(format=<js>"uon"</js>,
default_=<js>"(rushOrder=false)"</js>)
* AdditionalInfo <jv>additionalInfo</jv>,
*
* <ja>@Header</ja>(<js>"X-Flags"</js>)
- * <ja>@Schema</ja>(collectionFormat=<js>"uon"</js>,
_default=<js>"@(new-customer)"</js>)
+ * <ja>@Schema</ja>(collectionFormat=<js>"uon"</js>,
default_=<js>"@(new-customer)"</js>)
* String[] <jv>flags</jv>
* ) {...}
* </p>
@@ -184,7 +184,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _default() default {};
+ String[] default_() default {};
/**
* <mk>else</mk> field of the JSON Schema.
@@ -209,7 +209,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _else() default {};
+ String[] else_() default {};
/**
* <mk>enum</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#schemaObject";>Swagger Schema
Object</a>.
@@ -231,7 +231,7 @@ public @interface Schema {
* <jc>// Comma-delimited list</jc>
* <jk>public</jk> Collection<Pet> findPetsByStatus(
* <ja>@Header</ja>(<js>"X-Status"</js>)
- *
<ja>@Schema</ja>(_enum=<js>"AVAILABLE,PENDING,SOLD"</js>)
+ *
<ja>@Schema</ja>(enum_=<js>"AVAILABLE,PENDING,SOLD"</js>)
* PetStatus <jv>status</jv>
* ) {...}
* </p>
@@ -248,7 +248,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _enum() default {};
+ String[] enum_() default {};
/**
* <mk>if</mk> field of the JSON Schema.
@@ -273,7 +273,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _if() default {};
+ String[] if_() default {};
/**
* <mk>then</mk> field of the JSON Schema.
@@ -298,7 +298,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- String[] _then() default {};
+ String[] then_() default {};
/**
* <mk>$comment</mk> field of the JSON Schema.
@@ -691,7 +691,7 @@ public @interface Schema {
String[] description() default {};
/**
- * Synonym for {@link #_default()}.
+ * Synonym for {@link #default_()}.
*
* @return The annotation value.
*/
@@ -711,7 +711,7 @@ public @interface Schema {
String discriminator() default "";
/**
- * Synonym for {@link #_enum()}.
+ * Synonym for {@link #enum_()}.
*
* @return The annotation value.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index bb118c2fd4..982e8631cc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -94,11 +94,11 @@ public class SchemaAnnotation {
private long maxi = -1, maxItems = -1, maxl = -1, maxLength =
-1, maxp = -1, maxProperties = -1, mini = -1, minItems = -1, minl = -1,
minLength = -1, minp = -1, minProperties = -1;
private String $ref = "", cf = "", collectionFormat = "",
discriminator = "", f = "", format = "", max = "", maximum = "", min = "",
minimum = "", mo = "", multipleOf = "", p = "",
pattern = "", t = "", title = "", type = "";
- private String[] _default = {}, _enum = {},
additionalProperties = {}, allOf = {}, d = {}, description = {}, df = {}, e =
{}, properties = {}, xml = {};
+ private String[] default_ = {}, enum_ = {},
additionalProperties = {}, allOf = {}, d = {}, description = {}, df = {}, e =
{}, properties = {}, xml = {};
private boolean deprecatedProperty;
private String $id = "", contentMediaType = "", contentEncoding
= "", exclusiveMaximumValue = "", exclusiveMinimumValue = "";
- private String[] _const = {}, examples = {}, $comment = {},
prefixItems = {}, unevaluatedItems = {}, unevaluatedProperties = {},
dependentSchemas = {}, dependentRequired = {}, _if = {},
- _then = {}, _else = {}, $defs = {};
+ private String[] const_ = {}, examples = {}, $comment = {},
prefixItems = {}, unevaluatedItems = {}, unevaluatedProperties = {},
dependentSchemas = {}, dependentRequired = {}, if_ = {},
+ then_ = {}, else_ = {}, $defs = {};
/**
* Constructor.
@@ -108,68 +108,68 @@ public class SchemaAnnotation {
}
/**
- * Sets the {@link Schema#_const} property on this annotation.
+ * Sets the {@link Schema#const_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _const(String...value) {
- this._const = value;
+ public Builder const_(String...value) {
+ this.const_ = value;
return this;
}
/**
- * Sets the {@link Schema#_default} property on this annotation.
+ * Sets the {@link Schema#default_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _default(String...value) {
- this._default = value;
+ public Builder default_(String...value) {
+ this.default_ = value;
return this;
}
/**
- * Sets the {@link Schema#_else} property on this annotation.
+ * Sets the {@link Schema#else_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _else(String...value) {
- this._else = value;
+ public Builder else_(String...value) {
+ this.else_ = value;
return this;
}
/**
- * Sets the {@link Schema#_enum} property on this annotation.
+ * Sets the {@link Schema#enum_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _enum(String...value) {
- this._enum = value;
+ public Builder enum_(String...value) {
+ this.enum_ = value;
return this;
}
/**
- * Sets the {@link Schema#_if} property on this annotation.
+ * Sets the {@link Schema#if_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _if(String...value) {
- this._if = value;
+ public Builder if_(String...value) {
+ this.if_ = value;
return this;
}
/**
- * Sets the {@link Schema#_then} property on this annotation.
+ * Sets the {@link Schema#then_} property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _then(String...value) {
- this._then = value;
+ public Builder then_(String...value) {
+ this.then_ = value;
return this;
}
@@ -998,18 +998,18 @@ public class SchemaAnnotation {
private final Items items;
private final long maxLength, maxl, minLength, minl, maxItems,
maxi, minItems, mini, maxProperties, maxp, minProperties, minp;
private final String $ref, format, f, title, multipleOf, mo,
maximum, max, minimum, min, pattern, p, type, t, collectionFormat, cf,
discriminator;
- private final String[] d, _default, df, _enum, e, allOf,
properties, additionalProperties, xml;
+ private final String[] d, default_, df, enum_, e, allOf,
properties, additionalProperties, xml;
// JSON Schema Draft 2020-12 fields
private final boolean deprecatedProperty;
private final String $id, contentMediaType, contentEncoding,
exclusiveMaximumValue, exclusiveMinimumValue;
- private final String[] _const, examples, $comment, prefixItems,
unevaluatedItems, unevaluatedProperties, dependentSchemas, dependentRequired,
_if, _then, _else, $defs;
+ private final String[] const_, examples, $comment, prefixItems,
unevaluatedItems, unevaluatedProperties, dependentSchemas, dependentRequired,
if_, then_, else_, $defs;
Object(SchemaAnnotation.Builder b) {
super(b);
description = copyOf(b.description);
$ref = b.$ref;
- _default = copyOf(b._default);
- _enum = copyOf(b._enum);
+ default_ = copyOf(b.default_);
+ enum_ = copyOf(b.enum_);
additionalProperties = copyOf(b.additionalProperties);
allOf = copyOf(b.allOf);
aev = b.aev;
@@ -1068,7 +1068,7 @@ public class SchemaAnnotation {
contentEncoding = b.contentEncoding;
exclusiveMaximumValue = b.exclusiveMaximumValue;
exclusiveMinimumValue = b.exclusiveMinimumValue;
- _const = copyOf(b._const);
+ const_ = copyOf(b.const_);
examples = copyOf(b.examples);
$comment = copyOf(b.$comment);
prefixItems = copyOf(b.prefixItems);
@@ -1076,40 +1076,40 @@ public class SchemaAnnotation {
unevaluatedProperties = copyOf(b.unevaluatedProperties);
dependentSchemas = copyOf(b.dependentSchemas);
dependentRequired = copyOf(b.dependentRequired);
- _if = copyOf(b._if);
- _then = copyOf(b._then);
- _else = copyOf(b._else);
+ if_ = copyOf(b.if_);
+ then_ = copyOf(b.then_);
+ else_ = copyOf(b.else_);
$defs = copyOf(b.$defs);
}
@Override /* Overridden from Schema */
- public String[] _const() {
- return _const;
+ public String[] const_() {
+ return const_;
}
@Override /* Overridden from Schema */
- public String[] _default() {
- return _default;
+ public String[] default_() {
+ return default_;
}
@Override /* Overridden from Schema */
- public String[] _else() {
- return _else;
+ public String[] else_() {
+ return else_;
}
@Override /* Overridden from Schema */
- public String[] _enum() {
- return _enum;
+ public String[] enum_() {
+ return enum_;
}
@Override /* Overridden from Schema */
- public String[] _if() {
- return _if;
+ public String[] if_() {
+ return if_;
}
@Override /* Overridden from Schema */
- public String[] _then() {
- return _then;
+ public String[] then_() {
+ return then_;
}
@Override /* Overridden from Schema */
@@ -1484,10 +1484,10 @@ public class SchemaAnnotation {
.appendIf(nem, "additionalProperties",
parseMap(a.additionalProperties()))
.appendIf(ne, "allOf", joinnl(a.allOf()))
.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf())
- .appendIf(ne, "default", joinnl(a._default(), a.df()))
+ .appendIf(ne, "default", joinnl(a.default_(), a.df()))
.appendIf(ne, "discriminator", a.discriminator())
.appendIf(ne, "description", joinnl(a.description(),
a.d()))
- .appendFirst(nec, "enum", parseSet(a._enum()),
parseSet(a.e()))
+ .appendFirst(nec, "enum", parseSet(a.enum_()),
parseSet(a.e()))
// Handle exclusiveMaximum with Draft 2020-12 fallback
.appendIf(ne, "exclusiveMaximum",
ne.test(a.exclusiveMaximumValue()) ?
a.exclusiveMaximumValue() :
@@ -1519,7 +1519,7 @@ public class SchemaAnnotation {
.appendIf(ne, "xml", joinnl(a.xml()))
.appendIf(ne, "$ref", a.$ref())
// JSON Schema Draft 2020-12 properties
- .appendIf(ne, "const", joinnl(a._const()))
+ .appendIf(ne, "const", joinnl(a.const_()))
.appendIf(nec, "examples", a.examples().length == 0 ?
null : l(a.examples()))
.appendIf(ne, "$comment", joinnl(a.$comment()))
.appendIf(nf, "deprecated", a.deprecatedProperty())
@@ -1530,9 +1530,9 @@ public class SchemaAnnotation {
.appendIf(ne, "unevaluatedProperties",
joinnl(a.unevaluatedProperties()))
.appendIf(ne, "dependentSchemas",
joinnl(a.dependentSchemas()))
.appendIf(ne, "dependentRequired",
joinnl(a.dependentRequired()))
- .appendIf(ne, "if", joinnl(a._if()))
- .appendIf(ne, "then", joinnl(a._then()))
- .appendIf(ne, "else", joinnl(a._else()))
+ .appendIf(ne, "if", joinnl(a.if_()))
+ .appendIf(ne, "then", joinnl(a.then_()))
+ .appendIf(ne, "else", joinnl(a.else_()))
.appendIf(ne, "$defs", joinnl(a.$defs()))
.appendIf(ne, "$id", a.$id())
;
@@ -1586,7 +1586,7 @@ public class SchemaAnnotation {
Predicate<Map<?,?>> nem = Utils::isNotEmpty;
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Long> nm1 = Utils::isNotMinusOne;
- return m.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf()).appendIf(ne, "default", joinnl(a._default(),
a.df())).appendFirst(nec, "enum", parseSet(a._enum()), parseSet(a.e()))
+ return m.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf()).appendIf(ne, "default", joinnl(a.default_(),
a.df())).appendFirst(nec, "enum", parseSet(a.enum_()), parseSet(a.e()))
.appendFirst(ne, "format", a.format(),
a.f()).appendIf(nf, "exclusiveMaximum", a.exclusiveMaximum() ||
a.emax()).appendIf(nf, "exclusiveMinimum", a.exclusiveMinimum() || a.emin())
.appendIf(nem, "items",
SubItemsAnnotation.merge(m.getMap("items"), a.items())).appendFirst(ne,
"maximum", a.maximum(), a.max()).appendFirst(nm1, "maxItems", a.maxItems(),
a.maxi())
.appendFirst(nm1, "maxLength", a.maxLength(),
a.maxl()).appendFirst(ne, "minimum", a.minimum(), a.min()).appendFirst(nm1,
"minItems", a.minItems(), a.mini())
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
index bcb4204f85..db862121eb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItems.java
@@ -50,7 +50,7 @@ public @interface SubItems {
*
* @return The annotation value.
*/
- String[] _default() default {};
+ String[] default_() default {};
/**
* <mk>enum</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#itemsObject";>Swagger Items Object</a>.
@@ -62,7 +62,7 @@ public @interface SubItems {
*
* @return The annotation value.
*/
- String[] _enum() default {};
+ String[] enum_() default {};
/**
* <mk>$ref</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#itemsObject";>Swagger Items Object</a>.
@@ -104,14 +104,14 @@ public @interface SubItems {
String[] description() default {};
/**
- * Synonym for {@link #_default()}.
+ * Synonym for {@link #default_()}.
*
* @return The annotation value.
*/
String[] df() default {};
/**
- * Synonym for {@link #_enum()}.
+ * Synonym for {@link #enum_()}.
*
* @return The annotation value.
*/
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
index 479b32d350..4ec26f422c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SubItemsAnnotation.java
@@ -47,7 +47,7 @@ public class SubItemsAnnotation {
type = "";
private long maxItems = -1, maxLength = -1, maxi = -1, maxl =
-1, minItems = -1, minLength = -1, mini = -1, minl = -1;
private boolean emax, emin, exclusiveMaximum, exclusiveMinimum,
ui, uniqueItems;
- private String[] _default = {}, _enum = {}, df = {}, e = {},
items = {};
+ private String[] default_ = {}, enum_ = {}, df = {}, e = {},
items = {};
/**
* Constructor.
@@ -57,24 +57,24 @@ public class SubItemsAnnotation {
}
/**
- * Sets the <c>_default</c> property on this annotation.
+ * Sets the <c>default_</c> property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _default(String...value) {
- this._default = value;
+ public Builder default_(String...value) {
+ this.default_ = value;
return this;
}
/**
- * Sets the <c>_enum</c> property on this annotation.
+ * Sets the <c>enum_</c> property on this annotation.
*
* @param value The new value for this property.
* @return This object.
*/
- public Builder _enum(String...value) {
- this._enum = value;
+ public Builder enum_(String...value) {
+ this.enum_ = value;
return this;
}
@@ -458,14 +458,14 @@ public class SubItemsAnnotation {
private final boolean emax, emin, exclusiveMaximum,
exclusiveMinimum, ui, uniqueItems;
private final long maxi, maxItems, maxl, maxLength, mini,
minItems, minl, minLength;
private final String $ref, cf, collectionFormat, f, format,
max, maximum, min, minimum, mo, multipleOf, p, pattern, t, type;
- private final String[] _default, _enum, df, e, items;
+ private final String[] default_, enum_, df, e, items;
Object(SubItemsAnnotation.Builder b) {
super(b);
description = copyOf(b.description);
$ref = b.$ref;
- _default = copyOf(b._default);
- _enum = copyOf(b._enum);
+ default_ = copyOf(b.default_);
+ enum_ = copyOf(b.enum_);
cf = b.cf;
collectionFormat = b.collectionFormat;
df = copyOf(b.df);
@@ -500,13 +500,13 @@ public class SubItemsAnnotation {
}
@Override /* Overridden from SubItems */
- public String[] _default() {
- return _default;
+ public String[] default_() {
+ return default_;
}
@Override /* Overridden from SubItems */
- public String[] _enum() {
- return _enum;
+ public String[] enum_() {
+ return enum_;
}
@Override /* Overridden from SubItems */
@@ -716,8 +716,8 @@ public class SubItemsAnnotation {
// @formatter:off
return om
.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf())
- .appendIf(ne, "default", joinnl(a._default(), a.df()))
- .appendFirst(nec, "enum", parseSet(a._enum()),
parseSet(a.e()))
+ .appendIf(ne, "default", joinnl(a.default_(), a.df()))
+ .appendFirst(nec, "enum", parseSet(a.enum_()),
parseSet(a.e()))
.appendIf(nf, "exclusiveMaximum", a.exclusiveMaximum()
|| a.emax())
.appendIf(nf, "exclusiveMinimum", a.exclusiveMinimum()
|| a.emin())
.appendFirst(ne, "format", a.format(), a.f())
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index 9036e3e059..aa4bccc83f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -90,9 +90,9 @@ public class HttpPartSchema {
* Builder class.
*/
public static class Builder {
- String name, _default;
+ String name, default_;
Set<Integer> codes;
- Set<String> _enum;
+ Set<String> enum_;
Boolean allowEmptyValue, exclusiveMaximum, exclusiveMinimum,
required, uniqueItems, skipIfEmpty;
HttpPartCollectionFormat collectionFormat =
HttpPartCollectionFormat.NO_COLLECTION_FORMAT;
HttpPartDataType type = HttpPartDataType.NO_TYPE;
@@ -106,7 +106,7 @@ public class HttpPartSchema {
Class<? extends HttpPartParser> parser;
Class<? extends HttpPartSerializer> serializer;
// JSON Schema Draft 2020-12 properties
- String _const;
+ String const_;
String[] examples;
Boolean deprecated;
Number exclusiveMaximumValue, exclusiveMinimumValue;
@@ -122,8 +122,8 @@ public class HttpPartSchema {
* The new value for this property.
* @return This object.
*/
- public Builder _const(String value) {
- this._const = value;
+ public Builder const_(String value) {
+ this.const_ = value;
return this;
}
@@ -148,9 +148,9 @@ public class HttpPartSchema {
* <br>Ignored if value is <jk>null</jk>.
* @return This object.
*/
- public Builder _default(String value) {
+ public Builder default_(String value) {
if (isNotEmpty(value))
- this._default = value;
+ this.default_ = value;
return this;
}
@@ -174,25 +174,25 @@ public class HttpPartSchema {
* <br>Ignored if value is <jk>null</jk> or an empty set.
* @return This object.
*/
- public Builder _enum(Set<String> value) {
+ public Builder enum_(Set<String> value) {
if (nn(value) && ! value.isEmpty())
- this._enum = value;
+ this.enum_ = value;
return this;
}
/**
- * <mk>_enum</mk> field.
+ * <mk>enum</mk> field.
*
* <p>
- * Same as {@link #_enum(Set)} but takes in a var-args array.
+ * Same as {@link #enum_(Set)} but takes in a var-args array.
*
* @param values
* The new values for this property.
* <br>Ignored if value is empty.
* @return This object.
*/
- public Builder _enum(String...values) {
- return _enum(set(values));
+ public Builder enum_(String...values) {
+ return enum_(set(values));
}
/**
@@ -644,36 +644,36 @@ public class HttpPartSchema {
}
/**
- * Synonym for {@link #_default(String)}.
+ * Synonym for {@link #default_(String)}.
*
* @param value
* The new value for this property.
* @return This object.
*/
public Builder df(String value) {
- return _default(value);
+ return default_(value);
}
/**
- * Synonym for {@link #_enum(Set)}.
+ * Synonym for {@link #enum_(Set)}.
*
* @param value
* The new value for this property.
* @return This object.
*/
public Builder e(Set<String> value) {
- return _enum(value);
+ return enum_(value);
}
/**
- * Synonym for {@link #_enum(String...)}.
+ * Synonym for {@link #enum_(String...)}.
*
* @param values
* The new values for this property.
* @return This object.
*/
public Builder e(String...values) {
- return _enum(values);
+ return enum_(values);
}
/**
@@ -2574,7 +2574,7 @@ public class HttpPartSchema {
Builder apply(Content a) {
if (! SchemaAnnotation.empty(a.schema()))
apply(a.schema());
- _default(a.def());
+ default_(a.def());
return this;
}
@@ -2582,7 +2582,7 @@ public class HttpPartSchema {
if (! SchemaAnnotation.empty(a.schema()))
apply(a.schema());
name(firstNonEmpty(a.name(), a.value()));
- _default(a.def());
+ default_(a.def());
parser(a.parser());
serializer(a.serializer());
return this;
@@ -2602,15 +2602,15 @@ public class HttpPartSchema {
if (! SchemaAnnotation.empty(a.schema()))
apply(a.schema());
name(firstNonEmpty(a.name(), a.value()));
- _default(a.def());
+ default_(a.def());
parser(a.parser());
serializer(a.serializer());
return this;
}
Builder apply(Items a) {
- _default(joinnlOrNull(a._default(), a.df()));
- _enum(toSet(a._enum(), a.e()));
+ default_(joinnlOrNull(a.default_(), a.df()));
+ enum_(toSet(a.enum_(), a.e()));
collectionFormat(firstNonEmpty(a.collectionFormat(),
a.cf()));
exclusiveMaximum(a.exclusiveMaximum() || a.emax());
exclusiveMinimum(a.exclusiveMinimum() || a.emin());
@@ -2635,8 +2635,8 @@ public class HttpPartSchema {
Builder apply(JsonMap m) {
if (nn(m) && ! m.isEmpty()) {
- _default(m.getString("default"));
-
_enum(HttpPartSchema.toSet(m.getString("enum")));
+ default_(m.getString("default"));
+
enum_(HttpPartSchema.toSet(m.getString("enum")));
allowEmptyValue(m.getBoolean("allowEmptyValue"));
exclusiveMaximum(m.getBoolean("exclusiveMaximum"));
exclusiveMinimum(m.getBoolean("exclusiveMinimum"));
@@ -2671,7 +2671,7 @@ public class HttpPartSchema {
name(firstNonEmpty(a.name(), a.value()));
String def = a.def();
if (ne(NONE, def))
- _default = def; // Set directly to allow empty
strings as valid defaults
+ default_ = def; // Set directly to allow empty
strings as valid defaults
parser(a.parser());
serializer(a.serializer());
@@ -2692,7 +2692,7 @@ public class HttpPartSchema {
apply(a.schema());
// PathRemainder is always "/*"
name("/*");
- _default(a.def());
+ default_(a.def());
parser(a.parser());
serializer(a.serializer());
@@ -2707,7 +2707,7 @@ public class HttpPartSchema {
if (! SchemaAnnotation.empty(a.schema()))
apply(a.schema());
name(firstNonEmpty(a.name(), a.value()));
- _default(a.def());
+ default_(a.def());
parser(a.parser());
serializer(a.serializer());
return this;
@@ -2728,8 +2728,8 @@ public class HttpPartSchema {
@SuppressWarnings("deprecation")
Builder apply(Schema a) {
- _default(joinnlOrNull(a._default(), a.df()));
- _enum(toSet(a._enum(), a.e()));
+ default_(joinnlOrNull(a.default_(), a.df()));
+ enum_(toSet(a.enum_(), a.e()));
additionalProperties(HttpPartSchema.toJsonMap(a.additionalProperties()));
allowEmptyValue(a.allowEmptyValue() || a.aev());
collectionFormat(firstNonEmpty(a.collectionFormat(),
a.cf()));
@@ -2769,7 +2769,7 @@ public class HttpPartSchema {
uniqueItems(a.uniqueItems() || a.ui());
// JSON Schema Draft 2020-12 properties
- _const(joinnlOrNull(a._const()));
+ const_(joinnlOrNull(a.const_()));
examples(a.examples());
deprecated(a.deprecatedProperty());
@@ -2782,8 +2782,8 @@ public class HttpPartSchema {
}
Builder apply(SubItems a) {
- _default(joinnlOrNull(a._default(), a.df()));
- _enum(toSet(a._enum(), a.e()));
+ default_(joinnlOrNull(a.default_(), a.df()));
+ enum_(toSet(a.enum_(), a.e()));
collectionFormat(firstNonEmpty(a.collectionFormat(),
a.cf()));
exclusiveMaximum(a.exclusiveMaximum() || a.emax());
exclusiveMinimum(a.exclusiveMinimum() || a.emin());
@@ -3587,8 +3587,8 @@ public class HttpPartSchema {
}
final String name;
- final String _default;
- final Set<String> _enum;
+ final String default_;
+ final Set<String> enum_;
final Map<String,HttpPartSchema> properties;
final boolean allowEmptyValue, exclusiveMaximum, exclusiveMinimum,
required, uniqueItems, skipIfEmpty;
final HttpPartCollectionFormat collectionFormat;
@@ -3606,7 +3606,7 @@ public class HttpPartSchema {
final ClassMeta<?> parsedType;
// JSON Schema Draft 2020-12 fields
- final String _const;
+ final String const_;
final String[] examples;
@@ -3616,8 +3616,8 @@ public class HttpPartSchema {
HttpPartSchema(Builder b) {
name = b.name;
- _default = b._default;
- _enum = copy(b._enum);
+ default_ = b.default_;
+ enum_ = copy(b.enum_);
properties = build(b.properties, b.noValidate);
allowEmptyValue = resolve(b.allowEmptyValue);
exclusiveMaximum = resolve(b.exclusiveMaximum);
@@ -3643,7 +3643,7 @@ public class HttpPartSchema {
parser = b.parser;
serializer = b.serializer;
// JSON Schema Draft 2020-12 fields
- _const = b._const;
+ const_ = b.const_;
examples = b.examples;
deprecated = resolve(b.deprecated);
exclusiveMaximumValue = b.exclusiveMaximumValue;
@@ -3721,7 +3721,7 @@ public class HttpPartSchema {
break;
}
case BOOLEAN: {
- notAllowed.addIf(! _enum.isEmpty(), "_enum")
+ notAllowed.addIf(! enum_.isEmpty(), "enum")
.addIf(nn(properties), "properties")
.addIf(nn(additionalProperties),
"additionalProperties")
.addIf(exclusiveMaximum,
"exclusiveMaximum")
@@ -3807,7 +3807,7 @@ public class HttpPartSchema {
errors.add("Cannot specify exclusiveMaximum with
maximum.");
if (exclusiveMinimum && minimum == null)
errors.add("Cannot specify exclusiveMinimum with
minimum.");
- if (required && nn(_default))
+ if (required && nn(default_))
errors.add("Cannot specify a default value on a
required value.");
if (nn(minLength) && nn(maxLength) && maxLength < minLength)
errors.add("maxLength cannot be less than minLength.");
@@ -3848,17 +3848,17 @@ public class HttpPartSchema {
* Returns the <c>default</c> field of this schema.
*
* @return The default value for this schema, or <jk>null</jk> if not
specified.
- * @see HttpPartSchema.Builder#_default(String)
+ * @see HttpPartSchema.Builder#default_(String)
*/
- public String getDefault() { return _default; }
+ public String getDefault() { return default_; }
/**
* Returns the <c>enum</c> field of this schema.
*
* @return The <c>enum</c> field of this schema, or <jk>null</jk> if
not specified.
- * @see HttpPartSchema.Builder#_enum(Set)
+ * @see HttpPartSchema.Builder#enum_(Set)
*/
- public Set<String> getEnum() { return _enum; }
+ public Set<String> getEnum() { return enum_; }
/**
* Returns the <c>format</c> field of this schema.
@@ -4132,8 +4132,8 @@ public class HttpPartSchema {
.appendIf(ne, "name", name)
.appendIf(ne, "type", type)
.appendIf(ne, "format", format)
- .appendIf(ne, "default", _default)
- .appendIf(ne, "enum", _enum)
+ .appendIf(ne, "default", default_)
+ .appendIf(ne, "enum", enum_)
.appendIf(ne, "properties", properties)
.appendIf(nf, "allowEmptyValue",
allowEmptyValue)
.appendIf(nf, "exclusiveMaximum",
exclusiveMaximum)
@@ -4177,11 +4177,11 @@ public class HttpPartSchema {
if (! isValidAllowEmpty(in))
throw new SchemaValidationException("Empty
value not allowed.");
if (! isValidConst(in))
- throw new SchemaValidationException("Value does
not match constant. Must be: {0}", _const);
+ throw new SchemaValidationException("Value does
not match constant. Must be: {0}", const_);
if (! isValidPattern(in))
throw new SchemaValidationException("Value does
not match expected pattern. Must match pattern: {0}", pattern.pattern());
if (! isValidEnum(in))
- throw new SchemaValidationException("Value does
not match one of the expected values. Must be one of the following: {0}",
toCdl(_enum));
+ throw new SchemaValidationException("Value does
not match one of the expected values. Must be one of the following: {0}",
toCdl(enum_));
if (! isValidMaxLength(in))
throw new SchemaValidationException("Maximum
length of value exceeded.");
if (! isValidMinLength(in))
@@ -4306,7 +4306,7 @@ public class HttpPartSchema {
}
private boolean isValidConst(String x) {
- return _const == null || _const.equals(x);
+ return const_ == null || const_.equals(x);
}
private static boolean isValidDate(String x) {
@@ -4335,7 +4335,7 @@ public class HttpPartSchema {
}
private boolean isValidEnum(String x) {
- return _enum.isEmpty() || _enum.contains(x);
+ return enum_.isEmpty() || enum_.contains(x);
}
private boolean isValidFormat(String x) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
index 42aa74b0c0..2a3809fef4 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ContentEncoding.java
@@ -77,7 +77,7 @@ import org.apache.juneau.http.annotation.*;
* @serial exclude
*/
@Header("Content-Encoding")
-@Schema(_enum = { "gzip", "compress", "deflate", "identity", "other" })
+@Schema(enum_ = { "gzip", "compress", "deflate", "identity", "other" })
public class ContentEncoding extends BasicStringHeader {
private static final long serialVersionUID = 1L;
private static final String NAME = "Content-Encoding";
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index afa0e40ade..78219c1c19 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -1991,7 +1991,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var def = (String)null;
for (var a : aa) {
if (a instanceof Schema a2) {
- def =
joinnlFirstNonEmptyArray(a2._default(), a2.df());
+ def =
joinnlFirstNonEmptyArray(a2.default_(), a2.df());
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 32dc1c30b2..1abbe16b6a 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -808,8 +808,8 @@ public class BasicSwaggerProviderSession {
// @formatter:off
return om
.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf())
- .appendIf(ne, "default", joinnl(a._default(), a.df()))
- .appendFirst(nec, "enum", toSet(a._enum()),
toSet(a.e()))
+ .appendIf(ne, "default", joinnl(a.default_(), a.df()))
+ .appendFirst(nec, "enum", toSet(a.enum_()),
toSet(a.e()))
.appendFirst(ne, "format", a.format(), a.f())
.appendIf(nf, "exclusiveMaximum", a.exclusiveMaximum()
|| a.emax())
.appendIf(nf, "exclusiveMinimum", a.exclusiveMinimum()
|| a.emin())
@@ -861,10 +861,10 @@ public class BasicSwaggerProviderSession {
.appendIf(nem, "additionalProperties",
toJsonMap(a.additionalProperties()))
.appendIf(ne, "allOf", joinnl(a.allOf()))
.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf())
- .appendIf(ne, "default", joinnl(a._default(),
a.df()))
+ .appendIf(ne, "default", joinnl(a.default_(),
a.df()))
.appendIf(ne, "discriminator",
a.discriminator())
.appendIf(ne, "description",
resolve(a.description(), a.d()))
- .appendFirst(nec, "enum", toSet(a._enum()),
toSet(a.e()))
+ .appendFirst(nec, "enum", toSet(a.enum_()),
toSet(a.e()))
.appendIf(nf, "exclusiveMaximum",
a.exclusiveMaximum() || a.emax())
.appendIf(nf, "exclusiveMinimum",
a.exclusiveMinimum() || a.emin())
.appendIf(nem, "externalDocs",
merge(om.getMap("externalDocs"), a.externalDocs()))
@@ -908,8 +908,8 @@ public class BasicSwaggerProviderSession {
// @formatter:off
return om
.appendFirst(ne, "collectionFormat",
a.collectionFormat(), a.cf())
- .appendIf(ne, "default", joinnl(a._default(), a.df()))
- .appendFirst(nec, "enum", toSet(a._enum()),
toSet(a.e()))
+ .appendIf(ne, "default", joinnl(a.default_(), a.df()))
+ .appendFirst(nec, "enum", toSet(a.enum_()),
toSet(a.e()))
.appendIf(nf, "exclusiveMaximum", a.exclusiveMaximum()
|| a.emax())
.appendIf(nf, "exclusiveMinimum", a.exclusiveMinimum()
|| a.emin())
.appendFirst(ne, "format", a.format(), a.f())
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Track_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Track_Test.java
index 4749a5ee46..6669b9c548 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Track_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/bean/html5/Track_Test.java
@@ -26,7 +26,7 @@ class Track_Test extends TestBase {
@Test void a01_basicSetters() {
Track x = track()
- ._default("a")
+ .default_("a")
.kind("b")
.label("c")
.src("d")
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
index 4f934374bc..9b8bb0354e 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHeader_Test.java
@@ -64,12 +64,12 @@ class SerializedHeader_Test extends TestBase {
assertNull(x1.getValue());
var x2 = serializedHeader("Foo","").skipIfEmpty();
assertNull(x2.getValue());
- var x3 =
serializedHeader("Foo","").schema(schema(STRING)._default("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
+ var x3 =
serializedHeader("Foo","").schema(schema(STRING).default_("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
assertThrowsWithMessage(Exception.class, "Empty value not
allowed.", x3::getValue);
}
@Test void a05_getValue_defaults() {
- var x1 =
serializedHeader("Foo",null).schema(schema(INTEGER)._default("1").build()).serializer(OAPI_SESSION);
+ var x1 =
serializedHeader("Foo",null).schema(schema(INTEGER).default_("1").build()).serializer(OAPI_SESSION);
assertEquals("1", x1.getValue());
var x2 =
serializedHeader("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
index 96df04e78e..b7d24c70a3 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedPart_Test.java
@@ -65,12 +65,12 @@ class SerializedPart_Test extends TestBase {
assertNull(x1.getValue());
var x2 = serializedPart("Foo","").skipIfEmpty();
assertNull(x2.getValue());
- var x3 =
serializedPart("Foo","").schema(schema(STRING)._default("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
+ var x3 =
serializedPart("Foo","").schema(schema(STRING).default_("bar").build()).serializer(OAPI_SERIALIZER).skipIfEmpty();
assertThrowsWithMessage(Exception.class, "Empty value not
allowed.", x3::getValue);
}
@Test void a05_getValue_defaults() {
- var x1 =
serializedPart("Foo",null).schema(schema(INTEGER)._default("1").build()).serializer(OAPI_SESSION);
+ var x1 =
serializedPart("Foo",null).schema(schema(INTEGER).default_("1").build()).serializer(OAPI_SESSION);
assertEquals("1", x1.getValue());
var x2 =
serializedPart("Foo",null).schema(schema(STRING).required().allowEmptyValue().build()).serializer(OAPI_SESSION);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
index cfde0da6f5..a544fa1803 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/annotation/AnnotationUtils_Test.java
@@ -230,8 +230,8 @@ class AnnotationUtils_Test extends TestBase {
assertTrue(SchemaAnnotation.empty(x.schema()));
assertTrue(SchemaAnnotation.empty((Schema)null));
-
assertFalse(SchemaAnnotation.empty(schema()._default(a("foo")).build()));
-
assertFalse(SchemaAnnotation.empty(schema()._enum(a("foo")).build()));
+
assertFalse(SchemaAnnotation.empty(schema().default_(a("foo")).build()));
+
assertFalse(SchemaAnnotation.empty(schema().enum_(a("foo")).build()));
assertFalse(SchemaAnnotation.empty(schema().$ref("foo").build()));
assertFalse(SchemaAnnotation.empty(schema().additionalProperties(a("foo")).build()));
assertFalse(SchemaAnnotation.empty(schema().allOf(a("foo")).build()));
@@ -292,8 +292,8 @@ class AnnotationUtils_Test extends TestBase {
assertTrue(SubItemsAnnotation.empty(x.subItems()));
assertTrue(SubItemsAnnotation.empty((SubItems)null));
-
assertFalse(SubItemsAnnotation.empty(subItems()._default(a("foo")).build()));
-
assertFalse(SubItemsAnnotation.empty(subItems()._enum(a("foo")).build()));
+
assertFalse(SubItemsAnnotation.empty(subItems().default_(a("foo")).build()));
+
assertFalse(SubItemsAnnotation.empty(subItems().enum_(a("foo")).build()));
assertFalse(SubItemsAnnotation.empty(subItems().$ref("foo").build()));
assertFalse(SubItemsAnnotation.empty(subItems().cf("foo").build()));
assertFalse(SubItemsAnnotation.empty(subItems().collectionFormat("foo").build()));
@@ -335,8 +335,8 @@ class AnnotationUtils_Test extends TestBase {
assertTrue(ItemsAnnotation.empty(x.items()));
assertTrue(ItemsAnnotation.empty((Items)null));
-
assertFalse(ItemsAnnotation.empty(items()._default(a("foo")).build()));
-
assertFalse(ItemsAnnotation.empty(items()._enum(a("foo")).build()));
+
assertFalse(ItemsAnnotation.empty(items().default_(a("foo")).build()));
+
assertFalse(ItemsAnnotation.empty(items().enum_(a("foo")).build()));
assertFalse(ItemsAnnotation.empty(items().$ref("foo").build()));
assertFalse(ItemsAnnotation.empty(items().cf("foo").build()));
assertFalse(ItemsAnnotation.empty(items().collectionFormat("foo").build()));
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
index 839061ca58..d2baa9f4d7 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
@@ -814,7 +814,7 @@ class HttpPartSchema_Body_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Content
- @Schema(_const="CONSTANT_VALUE")
+ @Schema(const_="CONSTANT_VALUE")
public static class D01a {}
@Test void d01a_const_valid() throws Exception {
@@ -829,7 +829,7 @@ class HttpPartSchema_Body_Test extends TestBase {
}
@Content
- @Schema(_const="CONSTANT_VALUE", required=true)
+ @Schema(const_="CONSTANT_VALUE", required=true)
public static class D01b {}
@Test void d01b_const_required() throws Exception {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
index 59fcb43e34..01f08a5a8b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartParser_Test.java
@@ -85,7 +85,7 @@ class OpenApiPartParser_Test extends TestBase {
}
@Test void a04_inputValidations_enum() throws Exception {
- var s = tNone()._enum("foo").allowEmptyValue().build();
+ var s = tNone().enum_("foo").allowEmptyValue().build();
assertEquals("foo", parse(s, "foo", String.class));
assertEquals(null, parse(s, null, String.class));
@@ -93,9 +93,9 @@ class OpenApiPartParser_Test extends TestBase {
assertThrowsWithMessage(SchemaValidationException.class, "Value
does not match one of the expected values. Must be one of the following:
foo", ()->parse(s, "bar", String.class));
assertThrowsWithMessage(SchemaValidationException.class, "Value
does not match one of the expected values. Must be one of the following:
foo", ()->parse(s, "", String.class));
- assertEquals("foo",
parse(tNone()._enum((Set<String>)null).build(), "foo", String.class));
- assertEquals("foo",
parse(tNone()._enum((Set<String>)null).allowEmptyValue().build(), "foo",
String.class));
- assertEquals("foo", parse(tNone()._enum("foo","foo").build(),
"foo", String.class));
+ assertEquals("foo",
parse(tNone().enum_((Set<String>)null).build(), "foo", String.class));
+ assertEquals("foo",
parse(tNone().enum_((Set<String>)null).allowEmptyValue().build(), "foo",
String.class));
+ assertEquals("foo", parse(tNone().enum_("foo","foo").build(),
"foo", String.class));
}
@Test void a05_inputValidations_minMaxLength() throws Exception {
@@ -197,7 +197,7 @@ class OpenApiPartParser_Test extends TestBase {
}
@Test void c02_stringType_default() throws Exception {
- var s = tString()._default("x").build();
+ var s = tString().default_("x").build();
assertEquals("foo", parse(s, "foo", String.class));
assertEquals("x", parse(s, null, String.class));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
index 949984b168..99139d0e76 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/OpenApiPartSerializer_Test.java
@@ -74,7 +74,7 @@ class OpenApiPartSerializer_Test extends TestBase {
}
@Test void a04_outputValidations_enum() throws Exception {
- var ps = tNone()._enum("foo").allowEmptyValue().build();
+ var ps = tNone().enum_("foo").allowEmptyValue().build();
assertEquals("foo", serialize(ps, "foo"));
assertEquals("null", serialize(ps, null));
@@ -82,9 +82,9 @@ class OpenApiPartSerializer_Test extends TestBase {
assertThrowsWithMessage(SchemaValidationException.class, "Value
does not match one of the expected values. Must be one of the following:
foo", ()->serialize(ps, "bar"));
assertThrowsWithMessage(SchemaValidationException.class, "Value
does not match one of the expected values. Must be one of the following:
foo", ()->serialize(ps, ""));
- assertEquals("foo",
serialize(tNone()._enum((Set<String>)null).build(), "foo"));
- assertEquals("foo",
serialize(tNone()._enum((Set<String>)null).allowEmptyValue().build(), "foo"));
- assertEquals("foo",
serialize(tNone()._enum("foo","foo").build(), "foo"));
+ assertEquals("foo",
serialize(tNone().enum_((Set<String>)null).build(), "foo"));
+ assertEquals("foo",
serialize(tNone().enum_((Set<String>)null).allowEmptyValue().build(), "foo"));
+ assertEquals("foo",
serialize(tNone().enum_("foo","foo").build(), "foo"));
}
@Test void a05_outputValidations_minMaxLength() throws Exception {
@@ -139,7 +139,7 @@ class OpenApiPartSerializer_Test extends TestBase {
}
@Test void c02_stringType_default() throws Exception {
- var ps = tString()._default("x").build();
+ var ps = tString().default_("x").build();
assertEquals("foo", serialize(ps, "foo"));
assertEquals("x", serialize(ps, null));
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index f60dc08d41..778ff2c7a3 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -1317,7 +1317,7 @@ class JsonSchemaGeneratorTest extends TestBase {
assertBean(schema, "const", "MY_CONSTANT");
}
- @Schema(type="string", _const="MY_CONSTANT")
+ @Schema(type="string", const_="MY_CONSTANT")
public static class ConstBean {
public String value;
}
@@ -1476,9 +1476,9 @@ class JsonSchemaGeneratorTest extends TestBase {
}
@Schema(type="object",
- _if="properties:{foo:{const:'bar'}}",
- _then="required:['baz']",
- _else="required:['qux']")
+ if_="properties:{foo:{const:'bar'}}",
+ then_="required:['baz']",
+ else_="required:['qux']")
public static class ConditionalBean {
public String foo;
public String baz;
@@ -1494,7 +1494,7 @@ class JsonSchemaGeneratorTest extends TestBase {
@Schema(type="integer",
$id="https://example.com/combined";,
- _const="FIXED",
+ const_="FIXED",
examples={"ex1", "ex2"},
$comment="A comprehensive example",
deprecatedProperty=true,
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
index e717d51bd0..be3c336700 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/ItemsAnnotation_Test.java
@@ -32,8 +32,8 @@ class ItemsAnnotation_Test extends TestBase {
Items a1 = ItemsAnnotation.create()
.$ref("a")
- ._default("b")
- ._enum("c")
+ .default_("b")
+ .enum_("c")
.cf("d")
.collectionFormat("e")
.description("f")
@@ -69,8 +69,8 @@ class ItemsAnnotation_Test extends TestBase {
Items a2 = ItemsAnnotation.create()
.$ref("a")
- ._default("b")
- ._enum("c")
+ .default_("b")
+ .enum_("c")
.cf("d")
.collectionFormat("e")
.description("f")
@@ -106,7 +106,7 @@ class ItemsAnnotation_Test extends TestBase {
@Test void a01_basic() {
assertBean(a1,
-
"$ref,_default,_enum,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items{$ref,_default,_enum,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems},max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems",
+
"$ref,default_,enum_,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items{$ref,default_,enum_,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems},max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems",
"a,[b],[c],d,e,[f],[g],[h],true,true,true,true,i,j,{,[],[],,,[],[],[],false,false,false,false,,,[],,-1,-1,-1,,-1,,-1,-1,-1,,-1,,,,,,,false,false},k,2,4,1,l,3,m,6,8,5,n,7,o,p,q,r,s,t,true,true");
}
@@ -136,8 +136,8 @@ class ItemsAnnotation_Test extends TestBase {
@Items(
$ref="a",
- _default="b",
- _enum="c",
+ default_="b",
+ enum_="c",
cf="d",
collectionFormat="e",
description={ "f" },
@@ -175,8 +175,8 @@ class ItemsAnnotation_Test extends TestBase {
@Items(
$ref="a",
- _default="b",
- _enum="c",
+ default_="b",
+ enum_="c",
cf="d",
collectionFormat="e",
description={ "f" },
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
index 9bb808463d..d30204020b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
@@ -35,8 +35,8 @@ class SchemaAnnotation_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
Schema a1 = SchemaAnnotation.create()
- ._default("a")
- ._enum("b")
+ .default_("a")
+ .enum_("b")
.$ref("c")
.additionalProperties("d")
.allOf("e")
@@ -92,8 +92,8 @@ class SchemaAnnotation_Test extends TestBase {
.build();
Schema a2 = SchemaAnnotation.create()
- ._default("a")
- ._enum("b")
+ .default_("a")
+ .enum_("b")
.$ref("c")
.additionalProperties("d")
.allOf("e")
@@ -150,7 +150,7 @@ class SchemaAnnotation_Test extends TestBase {
@Test void a01_basic() {
assertBean(a1,
-
"$ref,_default,_enum,additionalProperties,aev,allOf,allowEmptyValue,cf,collectionFormat,d,description,df,discriminator,e,emax,emin,exclusiveMaximum,exclusiveMinimum,externalDocs{description,url},f,format,ignore,items{$ref,_default,_enum,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items{$ref,_default,_enum,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl
[...]
+
"$ref,default_,enum_,additionalProperties,aev,allOf,allowEmptyValue,cf,collectionFormat,d,description,df,discriminator,e,emax,emin,exclusiveMaximum,exclusiveMinimum,externalDocs{description,url},f,format,ignore,items{$ref,default_,enum_,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items{$ref,default_,enum_,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl
[...]
"c,[a],[b],[d],false,[e],false,f,g,[h],[i],[j],k,[l],true,true,true,true,{[],},m,n,true,{,[],[],,,[],[],[],false,false,false,false,,,{,[],[],,,[],[],[],false,false,false,false,,,[],,-1,-1,-1,,-1,,-1,-1,-1,,-1,,,,,,,false,false},,-1,-1,-1,,-1,,-1,-1,-1,,-1,,,,,,,false,false},o,2,4,6,1,p,3,5,q,8,10,12,7,r,9,11,s,t,[u],[X1],v,w,[x],true,true,true,true,false,false,z,aa,bb,true,true,[cc]");
}
@@ -200,8 +200,8 @@ class SchemaAnnotation_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
@Schema(
- _default="a",
- _enum="b",
+ default_="a",
+ enum_="b",
$ref="c",
additionalProperties="d",
allOf="e",
@@ -259,8 +259,8 @@ class SchemaAnnotation_Test extends TestBase {
Schema d1 = D1.class.getAnnotationsByType(Schema.class)[0];
@Schema(
- _default="a",
- _enum="b",
+ default_="a",
+ enum_="b",
$ref="c",
additionalProperties="d",
allOf="e",
@@ -328,7 +328,7 @@ class SchemaAnnotation_Test extends TestBase {
//------------------------------------------------------------------------------------------------------------------
Schema draft2020_1 = SchemaAnnotation.create()
- ._const("constantValue")
+ .const_("constantValue")
.examples("example1", "example2")
.$comment("This is a schema comment")
.deprecatedProperty(true)
@@ -341,15 +341,15 @@ class SchemaAnnotation_Test extends TestBase {
.unevaluatedProperties("false")
.dependentSchemas("prop1:{type:'string'}")
.dependentRequired("prop1:prop2,prop3")
- ._if("properties:{foo:{const:'bar'}}")
- ._then("required:['baz']")
- ._else("required:['qux']")
+ .if_("properties:{foo:{const:'bar'}}")
+ .then_("required:['baz']")
+ .else_("required:['qux']")
.$defs("MyDef:{type:'string'}")
.$id("https://example.com/schemas/my-schema";)
.build();
Schema draft2020_2 = SchemaAnnotation.create()
- ._const("constantValue")
+ .const_("constantValue")
.examples("example1", "example2")
.$comment("This is a schema comment")
.deprecatedProperty(true)
@@ -362,16 +362,16 @@ class SchemaAnnotation_Test extends TestBase {
.unevaluatedProperties("false")
.dependentSchemas("prop1:{type:'string'}")
.dependentRequired("prop1:prop2,prop3")
- ._if("properties:{foo:{const:'bar'}}")
- ._then("required:['baz']")
- ._else("required:['qux']")
+ .if_("properties:{foo:{const:'bar'}}")
+ .then_("required:['baz']")
+ .else_("required:['qux']")
.$defs("MyDef:{type:'string'}")
.$id("https://example.com/schemas/my-schema";)
.build();
@Test void e01_draft2020_basic() {
assertBean(draft2020_1,
-
"$comment,$defs,$id,_const,_else,_if,_then,contentEncoding,contentMediaType,dependentRequired,dependentSchemas,deprecatedProperty,examples,exclusiveMaximumValue,exclusiveMinimumValue,prefixItems,unevaluatedItems,unevaluatedProperties",
+
"$comment,$defs,$id,const_,else_,if_,then_,contentEncoding,contentMediaType,dependentRequired,dependentSchemas,deprecatedProperty,examples,exclusiveMaximumValue,exclusiveMinimumValue,prefixItems,unevaluatedItems,unevaluatedProperties",
"[This is a schema
comment],[MyDef:{type:'string'}],https://example.com/schemas/my-schema,[constantValue],[required:['qux']],[properties:{foo:{const:'bar'}}],[required:['baz']],base64,application/json,[prop1:prop2,prop3],[prop1:{type:'string'}],true,[example1,example2],100,0,[string,number],[false],[false]");
}
@@ -388,7 +388,7 @@ class SchemaAnnotation_Test extends TestBase {
}
@Schema(
- _const="constantValue",
+ const_="constantValue",
examples={"example1", "example2"},
$comment="This is a schema comment",
deprecatedProperty=true,
@@ -401,9 +401,9 @@ class SchemaAnnotation_Test extends TestBase {
unevaluatedProperties="false",
dependentSchemas="prop1:{type:'string'}",
dependentRequired="prop1:prop2,prop3",
- _if="properties:{foo:{const:'bar'}}",
- _then="required:['baz']",
- _else="required:['qux']",
+ if_="properties:{foo:{const:'bar'}}",
+ then_="required:['baz']",
+ else_="required:['qux']",
$defs="MyDef:{type:'string'}",
$id="https://example.com/schemas/my-schema";
)
@@ -411,7 +411,7 @@ class SchemaAnnotation_Test extends TestBase {
Schema e1 = E1.class.getAnnotationsByType(Schema.class)[0];
@Schema(
- _const="constantValue",
+ const_="constantValue",
examples={"example1", "example2"},
$comment="This is a schema comment",
deprecatedProperty=true,
@@ -424,9 +424,9 @@ class SchemaAnnotation_Test extends TestBase {
unevaluatedProperties="false",
dependentSchemas="prop1:{type:'string'}",
dependentRequired="prop1:prop2,prop3",
- _if="properties:{foo:{const:'bar'}}",
- _then="required:['baz']",
- _else="required:['qux']",
+ if_="properties:{foo:{const:'bar'}}",
+ then_="required:['baz']",
+ else_="required:['qux']",
$defs="MyDef:{type:'string'}",
$id="https://example.com/schemas/my-schema";
)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
index 12e9925450..d7556caffe 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SubItemsAnnotation_Test.java
@@ -32,8 +32,8 @@ class SubItemsAnnotation_Test extends TestBase {
SubItems a1 = SubItemsAnnotation.create()
.$ref("a")
- ._default("b")
- ._enum("c")
+ .default_("b")
+ .enum_("c")
.cf("d")
.collectionFormat("e")
.description("f")
@@ -69,8 +69,8 @@ class SubItemsAnnotation_Test extends TestBase {
SubItems a2 = SubItemsAnnotation.create()
.$ref("a")
- ._default("b")
- ._enum("c")
+ .default_("b")
+ .enum_("c")
.cf("d")
.collectionFormat("e")
.description("f")
@@ -105,7 +105,7 @@ class SubItemsAnnotation_Test extends TestBase {
.build();
@Test void a01_basic() {
- assertBean(a1,
"$ref,_default,_enum,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems",
"a,[b],[c],d,e,[f],[g],[h],true,true,true,true,i,j,[],k,2,4,1,l,3,m,6,8,5,n,7,o,p,q,r,s,t,true,true");
+ assertBean(a1,
"$ref,default_,enum_,cf,collectionFormat,description,df,e,emax,emin,exclusiveMaximum,exclusiveMinimum,f,format,items,max,maxItems,maxLength,maxi,maximum,maxl,min,minItems,minLength,mini,minimum,minl,mo,multipleOf,p,pattern,t,type,ui,uniqueItems",
"a,[b],[c],d,e,[f],[g],[h],true,true,true,true,i,j,[],k,2,4,1,l,3,m,6,8,5,n,7,o,p,q,r,s,t,true,true");
}
@Test void a02_testEquivalency() {
@@ -134,8 +134,8 @@ class SubItemsAnnotation_Test extends TestBase {
@SubItems(
$ref="a",
- _default="b",
- _enum="c",
+ default_="b",
+ enum_="c",
cf="d",
collectionFormat="e",
description={ "f" },
@@ -173,8 +173,8 @@ class SubItemsAnnotation_Test extends TestBase {
@SubItems(
$ref="a",
- _default="b",
- _enum="c",
+ default_="b",
+ enum_="c",
cf="d",
collectionFormat="e",
description={ "f" },
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
index 748fb899e7..541e1bdf8d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/FormData_Test.java
@@ -112,14 +112,14 @@ class FormData_Test extends TestBase {
.append("f3", f3);
}
@RestPost
- public JsonMap c(@FormData("f1") @Schema(_default="1") String
f1, @FormData("f2") @Schema(_default="2") String f2, @FormData("f3")
@Schema(_default="3") String f3) {
+ public JsonMap c(@FormData("f1") @Schema(default_="1") String
f1, @FormData("f2") @Schema(default_="2") String f2, @FormData("f3")
@Schema(default_="3") String f3) {
return JsonMap.create()
.append("f1", f1)
.append("f2", f2)
.append("f3", f3);
}
@RestPost(defaultRequestFormData={"f1:1","f2=2"," f3 : 3 "})
- public JsonMap d(@FormData("f1") @Schema(_default="4") String
f1, @FormData("f2") @Schema(_default="5") String f2, @FormData("f3")
@Schema(_default="6") String f3) {
+ public JsonMap d(@FormData("f1") @Schema(default_="4") String
f1, @FormData("f2") @Schema(default_="5") String f2, @FormData("f3")
@Schema(default_="6") String f3) {
return JsonMap.create()
.append("f1", f1)
.append("f2", f2)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
index 83c7c96180..eb75fa0d3b 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Header_Test.java
@@ -152,7 +152,7 @@ class Header_Test extends TestBase {
@Rest
public static class D1 {
@RestGet
- public JsonMap a(@Header(name="h1") @Schema(_default="1")
String h1, @Header(name="h2") @Schema(_default="2") String h2,
@Header(name="h3") @Schema(_default="3") String h3) {
+ public JsonMap a(@Header(name="h1") @Schema(default_="1")
String h1, @Header(name="h2") @Schema(default_="2") String h2,
@Header(name="h3") @Schema(default_="3") String h3) {
return JsonMap.create()
.append("h1", h1)
.append("h2", h2)
@@ -170,7 +170,7 @@ class Header_Test extends TestBase {
@Rest
public static class D2 {
@RestGet
- public JsonMap a(@Header("h1") @Schema(_default="1") String h1,
@Header("h2") @Schema(_default="2") String h2, @Header("h3")
@Schema(_default="3") String h3) {
+ public JsonMap a(@Header("h1") @Schema(default_="1") String h1,
@Header("h2") @Schema(default_="2") String h2, @Header("h3")
@Schema(default_="3") String h3) {
return JsonMap.create()
.append("h1", h1)
.append("h2", h2)
@@ -192,7 +192,7 @@ class Header_Test extends TestBase {
@Rest
public static class E {
@RestGet(defaultRequestHeaders={"H1:1","H2=2"," H3 : 3 "})
- public JsonMap a(@Header("h1") @Schema(_default="4") String h1,
@Header("h2") @Schema(_default="5") String h2, @Header("h3")
@Schema(_default="6") String h3) {
+ public JsonMap a(@Header("h1") @Schema(default_="4") String h1,
@Header("h2") @Schema(default_="5") String h2, @Header("h3")
@Schema(default_="6") String h3) {
return JsonMap.create()
.append("h1", h1)
.append("h2", h2)
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
index 6979428b0a..0be1b77acf 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Swagger_Path_Test.java
@@ -53,7 +53,7 @@ class Swagger_Path_Test extends TestBase {
@Path(
name="P",
-
schema=@Schema(description="a\nb",type="string",_enum={"a","b"})
+
schema=@Schema(description="a\nb",type="string",enum_={"a","b"})
)
public static class A2 {
public A2(String x) {}
@@ -67,7 +67,7 @@ class Swagger_Path_Test extends TestBase {
@Path(
name="P",
-
schema=@Schema(description="b\nc",type="string",_enum={"b","c"})
+
schema=@Schema(description="b\nc",type="string",enum_={"b","c"})
)
@Schema(
d={"a","b"},
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
index 2a19b26bcb..c90384a63f 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java
@@ -83,7 +83,7 @@ class RestClient_FormData_Test extends TestBase {
client().formData(part("foo","bar",null)).build().post("/formData").run().assertContent("foo=bar");
client().formData(part("foo",null,null)).build().post("/formData").run().assertContent("");
-
client().formData(part("foo",null,null).skipIfEmpty().schema(HttpPartSchema.create()._default("bar").build())).build().post("/formData").run().assertContent("foo=bar");
+
client().formData(part("foo",null,null).skipIfEmpty().schema(HttpPartSchema.create().default_("bar").build())).build().post("/formData").run().assertContent("foo=bar");
}
@Test void a06_formData_String_Object_Schema() throws Exception {
