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 ea5105b55c SonarQube bug fixes
ea5105b55c is described below
commit ea5105b55c4389c4a111d3c5d6d6506a11476775
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 19:17:15 2026 -0500
SonarQube bug fixes
---
.../src/main/java/org/apache/juneau/commons/lang/StringFormat.java | 2 +-
.../main/java/org/apache/juneau/commons/reflect/MethodInfo.java | 2 +-
.../java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java | 1 +
.../src/main/java/org/apache/juneau/csv/CsvSerializer.java | 2 ++
.../src/main/java/org/apache/juneau/csv/CsvSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/html/HtmlDocSerializer.java | 2 ++
.../main/java/org/apache/juneau/html/HtmlDocSerializerSession.java | 2 ++
.../src/main/java/org/apache/juneau/html/HtmlParser.java | 2 ++
.../src/main/java/org/apache/juneau/html/HtmlParserSession.java | 7 ++++---
.../main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java | 2 ++
.../org/apache/juneau/html/HtmlSchemaDocSerializerSession.java | 2 ++
.../src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java | 5 +++++
.../java/org/apache/juneau/html/HtmlSchemaSerializerSession.java | 2 ++
.../src/main/java/org/apache/juneau/html/HtmlSerializer.java | 4 ++++
.../main/java/org/apache/juneau/html/HtmlSerializerSession.java | 3 ++-
.../java/org/apache/juneau/html/HtmlStrippedDocSerializer.java | 2 ++
.../org/apache/juneau/html/HtmlStrippedDocSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/json/Json5Parser.java | 1 +
.../src/main/java/org/apache/juneau/json/Json5Serializer.java | 2 ++
.../src/main/java/org/apache/juneau/json/JsonParser.java | 1 +
.../src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java | 5 +++++
.../java/org/apache/juneau/json/JsonSchemaSerializerSession.java | 2 ++
.../src/main/java/org/apache/juneau/json/JsonSerializer.java | 4 ++++
.../main/java/org/apache/juneau/json/JsonSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java | 4 ++++
.../java/org/apache/juneau/msgpack/MsgPackSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/oapi/OpenApiParser.java | 2 ++
.../src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java | 2 ++
.../src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java | 2 ++
.../main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java | 3 ++-
.../main/java/org/apache/juneau/plaintext/PlainTextSerializer.java | 2 ++
.../org/apache/juneau/plaintext/PlainTextSerializerSession.java | 3 ++-
.../main/java/org/apache/juneau/serializer/WriterSerializer.java | 4 ++--
.../src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java | 2 ++
.../main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/uon/UonParser.java | 1 +
.../src/main/java/org/apache/juneau/uon/UonSerializer.java | 4 ++++
.../src/main/java/org/apache/juneau/uon/UonSerializerSession.java | 3 ++-
.../main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java | 2 ++
.../org/apache/juneau/urlencoding/UrlEncodingParserSession.java | 3 ++-
.../java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java | 5 +++++
.../apache/juneau/urlencoding/UrlEncodingSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/xml/XmlDocSerializer.java | 2 ++
.../main/java/org/apache/juneau/xml/XmlDocSerializerSession.java | 3 ++-
.../src/main/java/org/apache/juneau/xml/XmlSerializer.java | 7 +++++++
.../src/main/java/org/apache/juneau/rest/client/RestClient.java | 5 +++--
.../main/java/org/apache/juneau/rest/mock/MockServletRequest.java | 4 ++--
.../src/main/java/org/apache/juneau/rest/RestContext.java | 2 +-
.../src/main/java/org/apache/juneau/rest/logger/CallLogger.java | 2 +-
49 files changed, 115 insertions(+), 25 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
index 809eb7f6dd..f90327e923 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/StringFormat.java
@@ -468,7 +468,7 @@ public final class StringFormat {
}
private static int parseIndexMF(String s) {
- if (! s.matches("[0-9]+")) throw new
IllegalArgumentException("can't parse argument number: " + s);
+ if (! s.matches("\\d+")) throw new
IllegalArgumentException("can't parse argument number: " + s);
return Integer.parseInt(s);
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
index 0a94e0a6af..a7d7c765f3 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
@@ -415,7 +415,7 @@ public class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo>
var sb = new StringBuilder(128);
sb.append(inner.getName());
var params = getParameters();
- if (params.size() > 0) {
+ if (!params.isEmpty()) {
sb.append('(');
for (var i = 0; i < params.size(); i++) {
if (i > 0)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
index 1ce525e8c5..e451f1ed3f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanIgnoreAnnotation.java
@@ -81,6 +81,7 @@ public class BeanIgnoreAnnotation {
* <li class='jm'>{@link
org.apache.juneau.BeanContext.Builder#annotations(Annotation...)}
* </ul>
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends AppliedAnnotationObject.BuilderTMFC
{
private String[] description = {};
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index 1be3923043..0aeef30ccb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -44,11 +44,13 @@ import org.apache.juneau.serializer.*;
* </ul>
*
*/
+@SuppressWarnings("java:S110")
public class CsvSerializer extends WriterSerializer implements CsvMetaProvider
{
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializer.Builder {
private static final Cache<HashKey,CsvSerializer> CACHE =
Cache.of(HashKey.class, CsvSerializer.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index 3d84f27fdc..542aa92314 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -41,12 +41,13 @@ import org.apache.juneau.svl.*;
* </ul>
*
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class CsvSerializerSession extends WriterSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializerSession.Builder {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index b3dfa3b6a7..a95f9cd9d8 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -82,11 +82,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlStrippedDocSerializer.Builder {
private static final Cache<HashKey,HtmlDocSerializer> CACHE =
Cache.of(HashKey.class, HtmlDocSerializer.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
index 93ceed3796..c23715d779 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializerSession.java
@@ -43,11 +43,13 @@ import org.apache.juneau.svl.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlDocSerializerSession extends HtmlStrippedDocSerializerSession
{
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends
HtmlStrippedDocSerializerSession.Builder {
private HtmlDocSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index 4ed1c0c982..de0feaaf05 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -51,11 +51,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlParser extends XmlParser implements HtmlMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlParser.Builder {
private static final Cache<HashKey,HtmlParser> CACHE =
Cache.of(HashKey.class, HtmlParser.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
index c1f5f7111e..902ebb5f10 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParserSession.java
@@ -53,12 +53,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
-@SuppressWarnings({ "unchecked", "rawtypes" })
+@SuppressWarnings({"unchecked","rawtypes","java:S110"})
public class HtmlParserSession extends XmlParserSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlParserSession.Builder {
private HtmlParser ctx;
@@ -815,7 +816,7 @@ public class HtmlParserSession extends XmlParserSession {
while (true) {
if (et == START_ELEMENT) {
if (nn(characters)) {
- if (sb.length() == 0)
+ if (sb.isEmpty())
characters =
trimStart(characters);
sb.append(characters);
characters = null;
@@ -857,7 +858,7 @@ public class HtmlParserSession extends XmlParserSession {
}
} else if (et == END_ELEMENT) {
if (nn(characters)) {
- if (sb.length() == 0)
+ if (sb.isEmpty())
characters =
trimStart(characters);
if (depth == 0)
characters =
trimEnd(characters);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 24c4737a36..c4668ba54b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -58,11 +58,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlSchemaDocSerializer extends HtmlDocSerializer {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlDocSerializer.Builder {
JsonSchemaGenerator.Builder generatorBuilder;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
index 38ee213cda..97e240097c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializerSession.java
@@ -39,11 +39,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/HtmlBasics";>HTML Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlSchemaDocSerializerSession extends HtmlDocSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlDocSerializerSession.Builder {
private HtmlSchemaDocSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
index c2386736dd..6f605c01d2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializer.java
@@ -58,11 +58,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlSchemaSerializer extends HtmlSerializer {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlSerializer.Builder {
private static final Cache<HashKey,HtmlSchemaSerializer> CACHE
= Cache.of(HashKey.class, HtmlSchemaSerializer.class).build();
@@ -1014,6 +1016,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
}
/** Default serializer, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class Readable extends HtmlSchemaSerializer {
/**
@@ -1027,6 +1030,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
}
/** Default serializer, single quotes, simple mode. */
+ @SuppressWarnings("java:S110")
public static class Simple extends HtmlSchemaSerializer {
/**
@@ -1040,6 +1044,7 @@ public class HtmlSchemaSerializer extends HtmlSerializer {
}
/** Default serializer, single quotes, simple mode, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class SimpleReadable extends HtmlSchemaSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
index 21b99848db..bc5400ef7b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSchemaSerializerSession.java
@@ -39,11 +39,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/HtmlBasics";>HTML Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlSchemaSerializerSession extends HtmlSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlSerializerSession.Builder {
private HtmlSchemaSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index b30d7af398..a7eb8fad52 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -146,11 +146,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlSerializer extends XmlSerializer implements HtmlMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlSerializer.Builder {
private static final Cache<HashKey,HtmlSerializer> CACHE =
Cache.of(HashKey.class, HtmlSerializer.class).build();
@@ -1385,6 +1387,7 @@ public class HtmlSerializer extends XmlSerializer
implements HtmlMetaProvider {
}
/** Default serializer, single quotes. */
+ @SuppressWarnings("java:S110")
public static class Sq extends HtmlSerializer {
/**
@@ -1398,6 +1401,7 @@ public class HtmlSerializer extends XmlSerializer
implements HtmlMetaProvider {
}
/** Default serializer, single quotes, whitespace added. */
+ @SuppressWarnings("java:S110")
public static class SqReadable extends HtmlSerializer {
/**
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 73a98e4fa0..90c62db065 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
@@ -53,12 +53,13 @@ import org.apache.juneau.xml.annotation.*;
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class HtmlSerializerSession extends XmlSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlSerializerSession.Builder {
private HtmlSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 47b43a8568..8511e6c0cc 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -50,11 +50,13 @@ import org.apache.juneau.xml.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class HtmlStrippedDocSerializer extends HtmlSerializer {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlSerializer.Builder {
private static final Cache<HashKey,HtmlStrippedDocSerializer>
CACHE = Cache.of(HashKey.class, HtmlStrippedDocSerializer.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
index 24204d81ea..0e8ce10c78 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializerSession.java
@@ -40,12 +40,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/HtmlBasics";>HTML Basics</a>
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class HtmlStrippedDocSerializerSession extends HtmlSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends HtmlSerializerSession.Builder {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
index 584b73c2bc..461bc4f6e7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Parser.java
@@ -35,6 +35,7 @@ package org.apache.juneau.json;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonBasics";>JSON Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class Json5Parser extends JsonParser {
/** Default parser, Accept=application/json5. */
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
index 2820e33be5..4e230fbb28 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/Json5Serializer.java
@@ -41,9 +41,11 @@ package org.apache.juneau.json;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonBasics";>JSON Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class Json5Serializer extends JsonSerializer {
/** Default serializer, single quotes, simple mode, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class Readable extends Json5Serializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
index dfe211f4ea..ab68d76111 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -716,6 +716,7 @@ public class JsonParser extends ReaderParser implements
JsonMetaProvider {
}
/** Default parser, strict mode. */
+ @SuppressWarnings("java:S110")
public static class Strict extends JsonParser {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index 7e2ad04ed4..6304f0d850 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -50,11 +50,13 @@ import org.apache.juneau.jsonschema.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class JsonSchemaSerializer extends JsonSerializer implements
JsonSchemaMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends JsonSerializer.Builder {
private static final Cache<HashKey,JsonSchemaSerializer> CACHE
= Cache.of(HashKey.class, JsonSchemaSerializer.class).build();
@@ -917,6 +919,7 @@ public class JsonSchemaSerializer extends JsonSerializer
implements JsonSchemaMe
}
/** Default serializer, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class Readable extends JsonSchemaSerializer {
/**
@@ -930,6 +933,7 @@ public class JsonSchemaSerializer extends JsonSerializer
implements JsonSchemaMe
}
/** Default serializer, single quotes, simple mode. */
+ @SuppressWarnings("java:S110")
public static class Simple extends JsonSchemaSerializer {
/**
@@ -943,6 +947,7 @@ public class JsonSchemaSerializer extends JsonSerializer
implements JsonSchemaMe
}
/** Default serializer, single quotes, simple mode, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class SimpleReadable extends JsonSchemaSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
index 6a15511fa8..030549c6df 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSchemaSerializerSession.java
@@ -39,11 +39,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonBasics";>JSON Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class JsonSchemaSerializerSession extends JsonSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends JsonSerializerSession.Builder {
private JsonSchemaSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
index 719a3d886d..39be7e0920 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializer.java
@@ -109,11 +109,13 @@ import org.apache.juneau.serializer.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class JsonSerializer extends WriterSerializer implements
JsonMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializer.Builder {
private static final Cache<HashKey,JsonSerializer> CACHE =
Cache.of(HashKey.class, JsonSerializer.class).build();
@@ -994,6 +996,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
}
/** Default serializer, with whitespace. */
+ @SuppressWarnings("java:S110")
public static class Readable extends JsonSerializer {
/**
@@ -1010,6 +1013,7 @@ public class JsonSerializer extends WriterSerializer
implements JsonMetaProvider
* Default serializer, single quotes, simple mode, with whitespace and
recursion detection.
* Note that recursion detection introduces a small performance penalty.
*/
+ @SuppressWarnings("java:S110")
public static class ReadableSafe extends JsonSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
index 7b26a61afd..3ce25bb096 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonSerializerSession.java
@@ -43,12 +43,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/JsonBasics";>JSON Basics</a>
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class JsonSerializerSession extends WriterSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializerSession.Builder {
private JsonSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
index 3990b02250..bd11d5a191 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializer.java
@@ -47,9 +47,11 @@ import org.apache.juneau.serializer.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class MsgPackSerializer extends OutputStreamSerializer implements
MsgPackMetaProvider {
/** Default serializer, BASE64 string output. */
+ @SuppressWarnings("java:S110")
public static class Base64 extends MsgPackSerializer {
/**
@@ -66,6 +68,7 @@ public class MsgPackSerializer extends OutputStreamSerializer
implements MsgPack
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends OutputStreamSerializer.Builder {
private static final Cache<HashKey,MsgPackSerializer> CACHE =
Cache.of(HashKey.class, MsgPackSerializer.class).build();
@@ -739,6 +742,7 @@ public class MsgPackSerializer extends
OutputStreamSerializer implements MsgPack
}
/** Default serializer, spaced-hex string output. */
+ @SuppressWarnings("java:S110")
public static class SpacedHex extends MsgPackSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
index 304e6d3946..719765c4fb 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackSerializerSession.java
@@ -43,12 +43,13 @@ import org.apache.juneau.svl.*;
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class MsgPackSerializerSession extends OutputStreamSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends
OutputStreamSerializerSession.Builder {
private MsgPackSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
index d22733eda7..426d6452d7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParser.java
@@ -41,11 +41,13 @@ import org.apache.juneau.uon.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class OpenApiParser extends UonParser implements OpenApiMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonParser.Builder {
private static final Cache<HashKey,OpenApiParser> CACHE =
Cache.of(HashKey.class, OpenApiParser.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
index e7f3b95d28..de36002657 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiParserSession.java
@@ -52,11 +52,13 @@ import org.apache.juneau.uon.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class OpenApiParserSession extends UonParserSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonParserSession.Builder {
private OpenApiParser ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
index f6b9206db0..988494bfe0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializer.java
@@ -41,11 +41,13 @@ import org.apache.juneau.uon.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class OpenApiSerializer extends UonSerializer implements
OpenApiMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonSerializer.Builder {
private static final Cache<HashKey,OpenApiSerializer> CACHE =
Cache.of(HashKey.class, OpenApiSerializer.class).build();
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 8fb68978f5..4c14076ceb 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
@@ -51,12 +51,13 @@ import org.apache.juneau.uon.*;
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class OpenApiSerializerSession extends UonSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonSerializerSession.Builder {
private OpenApiSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index 9375f91b41..e25c60079d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -52,11 +52,13 @@ import org.apache.juneau.swap.*;
* </ul>
*
*/
+@SuppressWarnings("java:S110")
public class PlainTextSerializer extends WriterSerializer implements
PlainTextMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializer.Builder {
private static final Cache<HashKey,PlainTextSerializer> CACHE =
Cache.of(HashKey.class, PlainTextSerializer.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
index b848774e8d..2bc9f7e7d4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializerSession.java
@@ -37,12 +37,13 @@ import org.apache.juneau.svl.*;
* </ul>
*
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class PlainTextSerializerSession extends WriterSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializerSession.Builder {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
index 38894e078b..7424e81fbf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/WriterSerializer.java
@@ -63,8 +63,8 @@ public class WriterSerializer extends Serializer {
fileCharset = Charset.defaultCharset();
streamCharset = UTF8;
maxIndent = env("WriterSerializer.maxIndent", 100);
- quoteChar = env("WriterSerializer.quoteChar").map(x ->
(x.length() > 0 ? x.charAt(0) : null)).orElse(null);
- quoteCharOverride =
env("WriterSerializer.quoteCharOverride").map(x -> (x.length() > 0 ?
x.charAt(0) : null)).orElse(null);
+ quoteChar = env("WriterSerializer.quoteChar").map(x ->
(!x.isEmpty() ? x.charAt(0) : null)).orElse(null);
+ quoteCharOverride =
env("WriterSerializer.quoteCharOverride").map(x -> (!x.isEmpty() ? x.charAt(0)
: null)).orElse(null);
useWhitespace = env("WriterSerializer.useWhitespace",
false);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
index f9f96a7e02..a0a9fb77de 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializer.java
@@ -47,11 +47,13 @@ import org.apache.juneau.xml.*;
* </ul>
*
*/
+@SuppressWarnings("java:S110")
public class SoapXmlSerializer extends XmlSerializer implements
SoapXmlMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlSerializer.Builder {
private static final Cache<HashKey,SoapXmlSerializer> CACHE =
Cache.of(HashKey.class, SoapXmlSerializer.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
index dfdfd275aa..f25e3d2f27 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/SoapXmlSerializerSession.java
@@ -39,12 +39,13 @@ import org.apache.juneau.xml.*;
* </ul>
*
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class SoapXmlSerializerSession extends XmlSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlSerializerSession.Builder {
private SoapXmlSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
index 32c9ea0bef..0b7e675daf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -691,6 +691,7 @@ public class UonParser extends ReaderParser implements
HttpPartParser, UonMetaPr
}
/** Default parser, decoding. */
+ @SuppressWarnings("java:S110")
public static class Decoding extends UonParser {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
index 1d52cb45cc..02f0f432f2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializer.java
@@ -137,11 +137,13 @@ import org.apache.juneau.serializer.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class UonSerializer extends WriterSerializer implements
HttpPartSerializer, UonMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializer.Builder {
private static final Cache<HashKey,UonSerializer> CACHE =
Cache.of(HashKey.class, UonSerializer.class).build();
@@ -1025,6 +1027,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
/**
* Equivalent to
<code>UonSerializer.<jsm>create</jsm>().encoding().build();</code>.
*/
+ @SuppressWarnings("java:S110")
public static class Encoding extends UonSerializer {
/**
@@ -1040,6 +1043,7 @@ public class UonSerializer extends WriterSerializer
implements HttpPartSerialize
/**
* Equivalent to
<code>UonSerializer.<jsm>create</jsm>().ws().build();</code>.
*/
+ @SuppressWarnings("java:S110")
public static class Readable extends UonSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
index 7b79889535..dbe9df307d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonSerializerSession.java
@@ -46,12 +46,13 @@ import org.apache.juneau.svl.*;
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class UonSerializerSession extends WriterSerializerSession implements
HttpPartSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializerSession.Builder {
private UonSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
index 2d5cdc432c..4ae96899e4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParser.java
@@ -54,11 +54,13 @@ import org.apache.juneau.uon.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/UrlEncodingBasics";>URL-Encoding
Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class UrlEncodingParser extends UonParser implements
UrlEncodingMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonParser.Builder {
private static final Cache<HashKey,UrlEncodingParser> CACHE =
Cache.of(HashKey.class, UrlEncodingParser.class).build();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
index 1cb6989ec0..810d73be79 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingParserSession.java
@@ -45,12 +45,13 @@ import org.apache.juneau.uon.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/UrlEncodingBasics";>URL-Encoding
Basics</a>
* </ul>
*/
-@SuppressWarnings({ "unchecked", "rawtypes", "resource" })
+@SuppressWarnings({"unchecked","rawtypes","resource","java:S110"})
public class UrlEncodingParserSession extends UonParserSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonParserSession.Builder {
private UrlEncodingParser ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index a4bbe5b521..8f3f64d74c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -131,11 +131,13 @@ import org.apache.juneau.uon.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/UrlEncodingBasics";>URL-Encoding
Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class UrlEncodingSerializer extends UonSerializer implements
UrlEncodingMetaProvider {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonSerializer.Builder {
private static final Cache<HashKey,UrlEncodingSerializer> CACHE
= Cache.of(HashKey.class, UrlEncodingSerializer.class).build();
@@ -927,6 +929,7 @@ public class UrlEncodingSerializer extends UonSerializer
implements UrlEncodingM
/**
* Equivalent to
<code>UrlEncodingSerializer.<jsm>create</jsm>().expandedParams().build();</code>.
*/
+ @SuppressWarnings("java:S110")
public static class Expanded extends UrlEncodingSerializer {
/**
@@ -942,6 +945,7 @@ public class UrlEncodingSerializer extends UonSerializer
implements UrlEncodingM
/**
* Equivalent to
<code>UrlEncodingSerializer.<jsm>create</jsm>().plainTextParts().build();</code>.
*/
+ @SuppressWarnings("java:S110")
public static class PlainText extends UrlEncodingSerializer {
/**
@@ -957,6 +961,7 @@ public class UrlEncodingSerializer extends UonSerializer
implements UrlEncodingM
/**
* Equivalent to
<code>UrlEncodingSerializer.<jsm>create</jsm>().useWhitespace().build();</code>.
*/
+ @SuppressWarnings("java:S110")
public static class Readable extends UrlEncodingSerializer {
/**
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 8c4dc39fd6..cfe7e82d03 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
@@ -43,12 +43,13 @@ import org.apache.juneau.uon.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/UrlEncodingBasics";>URL-Encoding
Basics</a>
* </ul>
*/
-@SuppressWarnings({ "rawtypes", "unchecked", "resource" })
+@SuppressWarnings({"rawtypes","unchecked","resource","java:S110"})
public class UrlEncodingSerializerSession extends UonSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends UonSerializerSession.Builder {
private UrlEncodingSerializer ctx;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
index 0aed1e5a07..2dbba22903 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializer.java
@@ -40,9 +40,11 @@ import static
org.apache.juneau.commons.utils.AssertionUtils.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/XmlBasics";>XML Basics</a>
* </ul>
*/
+@SuppressWarnings("java:S110")
public class XmlDocSerializer extends XmlSerializer {
/** Default serializer without namespaces. */
+ @SuppressWarnings("java:S110")
public static class Ns extends XmlDocSerializer {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
index 3c7e4fa003..1494165f15 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlDocSerializerSession.java
@@ -39,12 +39,13 @@ import org.apache.juneau.svl.*;
* <li class='link'><a class="doclink"
href="https://juneau.apache.org/docs/topics/XmlBasics";>XML Basics</a>
* </ul>
*/
-@SuppressWarnings("resource")
+@SuppressWarnings({"resource","java:S110"})
public class XmlDocSerializerSession extends XmlSerializerSession {
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends XmlSerializerSession.Builder {
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
index 2073eb5310..248e240bf1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializer.java
@@ -134,11 +134,13 @@ import org.apache.juneau.serializer.*;
* </ul>
*/
+@SuppressWarnings("java:S110")
public class XmlSerializer extends WriterSerializer implements XmlMetaProvider
{
/**
* Builder class.
*/
+ @SuppressWarnings("java:S110")
public static class Builder extends WriterSerializer.Builder {
private static final Cache<HashKey,XmlSerializer> CACHE =
Cache.of(HashKey.class, XmlSerializer.class).build();
@@ -1116,6 +1118,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
}
/** Default serializer without namespaces. */
+ @SuppressWarnings("java:S110")
public static class Ns extends XmlSerializer {
/**
@@ -1130,6 +1133,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
}
/** Default serializer without namespaces, single quotes. */
+ @SuppressWarnings("java:S110")
public static class NsSq extends XmlSerializer {
/**
@@ -1144,6 +1148,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
}
/** Default serializer without namespaces, single quotes, with
whitespace. */
+ @SuppressWarnings("java:S110")
public static class NsSqReadable extends XmlSerializer {
/**
@@ -1158,6 +1163,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
}
/** Default serializer, single quotes. */
+ @SuppressWarnings("java:S110")
public static class Sq extends XmlSerializer {
/**
@@ -1172,6 +1178,7 @@ public class XmlSerializer extends WriterSerializer
implements XmlMetaProvider {
}
/** Default serializer, single quotes, whitespace added. */
+ @SuppressWarnings("java:S110")
public static class SqReadable extends XmlSerializer {
/**
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 38f6b11356..087b984aea 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -7705,8 +7705,9 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
var sb = new StringBuilder("WARNING: RestClient
garbage collected before it was finalized."); // NOT DEBUG
if (nn(creationStack)) {
sb.append("\nCreation Stack:"); // NOT DEBUG
- for (var e : creationStack)
- sb.append("\n\t" + e); // NOT DEBUG
+ for (var e : creationStack) {
+ sb.append("\n\t").append(e); // NOT
DEBUG
+ }
}
log(WARNING, sb.toString());
}
diff --git
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index 6a194bc563..552d11405a 100644
---
a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++
b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -458,10 +458,10 @@ public class MockServletRequest implements
HttpServletRequest {
var sb = new StringBuilder();
queryDataMap.forEach((k, v) -> {
if (v == null)
- sb.append(sb.length() == 0 ? ""
: "&").append(urlEncode(k));
+ sb.append(sb.isEmpty() ? "" :
"&").append(urlEncode(k));
else
for (var v2 : v)
- sb.append(sb.length()
== 0 ? "" : "&").append(urlEncode(k)).append('=').append(urlEncode(v2));
+ sb.append(sb.isEmpty()
? "" : "&").append(urlEncode(k)).append('=').append(urlEncode(v2));
});
queryString = sb.toString();
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 6dfc6cb423..2d2c7d203d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -4628,7 +4628,7 @@ public class RestContext extends Context {
mi.getMatchingMethods().stream().filter(isRestAnnotatedInterface).forEach(x ->
al.add(AnnotationInfo.of(x, RestOpAnnotation.DEFAULT)));
}
- if (al.size() > 0) {
+ if (!al.isEmpty()) {
try {
if (mi.isNotPublic())
throw
servletException("@RestOp method {0}.{1} must be defined as public.",
rci.inner().getName(), mi.getNameSimple());
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
index 28a516045e..52a3fd5443 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/logger/CallLogger.java
@@ -619,7 +619,7 @@ public class CallLogger {
if (resd.isOneOf(HEADER, ENTITY)) {
var hh = res.getHeaderNames();
- if (hh.size() > 0) {
+ if (!hh.isEmpty()) {
sb.append("\n---Response Headers---");
for (var h : hh) {
sb.append("\n\t").append(h).append(": ").append(res.getHeader(h));
