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 64c440464 Minor refactoring.
64c440464 is described below
commit 64c44046459fbd3a70490f6e4031d3427c8c3837
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Fri Jul 1 14:11:15 2022 -0400
Minor refactoring.
---
.../main/java/org/apache/juneau/dto/swagger/HeaderInfo.java | 5 +++--
.../src/main/java/org/apache/juneau/dto/swagger/Items.java | 5 +++--
.../java/org/apache/juneau/dto/swagger/ParameterInfo.java | 7 ++++---
.../java/org/apache/juneau/dto/swagger/SecurityScheme.java | 3 ++-
.../src/main/java/org/apache/juneau/BeanContext.java | 3 ++-
.../src/main/java/org/apache/juneau/collections/JsonList.java | 4 ++--
.../src/main/java/org/apache/juneau/collections/JsonMap.java | 3 ++-
.../src/main/java/org/apache/juneau/cp/Messages.java | 2 +-
.../src/main/java/org/apache/juneau/internal/StringUtils.java | 11 -----------
.../src/main/java/org/apache/juneau/utils/BeanDiff.java | 5 ++---
.../src/main/java/org/apache/juneau/rest/RestResponse.java | 3 ++-
.../java/org/apache/juneau/rest/httppart/RequestContent.java | 5 +++--
.../apache/juneau/rest/processor/SerializedPojoProcessor.java | 5 ++---
.../java/org/apache/juneau/rest/stats/MethodExecStats.java | 5 ++---
.../main/java/org/apache/juneau/rest/stats/ThrownStats.java | 5 ++---
15 files changed, 32 insertions(+), 39 deletions(-)
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index acff4863e..672ae33c0 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -20,6 +20,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Describes a single HTTP header.
@@ -169,7 +170,7 @@ public class HeaderInfo extends SwaggerElement {
if (isStrict() && ! ArrayUtils.contains(value,
VALID_COLLECTION_FORMATS))
throw new BasicRuntimeException(
"Invalid value passed in to
setCollectionFormat(String). Value=''{0}'', valid values={1}",
- value, json(VALID_COLLECTION_FORMATS)
+ value, SimpleJson.of(VALID_COLLECTION_FORMATS)
);
collectionFormat = value;
return this;
@@ -650,7 +651,7 @@ public class HeaderInfo extends SwaggerElement {
if (isStrict() && ! ArrayUtils.contains(value, VALID_TYPES))
throw new BasicRuntimeException(
"Invalid value passed in to setType(String).
Value=''{0}'', valid values={1}",
- value, json(VALID_TYPES)
+ value, SimpleJson.of(VALID_TYPES)
);
type = value;
return this;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index b413a509e..67ddeb0f2 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -21,6 +21,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* A limited subset of JSON-Schema's items object.
@@ -169,7 +170,7 @@ public class Items extends SwaggerElement {
if (isStrict() && ! ArrayUtils.contains(value,
VALID_COLLECTION_FORMATS))
throw new BasicRuntimeException(
"Invalid value passed in to
setCollectionFormat(String). Value=''{0}'', valid values={1}",
- value, json(VALID_COLLECTION_FORMATS)
+ value, SimpleJson.of(VALID_COLLECTION_FORMATS)
);
collectionFormat = value;
return this;
@@ -602,7 +603,7 @@ public class Items extends SwaggerElement {
*/
public Items setType(String value) {
if (isStrict() && ! ArrayUtils.contains(value, VALID_TYPES))
- throw new BasicRuntimeException("Invalid value passed
in to setType(String). Value=''{0}'', valid values={1}", value,
json(VALID_TYPES));
+ throw new BasicRuntimeException("Invalid value passed
in to setType(String). Value=''{0}'', valid values={1}", value,
SimpleJson.of(VALID_TYPES));
type = value;
return this;
}
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 97e065b79..39dfbed7d 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Describes a single operation parameter.
@@ -322,7 +323,7 @@ public class ParameterInfo extends SwaggerElement {
if (isStrict() && ! contains(value, VALID_COLLECTION_FORMATS))
throw new BasicRuntimeException(
"Invalid value passed in to
setCollectionFormat(String). Value=''{0}'', valid values={1}",
- value, json(VALID_COLLECTION_FORMATS)
+ value, SimpleJson.of(VALID_COLLECTION_FORMATS)
);
collectionFormat = value;
return this;
@@ -539,7 +540,7 @@ public class ParameterInfo extends SwaggerElement {
if (isStrict() && ! contains(value, VALID_IN))
throw new BasicRuntimeException(
"Invalid value passed in to setIn(String).
Value=''{0}'', valid values={1}",
- value, json(VALID_IN)
+ value, SimpleJson.of(VALID_IN)
);
in = value;
if ("path".equals(value))
@@ -876,7 +877,7 @@ public class ParameterInfo extends SwaggerElement {
if (isStrict() && ! contains(value, VALID_TYPES))
throw new BasicRuntimeException(
"Invalid value passed in to setType(String).
Value=''{0}'', valid values={1}",
- value, json(VALID_TYPES)
+ value, SimpleJson.of(VALID_TYPES)
);
type = value;
return this;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index fd9f7c1e3..dbd237b7b 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -21,6 +21,7 @@ import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Allows the definition of a security scheme that can be used by the
operations.
@@ -377,7 +378,7 @@ public class SecurityScheme extends SwaggerElement {
if (isStrict() && ! contains(value, VALID_TYPES))
throw new BasicRuntimeException(
"Invalid value passed in to setType(String).
Value=''{0}'', valid values={1}",
- value, json(VALID_TYPES)
+ value, SimpleJson.of(VALID_TYPES)
);
type = value;
return this;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 0987f9f20..aac36741c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -31,6 +31,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.serializer.*;
import org.apache.juneau.swap.*;
@@ -1847,7 +1848,7 @@ public class BeanContext extends Context {
*/
@FluentSetter
public <T> Builder example(Class<T> pojoClass, T o) {
- return
annotations(MarshalledAnnotation.create(pojoClass).example(json(o)).build());
+ return
annotations(MarshalledAnnotation.create(pojoClass).example(SimpleJson.of(o)).build());
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index bc72c8118..917f8fb70 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -13,7 +13,6 @@
package org.apache.juneau.collections;
import static org.apache.juneau.internal.ThrowableUtils.*;
-import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ConsumerUtils.*;
import java.io.*;
@@ -23,6 +22,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.json.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
@@ -1032,6 +1032,6 @@ public class JsonList extends LinkedList<Object> {
@Override /* Object */
public String toString() {
- return json(this);
+ return SimpleJson.of(this);
}
}
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 a2c602b16..7deae2100 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
@@ -24,6 +24,7 @@ import java.util.function.*;
import org.apache.juneau.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.json.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.objecttools.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.serializer.*;
@@ -1893,6 +1894,6 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
@Override /* Object */
public String toString() {
- return json(this);
+ return SimpleJson.of(this);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
index ebc7fcbeb..0f5a69a28 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/Messages.java
@@ -509,6 +509,6 @@ public class Messages extends ResourceBundle {
JsonMap m = new JsonMap();
for (String k : new TreeSet<>(keySet()))
m.put(k, getString(k));
- return json(m);
+ return SimpleJson.of(m);
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 8b294e156..5d9cf234f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -34,7 +34,6 @@ import javax.xml.bind.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
-import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
import org.apache.juneau.reflect.*;
@@ -2858,16 +2857,6 @@ public final class StringUtils {
return read(new GZIPInputStream(new ByteArrayInputStream(is)));
}
- /**
- * Converts the specified object to simplified JSON.
- *
- * @param o The object to convert.
- * @return The specified object as simplified JSON.
- */
- public static final String json(Object o) {
- return SimpleJson.DEFAULT == null ? stringify(o) :
SimpleJson.DEFAULT.write(o);
- }
-
/**
* Converts the specified object to a comma-delimited list.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
index 8da49cc4a..59963f160 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/BeanDiff.java
@@ -14,13 +14,12 @@ package org.apache.juneau.utils;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
-import static org.apache.juneau.internal.StringUtils.*;
-
import java.util.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.Bean;
import org.apache.juneau.collections.*;
+import org.apache.juneau.marshaller.*;
/**
* Utility class for comparing two versions of a POJO.
@@ -247,6 +246,6 @@ public class BeanDiff {
@Override
public String toString() {
- return json(this);
+ return SimpleJson.of(this);
}
}
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 a0cc2bd4d..ec679d85f 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
@@ -30,6 +30,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.httppart.bean.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
@@ -332,7 +333,7 @@ public final class RestResponse {
if
(ae.matches(".*(identity|\\*)\\s*;\\s*q\\s*=\\s*(0(?!\\.)|0\\.0).*")) {
throw new NotAcceptable(
"Unsupported encoding
in request header ''Accept-Encoding'': ''{0}''\n\tSupported codings: {1}",
- ae,
json(encoders.getSupportedEncodings())
+ ae,
SimpleJson.of(encoders.getSupportedEncodings())
);
}
} else {
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 bdd6df0c9..8005d4179 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
@@ -27,6 +27,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.encoders.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
@@ -539,7 +540,7 @@ public class RequestContent {
Optional<ContentType> ct = req.getHeader(ContentType.class);
throw new UnsupportedMediaType(
"Unsupported media-type in request header
''Content-Type'': ''{0}''\n\tSupported media-types: {1}",
- ct.isPresent() ? ct.get().asMediaType().orElse(null) :
"not-specified", json(req.getOpContext().getParsers().getSupportedMediaTypes())
+ ct.isPresent() ? ct.get().asMediaType().orElse(null) :
"not-specified",
SimpleJson.of(req.getOpContext().getParsers().getSupportedMediaTypes())
);
}
@@ -552,7 +553,7 @@ public class RequestContent {
if (encoder == null)
throw new UnsupportedMediaType(
"Unsupported encoding in
request header ''Content-Encoding'': ''{0}''\n\tSupported codings: {1}",
-
req.getHeader("content-encoding").orElse(null),
json(encoders.getSupportedEncodings())
+
req.getHeader("content-encoding").orElse(null),
SimpleJson.of(encoders.getSupportedEncodings())
);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/SerializedPojoProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/SerializedPojoProcessor.java
index a91107a1c..71964ac2b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/SerializedPojoProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/SerializedPojoProcessor.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.processor;
-import static org.apache.juneau.internal.StringUtils.*;
-
import java.io.*;
import java.util.*;
@@ -25,6 +23,7 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.http.response.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Response handler for plain-old Java objects.
@@ -109,7 +108,7 @@ public final class SerializedPojoProcessor implements
ResponseProcessor {
throw new NotAcceptable(
"Unsupported media-type in request header ''Accept'':
''{0}''\n\tSupported media-types: {1}",
- req.getHeader("Accept").orElse(""),
json(res.getOpContext().getSerializers().getSupportedMediaTypes())
+ req.getHeader("Accept").orElse(""),
SimpleJson.of(res.getOpContext().getSerializers().getSupportedMediaTypes())
);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStats.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStats.java
index 6d2da5369..6cce606cf 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStats.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/MethodExecStats.java
@@ -12,8 +12,6 @@
//
***************************************************************************************************************************
package org.apache.juneau.rest.stats;
-import static org.apache.juneau.internal.StringUtils.*;
-
import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.atomic.*;
@@ -21,6 +19,7 @@ import java.util.concurrent.atomic.*;
import org.apache.juneau.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Method execution statistics.
@@ -285,6 +284,6 @@ public class MethodExecStats {
@Override /* Object */
public String toString() {
- return json(this);
+ return SimpleJson.of(this);
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStats.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStats.java
index 44944d966..502ab2c27 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStats.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStats.java
@@ -13,13 +13,12 @@
package org.apache.juneau.rest.stats;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.StringUtils.*;
-
import java.util.*;
import java.util.concurrent.atomic.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
+import org.apache.juneau.marshaller.*;
/**
* Represents an entry in {@link ThrownStore}.
@@ -294,7 +293,7 @@ public class ThrownStats implements Cloneable {
@Override /* Object */
public String toString() {
- return json(this);
+ return SimpleJson.of(this);
}
@Override /* Object */
