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 b413300fb Test modernization, clean up utility classes.
b413300fb is described below
commit b413300fb3e15e4785377f1401b70c7c38fc9724
Author: James Bognar <[email protected]>
AuthorDate: Mon Aug 25 12:53:47 2025 -0400
Test modernization, clean up utility classes.
---
.../org/apache/juneau/bean/openapi3/Contact.java | 5 +++--
.../apache/juneau/bean/openapi3/Discriminator.java | 3 ++-
.../org/apache/juneau/bean/openapi3/Encoding.java | 5 +++--
.../org/apache/juneau/bean/openapi3/Example.java | 7 +++---
.../bean/openapi3/ExternalDocumentation.java | 3 ++-
.../apache/juneau/bean/openapi3/HeaderInfo.java | 7 +++---
.../java/org/apache/juneau/bean/openapi3/Info.java | 9 ++++----
.../org/apache/juneau/bean/openapi3/Items.java | 11 ++++-----
.../org/apache/juneau/bean/openapi3/License.java | 3 ++-
.../java/org/apache/juneau/bean/openapi3/Link.java | 7 +++---
.../org/apache/juneau/bean/openapi3/OAuthFlow.java | 7 +++---
.../juneau/bean/openapi3/RequestBodyInfo.java | 3 ++-
.../org/apache/juneau/bean/openapi3/Response.java | 3 ++-
.../apache/juneau/bean/openapi3/SchemaInfo.java | 15 +++++++------
.../juneau/bean/openapi3/SecuritySchemeInfo.java | 15 +++++++------
.../org/apache/juneau/bean/openapi3/Server.java | 3 ++-
.../juneau/bean/openapi3/ServerVariable.java | 5 +++--
.../java/org/apache/juneau/bean/openapi3/Tag.java | 5 +++--
.../java/org/apache/juneau/bean/openapi3/Xml.java | 7 +++---
.../org/apache/juneau/bean/swagger/Contact.java | 5 +++--
.../juneau/bean/swagger/ExternalDocumentation.java | 2 +-
.../org/apache/juneau/bean/swagger/HeaderInfo.java | 13 ++++++-----
.../java/org/apache/juneau/bean/swagger/Info.java | 11 ++++-----
.../java/org/apache/juneau/bean/swagger/Items.java | 11 ++++-----
.../org/apache/juneau/bean/swagger/License.java | 2 +-
.../org/apache/juneau/bean/swagger/Operation.java | 7 +++---
.../apache/juneau/bean/swagger/ParameterInfo.java | 15 +++++++------
.../apache/juneau/bean/swagger/ResponseInfo.java | 3 ++-
.../org/apache/juneau/bean/swagger/SchemaInfo.java | 15 +++++++------
.../apache/juneau/bean/swagger/SecurityScheme.java | 15 +++++++------
.../org/apache/juneau/bean/swagger/Swagger.java | 7 +++---
.../java/org/apache/juneau/bean/swagger/Tag.java | 5 +++--
.../java/org/apache/juneau/bean/swagger/Xml.java | 7 +++---
.../juneau/assertions/AssertionPredicates.java | 16 ++++++-------
.../juneau/assertions/FluentArrayAssertion.java | 8 +++----
.../assertions/FluentCollectionAssertion.java | 4 ++--
.../juneau/assertions/FluentObjectAssertion.java | 3 ++-
.../apache/juneau/assertions/StringAssertion.java | 3 ++-
.../apache/juneau/common/internal/StringUtils.java | 16 +++----------
.../main/java/org/apache/juneau/BeanRegistry.java | 3 ++-
.../juneau/InvalidDataConversionException.java | 3 ++-
.../org/apache/juneau/collections/JsonMap.java | 8 +++----
.../apache/juneau/html/BasicHtmlDocTemplate.java | 2 +-
.../apache/juneau/html/HtmlSerializerSession.java | 4 ++--
.../org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../org/apache/juneau/internal/ArrayUtils.java | 2 +-
.../org/apache/juneau/internal/DelegateMap.java | 3 ++-
.../juneau/oapi/OpenApiSerializerSession.java | 26 +++++++++++-----------
.../apache/juneau/objecttools/ObjectSearcher.java | 3 ++-
.../main/java/org/apache/juneau/svl/MapVar.java | 4 +++-
.../urlencoding/UrlEncodingSerializerSession.java | 5 +++--
.../apache/juneau/xml/XmlSerializerSession.java | 3 ++-
.../apache/juneau/microservice/Microservice.java | 2 +-
.../org/apache/juneau/rest/client/RestRequest.java | 19 ++++++++--------
.../java/org/apache/juneau/http/HttpHeaders.java | 3 ++-
.../java/org/apache/juneau/http/HttpParts.java | 3 ++-
.../juneau/http/header/BasicBooleanHeader.java | 3 ++-
.../juneau/http/header/BasicEntityTagHeader.java | 4 +++-
.../juneau/http/header/BasicEntityTagsHeader.java | 4 +++-
.../org/apache/juneau/http/header/BasicHeader.java | 4 ++--
.../juneau/http/header/BasicIntegerHeader.java | 3 ++-
.../apache/juneau/http/header/BasicLongHeader.java | 3 ++-
.../juneau/http/header/BasicMediaRangesHeader.java | 5 +++--
.../juneau/http/header/BasicMediaTypeHeader.java | 5 +++--
.../juneau/http/header/BasicStringHeader.java | 3 ++-
.../http/header/BasicStringRangesHeader.java | 5 +++--
.../apache/juneau/http/header/BasicUriHeader.java | 6 +++--
.../apache/juneau/http/header/ClientVersion.java | 5 +++--
.../apache/juneau/http/header/HeaderBeanMeta.java | 5 +++--
.../org/apache/juneau/http/header/HeaderList.java | 2 +-
.../org/apache/juneau/http/header/IfRange.java | 3 ++-
.../org/apache/juneau/http/header/RetryAfter.java | 3 ++-
.../juneau/http/header/SerializedHeader.java | 5 +++--
.../apache/juneau/http/part/BasicBooleanPart.java | 3 ++-
.../apache/juneau/http/part/BasicIntegerPart.java | 3 ++-
.../org/apache/juneau/http/part/BasicLongPart.java | 3 ++-
.../org/apache/juneau/http/part/BasicPart.java | 7 +++---
.../org/apache/juneau/http/part/PartBeanMeta.java | 5 +++--
.../java/org/apache/juneau/http/part/PartList.java | 2 +-
.../apache/juneau/http/part/SerializedPart.java | 5 +++--
.../java/org/apache/juneau/rest/RestResponse.java | 3 ++-
.../juneau/rest/httppart/RequestAttribute.java | 3 ++-
.../juneau/rest/httppart/RequestContent.java | 3 ++-
.../juneau/rest/httppart/RequestFormParams.java | 4 ++--
.../juneau/rest/httppart/RequestHeaders.java | 4 ++--
.../juneau/rest/httppart/RequestPathParams.java | 4 ++--
.../juneau/rest/httppart/RequestQueryParams.java | 4 ++--
.../rest/processor/ResponseBeanProcessor.java | 3 ++-
.../org/apache/juneau/rest/util/RestUtils.java | 3 ++-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 6 +++--
.../juneau/http/header/HeaderBeanMeta_Test.java | 5 +++--
.../apache/juneau/http/part/PartBeanMeta_Test.java | 5 +++--
.../org/apache/juneau/http/part/PartList_Test.java | 9 ++++----
.../juneau/utest/utils/FakeStreamSerializer.java | 2 +-
.../juneau/utest/utils/FakeWriterSerializer.java | 12 +++++-----
95 files changed, 310 insertions(+), 242 deletions(-)
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
index 5cd277ec1..faffe1971 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Contact.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -191,9 +192,9 @@ public class Contact extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
+ case "name" -> setName(Utils.s(value));
case "url" -> setUrl(toURI(value));
- case "email" -> setEmail(stringify(value));
+ case "email" -> setEmail(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
index 73cc34a0b..396d36c8b 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Discriminator.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -147,7 +148,7 @@ public class Discriminator extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "propertyName" ->
setPropertyName(stringify(value));
+ case "propertyName" -> setPropertyName(Utils.s(value));
case "mapping" ->
setMapping(mapBuilder(String.class,String.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
index d870282e8..7c4e11bca 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -240,8 +241,8 @@ public class Encoding extends OpenApiElement{
if (property == null)
return this;
return switch (property) {
- case "contentType" -> setContentType(stringify(value));
- case "style" -> setStyle(stringify(value));
+ case "contentType" -> setContentType(Utils.s(value));
+ case "style" -> setStyle(Utils.s(value));
case "headers" ->
setHeaders(mapBuilder(String.class,HeaderInfo.class).sparse().addAny(value).build());
case "explode" -> setExplode(toBoolean(value));
case "allowReserved" ->
setAllowReserved(toBoolean(value));
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
index 9a2a9a4db..8d6385ff3 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Example.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -217,9 +218,9 @@ public class Example extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
- case "externalValue" ->
setExternalValue(stringify(value));
- case "summary" -> setSummary(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "externalValue" ->
setExternalValue(Utils.s(value));
+ case "summary" -> setSummary(Utils.s(value));
case "value" -> setValue(value);
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
index bcbef2b52..916b59c45 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ExternalDocumentation.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -136,7 +137,7 @@ public class ExternalDocumentation extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "url" -> setUrl(toURI(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
index d5a7161df..847bd8fdf 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -412,14 +413,14 @@ public class HeaderInfo extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "required" -> setRequired(toBoolean(value));
case "explode" -> setExplode(toBoolean(value));
case "deprecated" -> setDeprecated(toBoolean(value));
case "allowEmptyValue" ->
setAllowEmptyValue(toBoolean(value));
- case "$ref" -> setRef(stringify(value));
+ case "$ref" -> setRef(Utils.s(value));
case "schema" -> setSchema(toType(value,
SchemaInfo.class));
- case "x-example" -> setExample(stringify(value));
+ case "x-example" -> setExample(Utils.s(value));
case "examples" ->
setExamples(mapBuilder(String.class,Example.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
index f2e92b71d..fa6ed2bbc 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Info.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -300,12 +301,12 @@ public class Info extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "title" -> setTitle(stringify(value));
- case "description" -> setDescription(stringify(value));
- case "termsOfService" ->
setTermsOfService(stringify(value));
+ case "title" -> setTitle(Utils.s(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "termsOfService" ->
setTermsOfService(Utils.s(value));
case "contact" -> setContact(toType(value,
Contact.class));
case "license" -> setLicense(toType(value,
License.class));
- case "version" -> setVersion(stringify(value));
+ case "version" -> setVersion(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
index 352925d76..1813377a9 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Items.java
@@ -24,6 +24,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
@@ -640,7 +641,7 @@ public class Items extends OpenApiElement {
*/
@Beanp("$ref")
public Items setRef(Object value) {
- ref = stringify(value);
+ ref = Utils.s(value);
return this;
}
@@ -692,10 +693,10 @@ public class Items extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "type" -> setType(stringify(value));
- case "format" -> setFormat(stringify(value));
+ case "type" -> setType(Utils.s(value));
+ case "format" -> setFormat(Utils.s(value));
case "items" -> setItems(toType(value,Items.class));
- case "collectionFormat" ->
setCollectionFormat(stringify(value));
+ case "collectionFormat" ->
setCollectionFormat(Utils.s(value));
case "default" -> setDefault(value);
case "maximum" -> setMaximum(toNumber(value));
case "exclusiveMaximum" ->
setExclusiveMaximum(toBoolean(value));
@@ -703,7 +704,7 @@ public class Items extends OpenApiElement {
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
case "maxLength" -> setMaxLength(toInteger(value));
case "minLength" -> setMinLength(toInteger(value));
- case "pattern" -> setPattern(stringify(value));
+ case "pattern" -> setPattern(Utils.s(value));
case "maxItems" -> setMaxItems(toInteger(value));
case "minItems" -> setMinItems(toInteger(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/License.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/License.java
index 0cfa93f63..62b560858 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/License.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/License.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -155,7 +156,7 @@ public class License extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
+ case "name" -> setName(Utils.s(value));
case "url" -> setUrl(toURI(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
index d828972e3..b191ce819 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Link.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -287,9 +288,9 @@ public class Link extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
- case "operationId" -> setOperationId(stringify(value));
- case "operationRef" ->
setOperationRef(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "operationId" -> setOperationId(Utils.s(value));
+ case "operationRef" -> setOperationRef(Utils.s(value));
case "requestBody" -> setRequestBody(value);
case "server" -> setServer(toType(value, Server.class));
case "parameters" ->
setParameters(mapBuilder(String.class,Object.class).sparse().addAny(value).build());
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
index 838b66708..92776082f 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/OAuthFlow.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -226,9 +227,9 @@ public class OAuthFlow extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "authorizationUrl" ->
setAuthorizationUrl(stringify(value));
- case "tokenUrl" -> setTokenUrl(stringify(value));
- case "refreshUrl" -> setRefreshUrl(stringify(value));
+ case "authorizationUrl" ->
setAuthorizationUrl(Utils.s(value));
+ case "tokenUrl" -> setTokenUrl(Utils.s(value));
+ case "refreshUrl" -> setRefreshUrl(Utils.s(value));
case "scopes" ->
setScopes(mapBuilder(String.class,String.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
index 25e9d056b..99d3d0141 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/RequestBodyInfo.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -184,7 +185,7 @@ public class RequestBodyInfo extends OpenApiElement{
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "content" ->
setContent(mapBuilder(String.class,MediaType.class).sparse().addAny(value).build());
case "required" -> setRequired(toBoolean(value));
default -> {
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
index 3c218fa4b..2826d132c 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Response.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -228,7 +229,7 @@ public class Response extends OpenApiElement{
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "headers" ->
setHeaders(mapBuilder(String.class,HeaderInfo.class).sparse().addAny(value).build());
case "content" ->
setContent(mapBuilder(String.class,MediaType.class).sparse().addAny(value).build());
case "links" ->
setLinks(mapBuilder(String.class,Link.class).sparse().addAny(value).build());
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
index ba4bc5093..916d98b06 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SchemaInfo.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.bean.swagger.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -1133,7 +1134,7 @@ public class SchemaInfo extends OpenApiElement {
*/
@Beanp("$ref")
public SchemaInfo setRef(Object value) {
- ref = stringify(value);
+ ref = Utils.s(value);
return this;
}
@@ -1191,9 +1192,9 @@ public class SchemaInfo extends OpenApiElement {
if (property == null)
return this;
return switch (property) { // NOSONAR
- case "format" -> setFormat(stringify(value));
- case "title" -> setTitle(stringify(value));
- case "description" -> setDescription(stringify(value));
+ case "format" -> setFormat(Utils.s(value));
+ case "title" -> setTitle(Utils.s(value));
+ case "description" -> setDescription(Utils.s(value));
case "default" -> setDefault(value);
case "multipleOf" -> setMultipleOf(toNumber(value));
case "maximum" -> setMaximum(toNumber(value));
@@ -1202,15 +1203,15 @@ public class SchemaInfo extends OpenApiElement {
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
case "maxLength" -> setMaxLength(toInteger(value));
case "minLength" -> setMinLength(toInteger(value));
- case "pattern" -> setPattern(stringify(value));
+ case "pattern" -> setPattern(Utils.s(value));
case "maxItems" -> setMaxItems(toInteger(value));
case "minItems" -> setMinItems(toInteger(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
case "maxProperties" ->
setMaxProperties(toInteger(value));
case "minProperties" ->
setMinProperties(toInteger(value));
- case "required" -> addRequired(stringify(value));
+ case "required" -> addRequired(Utils.s(value));
case "enum" -> addEnum(value);
- case "type" -> setType(stringify(value));
+ case "type" -> setType(Utils.s(value));
case "items" -> setItems(toType(value, Items.class));
case "allOf" -> addAllOf(value);
case "anyOf" -> addAnyOf(value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
index 834739dbf..9ef044bb9 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/SecuritySchemeInfo.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -442,14 +443,14 @@ public class SecuritySchemeInfo extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
- case "in" -> setIn(stringify(value));
- case "description" -> setDescription(stringify(value));
- case "scheme" -> setScheme(stringify(value));
- case "bearerFormat" ->
setBearerFormat(stringify(value));
- case "type" -> setType(stringify(value));
+ case "name" -> setName(Utils.s(value));
+ case "in" -> setIn(Utils.s(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "scheme" -> setScheme(Utils.s(value));
+ case "bearerFormat" -> setBearerFormat(Utils.s(value));
+ case "type" -> setType(Utils.s(value));
case "flows" -> setFlows(toType(value,
OAuthFlow.class));
- case "openIdConnectUrl" ->
setOpenIdConnectUrl(stringify(value));
+ case "openIdConnectUrl" ->
setOpenIdConnectUrl(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
index 32a1d3aab..8c709c272 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Server.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -176,7 +177,7 @@ public class Server extends OpenApiElement{
return this;
return switch (property) {
case "url" -> setUrl(toURI(value));
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "variables" ->
setVariables(mapBuilder(String.class,ServerVariable.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
index 96f12e373..2b492d553 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/ServerVariable.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -222,9 +223,9 @@ public class ServerVariable extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "default" -> setDefault(stringify(value));
+ case "default" -> setDefault(Utils.s(value));
case "enum" ->
setEnum(listBuilder(Object.class).sparse().addAny(value).build());
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
index 44ce5b4c0..ddb5e8ca7 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Tag.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -189,8 +190,8 @@ public class Tag extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
- case "description" -> setDescription(stringify(value));
+ case "name" -> setName(Utils.s(value));
+ case "description" -> setDescription(Utils.s(value));
case "externalDocs" -> setExternalDocs(toType(value,
ExternalDocumentation.class));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
index 22802b19d..4255783d2 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/openapi3/Xml.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -260,9 +261,9 @@ public class Xml extends OpenApiElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
- case "namespace" -> setNamespace(stringify(value));
- case "prefix" -> setPrefix(stringify(value));
+ case "name" -> setName(Utils.s(value));
+ case "namespace" -> setNamespace(Utils.s(value));
+ case "prefix" -> setPrefix(Utils.s(value));
case "attribute" -> setAttribute(toBoolean(value));
case "wrapped" -> setWrapped(toBoolean(value));
default -> {
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Contact.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Contact.java
index a296bca3c..d8c2a7b75 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Contact.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Contact.java
@@ -20,6 +20,7 @@ import java.net.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -194,8 +195,8 @@ public class Contact extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "email" -> setEmail(stringify(value));
- case "name" -> setName(stringify(value));
+ case "email" -> setEmail(Utils.s(value));
+ case "name" -> setName(Utils.s(value));
case "url" -> setUrl(toURI(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
index 072e8c99a..0c4529723 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ExternalDocumentation.java
@@ -165,7 +165,7 @@ public class ExternalDocumentation extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "url" -> setUrl(StringUtils.toURI(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
index 5f3c2c108..c754429e0 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/HeaderInfo.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
@@ -715,14 +716,14 @@ public class HeaderInfo extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "collectionFormat" ->
setCollectionFormat(stringify(value));
+ case "collectionFormat" ->
setCollectionFormat(Utils.s(value));
case "default" -> setDefault(value);
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "enum" ->
setEnum(setBuilder(Object.class).sparse().addAny(value).build());
case "example" -> setExample(value);
case "exclusiveMaximum" ->
setExclusiveMaximum(toBoolean(value));
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
- case "format" -> setFormat(stringify(value));
+ case "format" -> setFormat(Utils.s(value));
case "items" -> setItems(toType(value, Items.class));
case "maximum" -> setMaximum(toNumber(value));
case "maxItems" -> setMaxItems(toInteger(value));
@@ -731,9 +732,9 @@ public class HeaderInfo extends SwaggerElement {
case "minItems" -> setMinItems(toInteger(value));
case "minLength" -> setMinLength(toInteger(value));
case "multipleOf" -> setMultipleOf(toNumber(value));
- case "pattern" -> setPattern(stringify(value));
- case "$ref" -> setRef(stringify(value));
- case "type" -> setType(stringify(value));
+ case "pattern" -> setPattern(Utils.s(value));
+ case "$ref" -> setRef(Utils.s(value));
+ case "type" -> setType(Utils.s(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
index ae289484a..b2c76f92e 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Info.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -339,12 +340,12 @@ public class Info extends SwaggerElement {
return this;
return switch (property) {
case "contact" -> setContact(toType(value,
Contact.class));
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "license" -> setLicense(toType(value,
License.class));
- case "siteName" -> setSiteName(stringify(value));
- case "termsOfService" ->
setTermsOfService(stringify(value));
- case "title" -> setTitle(stringify(value));
- case "version" -> setVersion(stringify(value));
+ case "siteName" -> setSiteName(Utils.s(value));
+ case "termsOfService" ->
setTermsOfService(Utils.s(value));
+ case "title" -> setTitle(Utils.s(value));
+ case "version" -> setVersion(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
index 24bd29518..f9e8386b1 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Items.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
@@ -666,12 +667,12 @@ public class Items extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "collectionFormat" ->
setCollectionFormat(stringify(value));
+ case "collectionFormat" ->
setCollectionFormat(Utils.s(value));
case "default" -> setDefault(value);
case "enum" ->
setEnum(listBuilder(Object.class).sparse().addAny(value).build());
case "exclusiveMaximum" ->
setExclusiveMaximum(toBoolean(value));
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
- case "format" -> setFormat(stringify(value));
+ case "format" -> setFormat(Utils.s(value));
case "items" -> setItems(toType(value,Items.class));
case "maximum" -> setMaximum(toNumber(value));
case "maxItems" -> setMaxItems(toInteger(value));
@@ -680,9 +681,9 @@ public class Items extends SwaggerElement {
case "minItems" -> setMinItems(toInteger(value));
case "minLength" -> setMinLength(toInteger(value));
case "multipleOf" -> setMultipleOf(toNumber(value));
- case "pattern" -> setPattern(stringify(value));
- case "$ref" -> setRef(stringify(value));
- case "type" -> setType(stringify(value));
+ case "pattern" -> setPattern(Utils.s(value));
+ case "$ref" -> setRef(Utils.s(value));
+ case "type" -> setType(Utils.s(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
index a9e8b3a2e..ede2c8274 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/License.java
@@ -164,7 +164,7 @@ public class License extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "name" -> setName(stringify(value));
+ case "name" -> setName(Utils.s(value));
case "url" -> setUrl(StringUtils.toURI(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
index 4a439969a..2359a975c 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Operation.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -825,15 +826,15 @@ public class Operation extends SwaggerElement {
return switch (property) {
case "consumes" ->
setConsumes(listBuilder(MediaType.class).sparse().addAny(value).build());
case "deprecated" -> setDeprecated(toBoolean(value));
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "externalDocs" -> setExternalDocs(toType(value,
ExternalDocumentation.class));
- case "operationId" -> setOperationId(stringify(value));
+ case "operationId" -> setOperationId(Utils.s(value));
case "parameters" ->
setParameters(listBuilder(ParameterInfo.class).sparse().addAny(value).build());
case "produces" ->
setProduces(listBuilder(MediaType.class).sparse().addAny(value).build());
case "responses" ->
setResponses(mapBuilder(String.class,ResponseInfo.class).sparse().addAny(value).build());
case "schemes" ->
setSchemes(listBuilder(String.class).sparse().addAny(value).build());
case "security" ->
setSecurity((List)listBuilder(Map.class,String.class,List.class,String.class).sparse().addAny(value).build());
- case "summary" -> setSummary(stringify(value));
+ case "summary" -> setSummary(Utils.s(value));
case "tags" ->
setTags(listBuilder(String.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
index 594583650..6cfb3ad12 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ParameterInfo.java
@@ -22,6 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
@@ -946,14 +947,14 @@ public class ParameterInfo extends SwaggerElement {
return this;
return switch (property) {
case "allowEmptyValue" ->
setAllowEmptyValue(toBoolean(value));
- case "collectionFormat" ->
setCollectionFormat(stringify(value));
+ case "collectionFormat" ->
setCollectionFormat(Utils.s(value));
case "default" -> setDefault(value);
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "enum" -> setEnum(value);
case "exclusiveMaximum" ->
setExclusiveMaximum(toBoolean(value));
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
- case "format" -> setFormat(stringify(value));
- case "in" -> setIn(stringify(value));
+ case "format" -> setFormat(Utils.s(value));
+ case "in" -> setIn(Utils.s(value));
case "items" -> setItems(toType(value, Items.class));
case "maximum" -> setMaximum(toNumber(value));
case "maxItems" -> setMaxItems(toInteger(value));
@@ -962,11 +963,11 @@ public class ParameterInfo extends SwaggerElement {
case "minItems" -> setMinItems(toInteger(value));
case "minLength" -> setMinLength(toInteger(value));
case "multipleOf" -> setMultipleOf(toNumber(value));
- case "name" -> setName(stringify(value));
- case "pattern" -> setPattern(stringify(value));
+ case "name" -> setName(Utils.s(value));
+ case "pattern" -> setPattern(Utils.s(value));
case "required" -> setRequired(toBoolean(value));
case "schema" -> setSchema(toType(value,
SchemaInfo.class));
- case "type" -> setType(stringify(value));
+ case "type" -> setType(Utils.s(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
index 76e67e4d2..9d569b6c7 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/ResponseInfo.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -297,7 +298,7 @@ public class ResponseInfo extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "examples" ->
setExamples(mapBuilder(String.class,Object.class).sparse().addAny(value).build());
case "headers" ->
setHeaders(mapBuilder(String.class,HeaderInfo.class).sparse().addAny(value).build());
case "schema" -> setSchema(toType(value,
SchemaInfo.class));
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
index da74f291b..11dee9ccf 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SchemaInfo.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -1032,14 +1033,14 @@ public class SchemaInfo extends SwaggerElement {
case "additionalProperties" ->
setAdditionalProperties(toType(value, SchemaInfo.class));
case "allOf" -> setAllOf(value);
case "default" -> setDefault(value);
- case "description" -> setDescription(stringify(value));
- case "discriminator" ->
setDiscriminator(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "discriminator" ->
setDiscriminator(Utils.s(value));
case "enum" -> setEnum(value);
case "example" -> setExample(value);
case "exclusiveMaximum" ->
setExclusiveMaximum(toBoolean(value));
case "exclusiveMinimum" ->
setExclusiveMinimum(toBoolean(value));
case "externalDocs" -> setExternalDocs(toType(value,
ExternalDocumentation.class));
- case "format" -> setFormat(stringify(value));
+ case "format" -> setFormat(Utils.s(value));
case "items" -> setItems(toType(value, Items.class));
case "maximum" -> setMaximum(toNumber(value));
case "maxItems" -> setMaxItems(toInteger(value));
@@ -1050,14 +1051,14 @@ public class SchemaInfo extends SwaggerElement {
case "minLength" -> setMinLength(toInteger(value));
case "minProperties" ->
setMinProperties(toInteger(value));
case "multipleOf" -> setMultipleOf(toNumber(value));
- case "pattern" -> setPattern(stringify(value));
+ case "pattern" -> setPattern(Utils.s(value));
case "properties" ->
setProperties(mapBuilder(String.class,SchemaInfo.class).sparse().addAny(value).build());
case "readOnly" -> setReadOnly(toBoolean(value));
- case "$ref" -> setRef(stringify(value));
+ case "$ref" -> setRef(Utils.s(value));
case "required" -> setRequired(toBoolean(value));
case "requiredProperties" ->
setRequiredProperties(listBuilder(String.class).sparse().addAny(value).build());
- case "title" -> setTitle(stringify(value));
- case "type" -> setType(stringify(value));
+ case "title" -> setTitle(Utils.s(value));
+ case "type" -> setType(Utils.s(value));
case "uniqueItems" -> setUniqueItems(toBoolean(value));
case "xml" -> setXml(toType(value, Xml.class));
default -> {
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
index d30eda6d4..c84d84e09 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/SecurityScheme.java
@@ -22,6 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.marshaller.*;
@@ -411,14 +412,14 @@ public class SecurityScheme extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "authorizationUrl" ->
setAuthorizationUrl(stringify(value));
- case "description" -> setDescription(stringify(value));
- case "flow" -> setFlow(stringify(value));
- case "in" -> setIn(stringify(value));
- case "name" -> setName(stringify(value));
+ case "authorizationUrl" ->
setAuthorizationUrl(Utils.s(value));
+ case "description" -> setDescription(Utils.s(value));
+ case "flow" -> setFlow(Utils.s(value));
+ case "in" -> setIn(Utils.s(value));
+ case "name" -> setName(Utils.s(value));
case "scopes" ->
setScopes(mapBuilder(String.class,String.class).sparse().addAny(value).build());
- case "tokenUrl" -> setTokenUrl(stringify(value));
- case "type" -> setType(stringify(value));
+ case "tokenUrl" -> setTokenUrl(Utils.s(value));
+ case "type" -> setType(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
index ddc301155..33f2048f1 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Swagger.java
@@ -22,6 +22,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.objecttools.*;
@@ -888,11 +889,11 @@ public class Swagger extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "basePath" -> setBasePath(stringify(value));
+ case "basePath" -> setBasePath(Utils.s(value));
case "consumes" ->
setConsumes(listBuilder(MediaType.class).sparse().addAny(value).build());
case "definitions" ->
setDefinitions(mapBuilder(String.class,JsonMap.class).sparse().addAny(value).build());
case "externalDocs" -> setExternalDocs(toType(value,
ExternalDocumentation.class));
- case "host" -> setHost(stringify(value));
+ case "host" -> setHost(Utils.s(value));
case "info" -> setInfo(toType(value, Info.class));
case "parameters" ->
setParameters(mapBuilder(String.class,ParameterInfo.class).sparse().addAny(value).build());
case "paths" ->
setPaths(mapBuilder(String.class,OperationMap.class).sparse().addAny(value).build());
@@ -901,7 +902,7 @@ public class Swagger extends SwaggerElement {
case "schemes" ->
setSchemes(listBuilder(String.class).sparse().addAny(value).build());
case "security" ->
setSecurity((List)listBuilder(Map.class,String.class,List.class,String.class).sparse().addAny(value).build());
case "securityDefinitions" ->
setSecurityDefinitions(mapBuilder(String.class,SecurityScheme.class).sparse().addAny(value).build());
- case "swagger" -> setSwagger(stringify(value));
+ case "swagger" -> setSwagger(Utils.s(value));
case "tags" ->
setTags(listBuilder(Tag.class).sparse().addAny(value).build());
default -> {
super.set(property, value);
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
index b0900e477..b54daa1fc 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Tag.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -198,9 +199,9 @@ public class Tag extends SwaggerElement {
if (property == null)
return this;
return switch (property) {
- case "description" -> setDescription(stringify(value));
+ case "description" -> setDescription(Utils.s(value));
case "externalDocs" -> setExternalDocs(toType(value,
ExternalDocumentation.class));
- case "name" -> setName(stringify(value));
+ case "name" -> setName(Utils.s(value));
default -> {
super.set(property, value);
yield this;
diff --git
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
index 44c2f2e31..1ff57f1ac 100644
---
a/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
+++
b/juneau-bean/juneau-bean-openapi3/src/main/java/org/apache/juneau/bean/swagger/Xml.java
@@ -19,6 +19,7 @@ import static org.apache.juneau.internal.ConverterUtils.*;
import java.util.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
/**
@@ -272,9 +273,9 @@ public class Xml extends SwaggerElement {
return this;
return switch (property) {
case "attribute" -> setAttribute(toBoolean(value));
- case "name" -> setName(stringify(value));
- case "namespace" -> setNamespace(stringify(value));
- case "prefix" -> setPrefix(stringify(value));
+ case "name" -> setName(Utils.s(value));
+ case "namespace" -> setNamespace(Utils.s(value));
+ case "prefix" -> setPrefix(Utils.s(value));
case "wrapped" -> setWrapped(toBoolean(value));
default -> {
super.set(property, value);
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
index 7058f14ff..0c4df3eb3 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicates.java
@@ -135,7 +135,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> eq(String value) {
- return test(x -> Objects.equals(stringify(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
+ return test(x -> Objects.equals(Utils.s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
}
/**
@@ -163,7 +163,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> ne(String value) {
- return test(x -> ! Objects.equals(stringify(x), value),
MSG_valueUnexpectedlyMatched, VALUE);
+ return test(x -> ! Objects.equals(Utils.s(x), value),
MSG_valueUnexpectedlyMatched, VALUE);
}
/**
@@ -177,7 +177,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> eqic(String value) {
- return test(x -> StringUtils.eqic(stringify(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
+ return test(x -> StringUtils.eqic(Utils.s(x), value),
MSG_valueDidNotMatchExpected, value, VALUE);
}
/**
@@ -191,7 +191,7 @@ public class AssertionPredicates {
* @return A new predicate.
*/
public static final <T> AssertionPredicate<T> contains(String value) {
- return test(x -> StringUtils.contains(stringify(x), value),
MSG_valueDidNotContainExpected, value, VALUE);
+ return test(x -> StringUtils.contains(Utils.s(x), value),
MSG_valueDidNotContainExpected, value, VALUE);
}
/**
@@ -240,7 +240,7 @@ public class AssertionPredicates {
public static final <T> AssertionPredicate<T> match(String value) {
assertArgNotNull("value", value);
var p = StringUtils.getMatchPattern(value);
- return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, value, VALUE);
+ return test(x -> x != null && p.matcher(Utils.s(x)).matches(),
MSG_valueDidNotMatchPattern, value, VALUE);
}
/**
@@ -256,7 +256,7 @@ public class AssertionPredicates {
public static final <T> AssertionPredicate<T> regex(String expression) {
assertArgNotNull("expression", expression);
var p = Pattern.compile(expression);
- return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, expression,
VALUE);
+ return test(x -> x != null && p.matcher(Utils.s(x)).matches(),
MSG_valueDidNotMatchPattern, expression, VALUE);
}
/**
@@ -283,7 +283,7 @@ public class AssertionPredicates {
public static final <T> AssertionPredicate<T> regex(String expression,
int flags) {
assertArgNotNull("expression", expression);
var p = Pattern.compile(expression, flags);
- return test(x -> x != null &&
p.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern, expression,
VALUE);
+ return test(x -> x != null && p.matcher(Utils.s(x)).matches(),
MSG_valueDidNotMatchPattern, expression, VALUE);
}
/**
@@ -298,7 +298,7 @@ public class AssertionPredicates {
*/
public static final <T> AssertionPredicate<T> regex(Pattern value) {
assertArgNotNull("value", value);
- return test(x -> x != null &&
value.matcher(stringify(x)).matches(), MSG_valueDidNotMatchPattern,
value.pattern(), VALUE);
+ return test(x -> x != null &&
value.matcher(Utils.s(x)).matches(), MSG_valueDidNotMatchPattern,
value.pattern(), VALUE);
}
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index a04e6a391..cb9b6f058 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -13,7 +13,7 @@
package org.apache.juneau.assertions;
import static org.apache.juneau.common.internal.ArgUtils.*;
-import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import static java.util.Arrays.*;
@@ -190,7 +190,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ?
null : stream(value()).map(StringUtils::stringify).toList(), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ?
null : stream(value()).map((o) -> s(o)).toList(), returns());
}
/**
@@ -221,7 +221,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
*/
public FluentStringAssertion<R> asCdl(Function<E,String> function) {
List<String> l = valueIsNull() ? null :
stream(value()).map(function::apply).toList();
- return new FluentStringAssertion<>(this, join(l, ','),
returns());
+ return new FluentStringAssertion<>(this, StringUtils.join(l,
','), returns());
}
/**
@@ -453,7 +453,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
}
private List<E> toList() {
- return valueIsNull() ? null : list(value());
+ return valueIsNull() ? null : Utils.list(value());
}
private List<E> toSortedList(Comparator<E> comparator) {
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 6d022af41..dfe5e95df 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -12,7 +12,7 @@
//
***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.internal.ObjectUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import java.io.*;
import java.util.*;
@@ -171,7 +171,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(StringUtils::stringify).toList(), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ?
null : value().stream().map(o -> s(o)).toList(), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index b2c46f748..9838aaa7e 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -21,6 +21,7 @@ import java.io.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
@@ -586,7 +587,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @return The inner value as a string, or <jk>null</jk> if the value
was null.
*/
protected String valueAsString() {
- return stringify(value);
+ return Utils.s(value);
}
/**
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
index 90ecc52f0..0526efe25 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/StringAssertion.java
@@ -18,6 +18,7 @@ import java.io.*;
import java.util.function.*;
import java.util.regex.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -149,7 +150,7 @@ public class StringAssertion extends
FluentStringAssertion<StringAssertion> {
* <br>Can be <jk>null</jk>.
*/
public StringAssertion(Object value) {
- super(stringify(value), null);
+ super(Utils.s(value), null);
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 15878eda6..32ea5aa38 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -388,7 +388,7 @@ public final class StringUtils {
if (tokens == null)
return null;
if (tokens.length == 1)
- return emptyIfNull(stringify(tokens[0]));
+ return emptyIfNull(Utils.s(tokens[0]));
return join(tokens, d, new StringBuilder()).toString();
}
@@ -488,7 +488,7 @@ public final class StringUtils {
for (int i = 0, j = tokens.size(); i < j; i++) {
if (i > 0)
sb.append(d);
- sb.append(escapeChars(stringify(tokens.get(i)), as));
+ sb.append(escapeChars(Utils.s(tokens.get(i)), as));
}
return sb.toString();
}
@@ -1746,16 +1746,6 @@ public final class StringUtils {
return sb.toString();
}
- /**
- * Calls {@link #toString()} on the specified object if it's not null.
- *
- * @param o The object to convert to a string.
- * @return The object converted to a string, or <jk>null</jk> if the
object was null.
- */
- public static String stringify(Object o) {
- return o == null ? null : o.toString();
- }
-
/**
* Converts the specified array to a string.
*
@@ -2008,7 +1998,7 @@ public final class StringUtils {
if (o == null)
return null;
- var s = stringify(o);
+ var s = Utils.s(o);
var needsEncode = false;
for (var i = 0; i < s.length() && ! needsEncode; i++)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index 8f5fc3ada..248aa7bfd 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -20,6 +20,7 @@ import java.util.*;
import java.util.concurrent.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.reflect.*;
@@ -78,7 +79,7 @@ public class BeanRegistry {
} else if (ci.isChildOf(Map.class)) {
Map<?,?> m =
BeanCreator.of(Map.class).type(c).run();
m.forEach((k,v) -> {
- String typeName = stringify(k);
+ String typeName = Utils.s(k);
ClassMeta<?> val = null;
if (v instanceof Type)
val =
beanContext.getClassMeta((Type)v);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
index 3d62b437d..2402fdc88 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/InvalidDataConversionException.java
@@ -16,6 +16,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import java.text.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.reflect.*;
@@ -61,7 +62,7 @@ public final class InvalidDataConversionException extends
BasicRuntimeException
* @param value The value being converted.
*/
public InvalidDataConversionException(Object value, ClassMeta<?>
toType, Exception cause) {
- this(cause, "Invalid data conversion from type ''{0}'' to type
''{1}''. Value={2}.", name(value), stringify(toType), value(value));
+ this(cause, "Invalid data conversion from type ''{0}'' to type
''{1}''. Value={2}.", name(value), Utils.s(toType), value(value));
}
private static String value(Object o) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index a2675f029..a3cb588f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -373,7 +373,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
if (keyValuePairs.length % 2 != 0)
throw new IllegalArgumentException("Odd number of
parameters passed into JsonMap(Object...)");
for (int i = 0; i < keyValuePairs.length; i+=2)
- put(stringify(keyValuePairs[i]), keyValuePairs[i+1]);
+ put(Utils.s(keyValuePairs[i]), keyValuePairs[i+1]);
}
//------------------------------------------------------------------------------------------------------------------
@@ -819,7 +819,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
else if (s instanceof Object[])
r = ArrayUtils.toStringArray(alist((Object[])s));
else
- r = split(stringify(s));
+ r = split(Utils.s(s));
return (r.length == 0 ? def : r);
}
@@ -1600,7 +1600,7 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
*/
public String asString() {
if (Json5Serializer.DEFAULT == null)
- return stringify(this);
+ return Utils.s(this);
return Json5Serializer.DEFAULT.toString(this);
}
@@ -1611,7 +1611,7 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
*/
public String asReadableString() {
if (Json5Serializer.DEFAULT_READABLE == null)
- return stringify(this);
+ return Utils.s(this);
return Json5Serializer.DEFAULT_READABLE.toString(this);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
index 4de9c89d0..9b7f6828d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/BasicHtmlDocTemplate.java
@@ -270,7 +270,7 @@ public class BasicHtmlDocTemplate implements
HtmlDocTemplate {
w = new HtmlWriter(w) {
@Override
public HtmlWriter text(Object value,
boolean preserveWhitespace) {
- return
super.text(session.resolve(stringify(value)), preserveWhitespace);
+ return
super.text(session.resolve(Utils.s(value)), preserveWhitespace);
}
};
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 49c497ae5..54fdc35a2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -602,7 +602,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.attr("style", style);
out.cTag();
if (link != null)
- out.oTag(i+3, "a").attrUri("href", link.replace("{#}",
stringify(value))).cTag();
+ out.oTag(i+3, "a").attrUri("href", link.replace("{#}",
Utils.s(value))).cTag();
ContentResult cr = serializeAnything(out, key, keyType, null,
null, 2, false, false);
if (link != null)
out.eTag("a");
@@ -830,7 +830,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
if (! isDc)
out.cTag();
if (link != null)
- out.oTag(i+2, "a").attrUri("href",
link.replace("{#}", stringify(o))).cTag();
+ out.oTag(i+2, "a").attrUri("href",
link.replace("{#}", Utils.s(o))).cTag();
ContentResult cr = serializeAnything(out, o,
eType.getElementType(), name, null, 1, false, true);
if (link != null)
out.eTag("a");
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 1e08b08a1..7ac76ae7f 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
@@ -4087,7 +4087,7 @@ public class HttpPartSchema {
@Override
public String toString() {
try {
- Predicate<Object> ne = x -> isNotEmpty(stringify(x));
+ Predicate<Object> ne = x -> isNotEmpty(Utils.s(x));
Predicate<Boolean> nf = Utils::isTrue;
Predicate<Number> nm1 = Utils::isNotMinusOne;
Predicate<Object> nn = Utils::isNotNull;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
index 6feb6f366..cbff34e55 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ArrayUtils.java
@@ -256,7 +256,7 @@ public final class ArrayUtils {
String[] r = new String[c.size()];
int i = 0;
for (Object o : c)
- r[i++] = stringify(o);
+ r[i++] = Utils.s(o);
return r;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
index aa0a3d401..f9b97fa50 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
@@ -18,6 +18,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
/**
* Represents a wrapped {@link Map} where entries in the map can be removed
without affecting the underlying map.
@@ -43,7 +44,7 @@ public class DelegateMap<T extends Map> extends JsonMap
implements Delegate<T> {
@SuppressWarnings("unchecked")
public DelegateMap(T m, BeanSession session) {
this.classMeta = session.getClassMetaForObject(m);
- m.forEach((k,v) -> put(stringify(k), v));
+ m.forEach((k,v) -> put(Utils.s(k), v));
}
@Override /* Delegate */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 5cbdc29b4..d1a5069f0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -343,21 +343,21 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
} else if (t == BOOLEAN) {
- out = stringify(toType(value, CM_Boolean));
+ out = Utils.s(toType(value, CM_Boolean));
} else if (t == INTEGER) {
if (f == INT64)
- out = stringify(toType(value, CM_Long));
+ out = Utils.s(toType(value, CM_Long));
else
- out = stringify(toType(value,
CM_Integer));
+ out = Utils.s(toType(value,
CM_Integer));
} else if (t == NUMBER) {
if (f == DOUBLE)
- out = stringify(toType(value,
CM_Double));
+ out = Utils.s(toType(value, CM_Double));
else
- out = stringify(toType(value,
CM_Float));
+ out = Utils.s(toType(value, CM_Float));
} else if (t == ARRAY) {
@@ -406,7 +406,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
} else if (type.isMap()) {
OapiStringBuilder sb = new
OapiStringBuilder(cf);
HttpPartSchema schema2 = schema;
- ((Map<?,?>)value).forEach((k,v) ->
sb.append(k, serialize(partType, schema2.getProperty(stringify(k)), v)));
+ ((Map<?,?>)value).forEach((k,v) ->
sb.append(k, serialize(partType, schema2.getProperty(Utils.s(k)), v)));
out = sb.toString();
} else {
@@ -461,11 +461,11 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
delim(cf);
first = false;
if (cf == PIPES)
- sb.append(escapeChars(stringify(o), PIPE));
+ sb.append(escapeChars(Utils.s(o), PIPE));
else if (cf == SSV || cf == TSV)
- sb.append(stringify(o));
+ sb.append(Utils.s(o));
else
- sb.append(escapeChars(stringify(o), COMMA));
+ sb.append(escapeChars(Utils.s(o), COMMA));
return this;
}
@@ -474,11 +474,11 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
delim(cf);
first = false;
if (cf == PIPES)
- sb.append(escapeChars(stringify(key),
PIPE_OR_EQ)).append('=').append(escapeChars(stringify(val), PIPE_OR_EQ));
+ sb.append(escapeChars(Utils.s(key),
PIPE_OR_EQ)).append('=').append(escapeChars(Utils.s(val), PIPE_OR_EQ));
else if (cf == SSV || cf == TSV)
- sb.append(escapeChars(stringify(key),
EQ)).append('=').append(escapeChars(stringify(val), EQ));
+ sb.append(escapeChars(Utils.s(key),
EQ)).append('=').append(escapeChars(Utils.s(val), EQ));
else
- sb.append(escapeChars(stringify(key),
COMMA_OR_EQ)).append('=').append(escapeChars(stringify(val), COMMA_OR_EQ));
+ sb.append(escapeChars(Utils.s(key),
COMMA_OR_EQ)).append('=').append(escapeChars(Utils.s(val), COMMA_OR_EQ));
return this;
}
@@ -501,7 +501,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
});
} else {
HttpPartSchema s2 = s;
- ((Map<?,?>)o).forEach((k,v) -> m.put(stringify(k),
toObject(partType, v, s2.getProperty(stringify(k)))));
+ ((Map<?,?>)o).forEach((k,v) -> m.put(Utils.s(k),
toObject(partType, v, s2.getProperty(Utils.s(k)))));
}
if (isSortMaps())
return sort(m);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
index 10b60abf9..f579d39e3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectSearcher.java
@@ -19,6 +19,7 @@ import java.lang.reflect.*;
import java.util.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
/**
* POJO model searcher.
@@ -215,7 +216,7 @@ public final class ObjectSearcher implements
ObjectTool<SearchArgs> {
@SuppressWarnings("unchecked")
RowMatcher(BeanSession bs, Map query) {
this.bs = bs;
- query.forEach((k,v) -> entryMatchers.put(stringify(k),
new ColumnMatcher(bs, stringify(v))));
+ query.forEach((k,v) -> entryMatchers.put(Utils.s(k),
new ColumnMatcher(bs, Utils.s(v))));
}
boolean matches(Object o) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
index 28219252f..426c19771 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/MapVar.java
@@ -17,6 +17,8 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import java.util.*;
+import org.apache.juneau.common.internal.*;
+
/**
* A subclass of {@link DefaultingVar} that simply pulls values from a {@link
Map}.
*
@@ -43,6 +45,6 @@ public abstract class MapVar extends DefaultingVar {
@Override /* Var */
public String resolve(VarResolverSession session, String varVal) {
- return stringify(m.get(varVal));
+ return Utils.s(m.get(varVal));
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
index a2ca0303f..f93fc7998 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializerSession.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -347,13 +348,13 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
((Collection<?>)value).forEach(x -> {
addAmp.ifSet(()->out.cr(indent).append('&')).set();
out.appendObject(key,
true).append('=');
- super.serializeAnything(out, x,
null, stringify(key), null);
+ super.serializeAnything(out, x,
null, Utils.s(key), null);
});
} else /* array */ {
for (int i = 0; i <
Array.getLength(value); i++) {
addAmp.ifSet(()->out.cr(indent).append('&')).set();
out.appendObject(key,
true).append('=');
- super.serializeAnything(out,
Array.get(value, i), null, stringify(key), null);
+ super.serializeAnything(out,
Array.get(value, i), null, Utils.s(key), null);
}
}
} else {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 543172518..84a34be60 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -26,6 +26,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -754,7 +755,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
} else /* Map */ {
Map m2 = (Map)value;
if (m2 != null)
-
m2.forEach((k,v) -> out.attr(ns, stringify(k), v));
+
m2.forEach((k,v) -> out.attr(ns, Utils.s(k), v));
}
} else {
out.attr(ns, key, value);
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
index 5afe2dc71..915bbd04e 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/Microservice.java
@@ -1080,7 +1080,7 @@ public class Microservice implements ConfigEventListener {
List<String> l = list();
l.add(command);
for (Object a : args)
- l.add(stringify(a));
+ l.add(Utils.s(a));
Args args2 = new Args(l.toArray(new String[l.size()]));
try (Scanner in = new Scanner(input); PrintWriter out = new
PrintWriter(sw)) {
executeCommand(args2, in, out);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 157ee8637..a5a716584 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -44,6 +44,7 @@ import org.apache.http.params.*;
import org.apache.http.protocol.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.html.*;
import org.apache.juneau.http.*;
import org.apache.juneau.http.HttpHeaders;
@@ -1425,7 +1426,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
else if (value instanceof InputStream)
q = read((InputStream)value);
else
- q = stringify(value); // Works for
NameValuePairs.
+ q = Utils.s(value); // Works for
NameValuePairs.
uriBuilder.setCustomQuery(q);
} catch (IOException e) {
throw new BasicRuntimeException(e, "Could not read
custom query.");
@@ -1493,7 +1494,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
boolean isMulti = isEmpty(name) || "*".equals(name) || value
instanceof HeaderList || isHeaderArray(value);
if (! isMulti) {
- if (! (skipIfEmpty && isEmpty(stringify(value))))
+ if (! (skipIfEmpty && isEmpty(Utils.s(value))))
return header(createHeader(name, value,
serializer, schema, skipIfEmpty));
return this;
}
@@ -1510,7 +1511,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
for (int i = 0; i < Array.getLength(value); i++)
l.add(HttpHeaders.cast(Array.get(value, i)));
} else if (value instanceof Map) {
- toMap(value).forEach((k,v) ->
l.add(createHeader(stringify(k), v, serializer, schema, skipIfEmpty)));
+ toMap(value).forEach((k,v) ->
l.add(createHeader(Utils.s(k), v, serializer, schema, skipIfEmpty)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k,v) -> l.add(createHeader(k,
v, serializer, schema, skipIfEmpty)));
} else if (value != null) {
@@ -1529,7 +1530,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
boolean isMulti = isEmpty(name) || "*".equals(name) || value
instanceof PartList || isNameValuePairArray(value);
if (! isMulti) {
- if (! (skipIfEmpty && isEmpty(stringify(value))))
+ if (! (skipIfEmpty && isEmpty(Utils.s(value))))
return queryData(createPart(name, value, QUERY,
serializer, schema, skipIfEmpty));
return this;
}
@@ -1546,7 +1547,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
for (int i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
} else if (value instanceof Map) {
- toMap(value).forEach((k,v) ->
l.add(createPart(stringify(k), v, QUERY, serializer, schema, skipIfEmpty)));
+ toMap(value).forEach((k,v) ->
l.add(createPart(Utils.s(k), v, QUERY, serializer, schema, skipIfEmpty)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k,v) -> l.add(createPart(k,
v, QUERY, serializer, schema, skipIfEmpty)));
} else if (value != null) {
@@ -1566,7 +1567,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
boolean isMulti = isEmpty(name) || "*".equals(name) || value
instanceof PartList || isNameValuePairArray(value);
if (! isMulti) {
- if (! (skipIfEmpty && isEmpty(stringify(value))))
+ if (! (skipIfEmpty && isEmpty(Utils.s(value))))
return formData(createPart(name, value,
FORMDATA, serializer, schema, skipIfEmpty));
return this;
}
@@ -1583,7 +1584,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
for (int i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
} else if (value instanceof Map) {
- toMap(value).forEach((k,v) ->
l.add(createPart(stringify(k), v, FORMDATA, serializer, schema, skipIfEmpty)));
+ toMap(value).forEach((k,v) ->
l.add(createPart(Utils.s(k), v, FORMDATA, serializer, schema, skipIfEmpty)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k,v) -> l.add(createPart(k,
v, FORMDATA, serializer, schema, skipIfEmpty)));
} else if (value != null) {
@@ -1617,7 +1618,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
for (int i = 0; i < Array.getLength(value); i++)
l.add(HttpParts.cast(Array.get(value, i)));
} else if (value instanceof Map) {
- toMap(value).forEach((k,v) ->
l.add(createPart(stringify(k), v, PATH, serializer, schema, false)));
+ toMap(value).forEach((k,v) ->
l.add(createPart(Utils.s(k), v, PATH, serializer, schema, false)));
} else if (isBean(value)) {
toBeanMap(value).forEach((k,v) -> l.add(createPart(k,
v, PATH, serializer, schema, false)));
} else if (value != null) {
@@ -1697,7 +1698,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
*/
@FluentSetter
public RestRequest contentString(Object input) throws RestCallException
{
- return content(input == null ? null : new
StringReader(stringify(input)));
+ return content(input == null ? null : new
StringReader(Utils.s(input)));
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
index 6ffa94401..505b61e0b 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpHeaders.java
@@ -22,6 +22,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.header.Date;
import org.apache.juneau.http.part.*;
@@ -2677,7 +2678,7 @@ public class HttpHeaders {
return
BasicHeader.of(((NameValuePairable)o).asNameValuePair());
if (o instanceof Map.Entry) {
Map.Entry e = (Map.Entry)o;
- return BasicHeader.of(stringify(e.getKey()),
stringify(e.getValue()));
+ return BasicHeader.of(Utils.s(e.getKey()),
Utils.s(e.getValue()));
}
throw new BasicRuntimeException("Object of type {0} could not
be converted to a Header.", className(o));
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
index ded56fb98..5b675cdd8 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/HttpParts.java
@@ -22,6 +22,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.httppart.*;
@@ -536,7 +537,7 @@ public class HttpParts {
}
if (o instanceof Map.Entry) {
Map.Entry e = (Map.Entry)o;
- return BasicPart.of(stringify(e.getKey()),
e.getValue());
+ return BasicPart.of(Utils.s(e.getKey()), e.getValue());
}
throw new BasicRuntimeException("Object of type {0} could not
be converted to a Part.", o == null ? null : o.getClass().getName());
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
index 0d348ad33..f2cd1a1a7 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicBooleanHeader.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -152,7 +153,7 @@ public class BasicBooleanHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
index 7d19f85d8..99e6f6945 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagHeader.java
@@ -18,6 +18,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Category of headers that consist of a single entity validator value.
*
@@ -148,7 +150,7 @@ public class BasicEntityTagHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
index 6a5bd39ad..f2de8ee6d 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicEntityTagsHeader.java
@@ -18,6 +18,8 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Category of headers that consist of a comma-delimited list of entity
validator values.
*
@@ -148,7 +150,7 @@ public class BasicEntityTagsHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index ec44700fe..cca056179 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -114,7 +114,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
assertArg(StringUtils.isNotEmpty(name), "Name cannot be empty
on header.");
this.name = name;
this.value = value instanceof Supplier ? null : value;
- this.stringValue = stringify(value);
+ this.stringValue = Utils.s(value);
this.supplier = Utils.cast(Supplier.class, value);
}
@@ -158,7 +158,7 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
@Override /* Header */
public String getValue() {
if (supplier != null)
- return stringify(supplier.get());
+ return Utils.s(supplier.get());
return stringValue;
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
index 10064ed12..376a9bfb8 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicIntegerHeader.java
@@ -21,6 +21,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -153,7 +154,7 @@ public class BasicIntegerHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
index 12215d775..4f45b0d4c 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicLongHeader.java
@@ -21,6 +21,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -154,7 +155,7 @@ public class BasicLongHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
index c89617631..c0b2fd4f9 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaRangesHeader.java
@@ -19,6 +19,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
/**
* Category of headers that consist of multiple parameterized string values.
@@ -108,7 +109,7 @@ public class BasicMediaRangesHeader extends
BasicStringHeader {
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicMediaRangesHeader(String name, MediaRanges value) {
- super(name, stringify(value));
+ super(name, Utils.s(value));
this.stringValue = null;
this.value = value;
this.supplier = null;
@@ -203,7 +204,7 @@ public class BasicMediaRangesHeader extends
BasicStringHeader {
@Override /* Header */
public String getValue() {
- return stringValue != null ? stringValue : stringify(value());
+ return stringValue != null ? stringValue : Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
index 0c1830a04..112c3c60b 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicMediaTypeHeader.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.json.*;
/**
@@ -108,7 +109,7 @@ public class BasicMediaTypeHeader extends BasicStringHeader
{
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicMediaTypeHeader(String name, MediaType value) {
- super(name, stringify(value));
+ super(name, Utils.s(value));
this.value = value;
this.supplier = null;
}
@@ -133,7 +134,7 @@ public class BasicMediaTypeHeader extends BasicStringHeader
{
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
index 4b1e49751..ec03ea356 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringHeader.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
/**
* Category of headers that consist of a single string value.
@@ -135,7 +136,7 @@ public class BasicStringHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
@Override /* BasicHeader */
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
index e4423396a..0d0b3c7d3 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicStringRangesHeader.java
@@ -19,6 +19,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
/**
* Category of headers that consist of simple comma-delimited lists of strings
with q-values.
@@ -125,7 +126,7 @@ public class BasicStringRangesHeader extends BasicHeader {
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicStringRangesHeader(String name, StringRanges value) {
- super(name, stringify(value));
+ super(name, Utils.s(value));
this.stringValue = null;
this.value = value;
this.supplier = null;
@@ -152,7 +153,7 @@ public class BasicStringRangesHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringValue != null ? stringValue : stringify(value());
+ return stringValue != null ? stringValue : Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
index a4bb7ede2..acfadd3f7 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicUriHeader.java
@@ -19,6 +19,8 @@ import java.net.*;
import java.util.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.*;
+
/**
* Category of headers that consist of a single URL value.
*
@@ -122,7 +124,7 @@ public class BasicUriHeader extends BasicHeader {
* @throws IllegalArgumentException If name is <jk>null</jk> or empty.
*/
public BasicUriHeader(String name, URI value) {
- super(name, stringify(value));
+ super(name, Utils.s(value));
this.value = value;
this.supplier = null;
}
@@ -147,7 +149,7 @@ public class BasicUriHeader extends BasicHeader {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
index 6cc51625c..e217a98d5 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/ClientVersion.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.internal.*;
@@ -125,7 +126,7 @@ public class ClientVersion extends BasicStringHeader {
* <br>Can be <jk>null</jk>.
*/
public ClientVersion(Version value) {
- super(NAME, stringify(value));
+ super(NAME, Utils.s(value));
this.value = value;
this.supplier = null;
}
@@ -149,7 +150,7 @@ public class ClientVersion extends BasicStringHeader {
@Override /* Header */
public String getValue() {
if (supplier != null)
- return stringify(supplier.get());
+ return Utils.s(supplier.get());
return super.getValue();
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
index e9dfbc5bc..0cfdee1c4 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderBeanMeta.java
@@ -18,6 +18,7 @@ import static
org.apache.juneau.common.internal.ThrowableUtils.*;
import java.lang.reflect.*;
import java.util.concurrent.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
@@ -151,12 +152,12 @@ public class HeaderBeanMeta<T> {
Class<?>[] pt = constructor.getParameterTypes();
Object[] args = new Object[pt.length];
if (pt.length == 1) {
- args[0] = pt[0] == String.class ? stringify(value) :
value;
+ args[0] = pt[0] == String.class ? Utils.s(value) :
value;
} else {
if (name == null)
throw new
UnsupportedOperationException("Constructor for type "+type.getName()+" requires
a name as the first argument.");
args[0] = name;
- args[1] = pt[1] == String.class ? stringify(value) :
value;
+ args[1] = pt[1] == String.class ? Utils.s(value) :
value;
}
try {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 0eaee69a0..cf00e0fff 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -934,7 +934,7 @@ public class HeaderList extends ControlledArrayList<Header>
{
}
private Supplier<Object> resolver(Object input) {
- return ()->varResolver.resolve(stringify(unwrap(input)));
+ return ()->varResolver.resolve(Utils.s(unwrap(input)));
}
private Object unwrap(Object o) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
index 1bd58427d..21cc41597 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/IfRange.java
@@ -21,6 +21,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -211,7 +212,7 @@ public class IfRange extends BasicDateHeader {
throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", className(o));
}
if (value != null)
- return stringify(value);
+ return Utils.s(value);
return super.getValue();
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
index 1b4d80470..099ef314e 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/RetryAfter.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
/**
@@ -208,7 +209,7 @@ public class RetryAfter extends BasicDateHeader {
throw new BasicRuntimeException("Invalid object type
returned by supplier: {0}", className(o));
}
if (value != null)
- return stringify(value);
+ return Utils.s(value);
return super.getValue();
}
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
index 0cb0c662d..0484ea339 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/SerializedHeader.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import java.util.function.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.serializer.*;
@@ -289,9 +290,9 @@ public class SerializedHeader extends BasicHeader {
if ((def == null && ! schema.isRequired()) ||
(def == null && schema.isAllowEmptyValue()))
return null;
}
- if (isEmpty(stringify(v)) && skipIfEmpty && def == null)
+ if (isEmpty(Utils.s(v)) && skipIfEmpty && def == null)
return null;
- return serializer == null ? stringify(v) :
serializer.serialize(HttpPartType.HEADER, schema, v);
+ return serializer == null ? Utils.s(v) :
serializer.serialize(HttpPartType.HEADER, schema, v);
} catch (SchemaValidationException e) {
throw new BasicRuntimeException(e, "Validation error on
request {0} parameter ''{1}''=''{2}''", HttpPartType.HEADER, getName(), value);
} catch (SerializeException e) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
index d87ef337a..332c26e67 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicBooleanPart.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
/**
* A {@link NameValuePair} that consists of a single boolean value.
@@ -112,7 +113,7 @@ public class BasicBooleanPart extends BasicPart {
@Override /* NameValuePair */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
index 32638ac40..7084e44c6 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicIntegerPart.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
/**
* A {@link NameValuePair} that consists of a single integer value.
@@ -112,7 +113,7 @@ public class BasicIntegerPart extends BasicPart {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
index 609c413d1..737d25d50 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicLongPart.java
@@ -20,6 +20,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
/**
* A {@link NameValuePair} that consists of a single long value.
@@ -113,7 +114,7 @@ public class BasicLongPart extends BasicPart {
@Override /* Header */
public String getValue() {
- return stringify(value());
+ return Utils.s(value());
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
index b4d544a17..92d4d1f2d 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/BasicPart.java
@@ -23,6 +23,7 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.assertions.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.reflect.*;
@@ -103,7 +104,7 @@ public class BasicPart implements NameValuePair, Headerable
{
}
if (o instanceof Map.Entry) {
Map.Entry e = (Map.Entry)o;
- return BasicPart.of(stringify(e.getKey()),
e.getValue());
+ return BasicPart.of(Utils.s(e.getKey()), e.getValue());
}
throw new BasicRuntimeException("Object of type {0} could not
be converted to a Part.", className(o));
}
@@ -161,7 +162,7 @@ public class BasicPart implements NameValuePair, Headerable
{
@Override /* Headerable */
public BasicHeader asHeader() {
- return BasicHeader.of(name, stringify(value));
+ return BasicHeader.of(name, Utils.s(value));
}
@Override /* NameValuePair */
@@ -171,7 +172,7 @@ public class BasicPart implements NameValuePair, Headerable
{
@Override /* NameValuePair */
public String getValue() {
- return stringify(unwrap(value));
+ return Utils.s(unwrap(value));
}
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
index 4c3eaf85f..2f23cc0a0 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartBeanMeta.java
@@ -18,6 +18,7 @@ import static
org.apache.juneau.common.internal.ThrowableUtils.*;
import java.lang.reflect.*;
import java.util.concurrent.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
@@ -160,12 +161,12 @@ public class PartBeanMeta<T> {
Class<?>[] pt = constructor.getParameterTypes();
Object[] args = new Object[pt.length];
if (pt.length == 1) {
- args[0] = pt[0] == String.class ? stringify(value) :
value;
+ args[0] = pt[0] == String.class ? Utils.s(value) :
value;
} else {
if (name == null)
throw new
UnsupportedOperationException("Constructor for type "+type.getName()+" requires
a name as the first argument.");
args[0] = name;
- args[1] = pt[1] == String.class ? stringify(value) :
value;
+ args[1] = pt[1] == String.class ? Utils.s(value) :
value;
}
try {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 88f7a0b73..ca64a57d1 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -901,7 +901,7 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
}
private Supplier<Object> resolver(Object input) {
- return ()->varResolver.resolve(stringify(unwrap(input)));
+ return ()->varResolver.resolve(Utils.s(unwrap(input)));
}
private Object unwrap(Object o) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
index 4988551a6..9993b02d0 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/SerializedPart.java
@@ -18,6 +18,7 @@ import java.util.function.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
@@ -220,9 +221,9 @@ public class SerializedPart extends BasicPart {
if ((def == null && ! schema.isRequired()) ||
(def == null && schema.isAllowEmptyValue()))
return null;
}
- if (isEmpty(stringify(v)) && skipIfEmpty && def == null)
+ if (isEmpty(Utils.s(v)) && skipIfEmpty && def == null)
return null;
- return serializer == null ? stringify(v) :
serializer.serialize(type, schema, v);
+ return serializer == null ? Utils.s(v) :
serializer.serialize(type, schema, v);
} catch (SchemaValidationException e) {
throw new BasicRuntimeException(e, "Validation error on
request {0} part ''{1}''=''{2}''", type, getName(), value);
} catch (SerializeException e) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
index c4ac12ebb..09370e304 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestResponse.java
@@ -27,6 +27,7 @@ import jakarta.servlet.http.*;
import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.Utils;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
@@ -816,7 +817,7 @@ public final class RestResponse extends
HttpServletResponseWrapper {
}
private String resolveUris(Object value) {
- String s = stringify(value);
+ String s = Utils.s(value);
return request.getUriResolver().resolve(s);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
index cbe3ca4f1..9f5feb8ac 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestAttribute.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.util.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.rest.*;
@@ -85,7 +86,7 @@ public class RequestAttribute extends BasicNamedAttribute {
* @return The value of this part as a string, or {@link
Optional#empty()} if the part was not present.
*/
public Optional<String> asString() {
- return optional(stringify(getValue()));
+ return optional(Utils.s(getValue()));
}
/**
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
index 23115b9f2..160ae519f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestContent.java
@@ -24,6 +24,7 @@ import jakarta.servlet.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
@@ -533,7 +534,7 @@ public class RequestContent {
MediaType mt = getMediaType();
- if ((isEmpty(stringify(mt)) ||
mt.toString().startsWith("text/plain")) && cm.hasStringMutater())
+ if ((isEmpty(Utils.s(mt)) ||
mt.toString().startsWith("text/plain")) && cm.hasStringMutater())
return cm.getStringMutater().mutate(asString());
Optional<ContentType> ct = req.getHeader(ContentType.class);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 1705be47d..630a80d7d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -280,7 +280,7 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
*/
public RequestFormParams add(String name, Object value) {
assertArgNotNull("name", name);
- add(new RequestFormParam(req, name,
stringify(value)).parser(parser));
+ add(new RequestFormParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
@@ -334,7 +334,7 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
*/
public RequestFormParams set(String name, Object value) {
assertArgNotNull("name", name);
- set(new RequestFormParam(req, name,
stringify(value)).parser(parser));
+ set(new RequestFormParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index ba8af4b4b..a5280acce 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -255,7 +255,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public RequestHeaders add(String name, Object value) {
assertArgNotNull("name", name);
- add(new RequestHeader(req, name,
stringify(value)).parser(parser));
+ add(new RequestHeader(req, name,
Utils.s(value)).parser(parser));
return this;
}
@@ -293,7 +293,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*/
public RequestHeaders set(String name, Object value) {
assertArgNotNull("name", name);
- set(new RequestHeader(req, name,
stringify(value)).parser(parser));
+ set(new RequestHeader(req, name,
Utils.s(value)).parser(parser));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index aa060c4d2..5c49a0e27 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -252,7 +252,7 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
*/
public RequestPathParams add(String name, Object value) {
assertArgNotNull("name", name);
- add(new RequestPathParam(req, name,
stringify(value)).parser(parser));
+ add(new RequestPathParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
@@ -290,7 +290,7 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
*/
public RequestPathParams set(String name, Object value) {
assertArgNotNull("name", name);
- set(new RequestPathParam(req, name,
stringify(value)).parser(parser));
+ set(new RequestPathParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 79a1672a2..edb21647d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -271,7 +271,7 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
*/
public RequestQueryParams add(String name, Object value) {
assertArgNotNull("name", name);
- add(new RequestQueryParam(req, name,
stringify(value)).parser(parser));
+ add(new RequestQueryParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
@@ -309,7 +309,7 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
*/
public RequestQueryParams set(String name, Object value) {
assertArgNotNull("name", name);
- set(new RequestQueryParam(req, name,
stringify(value)).parser(parser));
+ set(new RequestQueryParam(req, name,
Utils.s(value)).parser(parser));
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
index 34af5bbb3..6a9fabe55 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseBeanProcessor.java
@@ -23,6 +23,7 @@ import java.util.*;
import org.apache.juneau.rest.*;
import org.apache.http.*;
import org.apache.http.Header;
+import org.apache.juneau.common.internal.Utils;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
@@ -76,7 +77,7 @@ public final class ResponseBeanProcessor implements
ResponseProcessor {
if (o2 instanceof Map.Entry) {
@SuppressWarnings("rawtypes")
Map.Entry x =
(Map.Entry)o2;
- String k =
stringify(x.getKey());
+ String k =
Utils.s(x.getKey());
h = new
SerializedHeader(k, x.getValue(),
hm.getSerializer().orElse(defaultPartSerializer).getPartSession(),
ps.getProperty(k), true);
} else if (o2 instanceof
Header) {
h = (Header)o2;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index 3a77f5bab..00f3196b4 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -24,6 +24,7 @@ import java.util.regex.*;
import jakarta.servlet.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
@@ -291,7 +292,7 @@ public final class RestUtils {
if (m == null)
m = map();
- if (qs == null || ((qs instanceof CharSequence) &&
isEmpty(stringify(qs))))
+ if (qs == null || ((qs instanceof CharSequence) &&
isEmpty(Utils.s(qs))))
return m;
try (ParserPipe p = new ParserPipe(qs)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
index b5860b618..448aa1ee8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.vars;
+import static org.apache.juneau.common.internal.Utils.*;
+
import java.util.*;
import org.apache.juneau.bean.swagger.*;
@@ -97,7 +99,7 @@ public class RequestSwaggerVar extends MultipartResolvingVar {
char c = StringUtils.charAt(key, 0);
if (c == 'c') {
if ("contact".equals(key))
- return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getContact()).map(StringUtils::stringify).orElse(null);
+ return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getContact()).map(o
-> s(o)).orElse(null);
} else if (c == 'd') {
if ("description".equals(key))
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getDescription()).orElse(null);
@@ -106,7 +108,7 @@ public class RequestSwaggerVar extends
MultipartResolvingVar {
return
swagger.map(Swagger::getExternalDocs).map(ExternalDocumentation::toString).orElse(null);
} else if (c == 'l') {
if ("license".equals(key))
- return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getLicense()).map(StringUtils::stringify).orElse(null);
+ return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getLicense()).map(o
-> s(o)).orElse(null);
} else if (c == 'o') {
if ("operationDescription".equals(key))
return
methodSwagger.map(Operation::getDescription).orElse(null);
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
index 1a9d81c1f..03932dc79 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/header/HeaderBeanMeta_Test.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.junit.jupiter.api.*;
@@ -38,7 +39,7 @@ class HeaderBeanMeta_Test extends SimpleTestBase {
public A2(String name, Object value) {
this.name = name;
- this.value = stringify(value);
+ this.value = Utils.s(value);
}
}
@@ -56,7 +57,7 @@ class HeaderBeanMeta_Test extends SimpleTestBase {
public String value;
public A4(Object value) {
- this.value = stringify(value);
+ this.value = Utils.s(value);
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
index 5c553e7ee..7275b52a1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartBeanMeta_Test.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import static org.junit.Assert.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.junit.jupiter.api.*;
@@ -41,7 +42,7 @@ class PartBeanMeta_Test extends SimpleTestBase {
public A2(String name, Object value) {
this.name = name;
- this.value = stringify(value);
+ this.value = Utils.s(value);
}
}
@@ -59,7 +60,7 @@ class PartBeanMeta_Test extends SimpleTestBase {
public String value;
public A4(Object value) {
- this.value = stringify(value);
+ this.value = Utils.s(value);
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
index b0e1061ab..8265c1829 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/part/PartList_Test.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.*;
import org.apache.http.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.*;
import org.apache.juneau.http.annotation.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.oapi.*;
@@ -49,7 +50,7 @@ class PartList_Test extends SimpleTestBase {
public static class APart extends BasicStringPart {
public static final APart X = new APart("x"), Y = new
APart("y"), Z = new APart("z");
public APart(Object value) {
- super("a", stringify(value));
+ super("a", Utils.s(value));
}
}
@@ -57,7 +58,7 @@ class PartList_Test extends SimpleTestBase {
public static class BPart extends BasicStringPart {
public static final BPart X = new BPart("x"), Y = new
BPart("y"), Z = new BPart("z");
public BPart(Object value) {
- super("b", stringify(value));
+ super("b", Utils.s(value));
}
}
@@ -65,7 +66,7 @@ class PartList_Test extends SimpleTestBase {
public static class CPart extends BasicStringPart {
public static final CPart X = new CPart("x");
public CPart(Object value) {
- super("c", stringify(value));
+ super("c", Utils.s(value));
}
}
@@ -179,7 +180,7 @@ class PartList_Test extends SimpleTestBase {
@Query("Foo")
static class Foo extends BasicStringPart {
public Foo(Object value) {
- super("Foo", stringify(value));
+ super("Foo", Utils.s(value));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamSerializer.java
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamSerializer.java
index 62f57019b..bbc1a06ef 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamSerializer.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeStreamSerializer.java
@@ -37,7 +37,7 @@ public class FakeStreamSerializer extends
OutputStreamSerializer {
//-------------------------------------------------------------------------------------------------------------------
public static class Builder extends OutputStreamSerializer.Builder {
- BiFunction<SerializerSession,Object,byte[]> function = (s,o) ->
StringUtils.stringify(o).getBytes();
+ BiFunction<SerializerSession,Object,byte[]> function = (s,o) ->
Utils.s(o).getBytes();
Function<SerializerSession,Map<String,String>> headers = s ->
Collections.emptyMap();
public Builder
function(BiFunction<SerializerSession,Object,byte[]> function) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeWriterSerializer.java
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeWriterSerializer.java
index 92627276d..868b3a6f1 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeWriterSerializer.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/utest/utils/FakeWriterSerializer.java
@@ -13,7 +13,7 @@
package org.apache.juneau.utest.utils;
-import static org.apache.juneau.common.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.Utils.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.io.*;
@@ -46,11 +46,11 @@ public class FakeWriterSerializer extends WriterSerializer
implements HttpPartSe
private static String out(Object value) {
if (value instanceof List<?> x)
- value = join(x, '|');
+ value = StringUtils.join(x, '|');
if (value instanceof Collection<?> x)
- value = join(x, '|');
+ value = StringUtils.join(x, '|');
if (isArray(value))
- value = join(toList(value, Object.class), "|");
+ value = StringUtils.join(toList(value,
Object.class), "|");
return "x" + value + "x";
}
}
@@ -68,8 +68,8 @@ public class FakeWriterSerializer extends WriterSerializer
implements HttpPartSe
//-------------------------------------------------------------------------------------------------------------------
public static class Builder extends WriterSerializer.Builder {
- Function2<WriterSerializerSession,Object,String> function =
(s,o) -> StringUtils.stringify(o);
- Function3<HttpPartType,HttpPartSchema,Object,String>
partFunction = (t,s,o) -> StringUtils.stringify(o);
+ Function2<WriterSerializerSession,Object,String> function =
(s,o) -> s(o);
+ Function3<HttpPartType,HttpPartSchema,Object,String>
partFunction = (t,s,o) -> s(o);
Function<WriterSerializerSession,Map<String,String>> headers =
s -> Collections.emptyMap();
public Builder
function(Function2<WriterSerializerSession,Object,String> value) {
