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 328014de83 SonarQube bug fixes
328014de83 is described below
commit 328014de83bfff94d855b2c00b2a4788651516ee
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 20:52:21 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/bean/jsonschema/JsonSchema.java | 1 +
.../apache/juneau/commons/collections/Lists.java | 3 ++-
.../apache/juneau/commons/collections/Sets.java | 3 ++-
.../apache/juneau/commons/inject/BeanCreator2.java | 6 ++----
.../apache/juneau/commons/io/MimeTypeDetector.java | 1 +
.../apache/juneau/commons/reflect/ClassInfo.java | 4 +++-
.../juneau/commons/reflect/ExecutableInfo.java | 1 +
.../apache/juneau/commons/reflect/FieldInfo.java | 1 +
.../juneau/commons/reflect/ParameterInfo.java | 1 +
.../juneau/commons/utils/CollectionUtils.java | 1 +
.../org/apache/juneau/commons/utils/IoUtils.java | 4 ++--
.../apache/juneau/commons/utils/StringUtils.java | 19 ++++++++++++++++--
.../main/java/org/apache/juneau/config/Config.java | 1 +
.../apache/juneau/config/internal/ConfigMap.java | 2 ++
.../org/apache/juneau/config/store/FileStore.java | 2 ++
.../main/java/org/apache/juneau/BeanContext.java | 4 ++++
.../src/main/java/org/apache/juneau/BeanMeta.java | 9 ++++++---
.../java/org/apache/juneau/BeanPropertyMeta.java | 13 ++++++++----
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/MediaType.java | 1 +
.../org/apache/juneau/collections/JsonMap.java | 2 +-
.../java/org/apache/juneau/cp/BeanCreator.java | 3 ++-
.../main/java/org/apache/juneau/cp/Messages.java | 4 ++--
.../apache/juneau/csv/CsvSerializerSession.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 1 +
.../org/apache/juneau/html/HtmlParserSession.java | 12 +++++++----
.../apache/juneau/html/HtmlSerializerSession.java | 23 +++++++++++-----------
.../org/apache/juneau/httppart/HttpPartSchema.java | 6 ++++++
.../org/apache/juneau/json/JsonParserSession.java | 18 ++++++++++++-----
.../apache/juneau/json/JsonSerializerSession.java | 6 +++---
.../jsonschema/JsonSchemaGeneratorSession.java | 18 ++++++++---------
.../juneau/msgpack/MsgPackParserSession.java | 5 +++--
.../juneau/msgpack/MsgPackSerializerSession.java | 6 +++---
.../apache/juneau/oapi/OpenApiParserSession.java | 4 ++--
.../juneau/oapi/OpenApiSerializerSession.java | 5 +++--
.../apache/juneau/objecttools/ObjectPaginator.java | 2 +-
.../apache/juneau/objecttools/ObjectViewer.java | 2 +-
.../org/apache/juneau/parser/ParserSession.java | 2 +-
.../juneau/serializer/SerializerSession.java | 3 ++-
.../org/apache/juneau/swap/AutoNumberSwap.java | 2 +-
.../java/org/apache/juneau/swap/BuilderSwap.java | 2 +-
.../org/apache/juneau/uon/UonParserSession.java | 11 ++++++++---
.../apache/juneau/uon/UonSerializerSession.java | 6 +++---
.../urlencoding/UrlEncodingParserSession.java | 7 +++++--
.../urlencoding/UrlEncodingSerializerSession.java | 6 ++++--
.../org/apache/juneau/xml/XmlParserSession.java | 17 ++++++++--------
.../apache/juneau/xml/XmlSerializerSession.java | 20 +++++++++----------
.../apache/juneau/microservice/Microservice.java | 2 +-
.../juneau/microservice/console/HelpCommand.java | 1 +
.../microservice/resources/LogEntryFormatter.java | 1 +
.../microservice/resources/LogsResource.java | 2 +-
.../microservice/jetty/JettyMicroservice.java | 1 +
.../apache/juneau/rest/client/ResponseContent.java | 4 ++--
.../org/apache/juneau/rest/client/RestClient.java | 21 +++++++++++---------
.../org/apache/juneau/rest/client/RestRequest.java | 8 ++++----
.../apache/juneau/rest/client/RestResponse.java | 3 ++-
.../rest/client/remote/RemoteOperationMeta.java | 1 +
.../rest/client/remote/RemoteOperationReturn.java | 2 +-
.../org/apache/juneau/http/header/HeaderList.java | 9 +++++----
.../java/org/apache/juneau/http/part/PartList.java | 9 +++++----
.../java/org/apache/juneau/rest/RestContext.java | 15 +++++++-------
.../java/org/apache/juneau/rest/RestOpContext.java | 2 ++
.../org/apache/juneau/rest/RestOperations.java | 1 +
.../java/org/apache/juneau/rest/RestRequest.java | 1 +
.../java/org/apache/juneau/rest/RestResponse.java | 2 ++
.../java/org/apache/juneau/rest/RestSession.java | 1 +
.../juneau/rest/httppart/RequestContent.java | 1 +
.../juneau/rest/httppart/RequestFormParams.java | 2 +-
.../org/apache/juneau/rest/logger/CallLogger.java | 1 +
.../apache/juneau/rest/rrpc/RrpcRestOpSession.java | 1 +
.../rest/swagger/BasicSwaggerProviderSession.java | 1 +
.../org/apache/juneau/rest/util/RestUtils.java | 2 +-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 1 +
73 files changed, 234 insertions(+), 135 deletions(-)
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
index f07547faac..db5c2320cd 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java
@@ -2054,6 +2054,7 @@ public class JsonSchema {
*
* @param master The master schema to associate on this and all
children. Can be <jk>null</jk>.
*/
+ @SuppressWarnings("java:S3776")
protected void setMaster(JsonSchema master) {
this.master = master;
if (nn(definitions))
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
index a1e5965a08..395e343b99 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
@@ -223,6 +223,7 @@ public class Lists<E> {
* @throws IllegalStateException if element type is unknown.
* @throws RuntimeException if a value cannot be converted to the
element type.
*/
+ @SuppressWarnings("java:S3776")
public Lists<E> addAny(Object...values) {
if (nn(values)) {
for (var o : values) {
@@ -281,7 +282,7 @@ public class Lists<E> {
if (sparse && e(list))
return null;
- var list2 = (List<E>)null;
+ List<E> list2 = null;
if (nn(comparator))
list2 = new SortedArrayList<>(comparator);
else
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
index 991630957f..0ca9a10634 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
@@ -221,6 +221,7 @@ public class Sets<E> {
* @param values The values to add.
* @return This object.
*/
+ @SuppressWarnings("java:S3776")
public Sets<E> addAny(Object...values) {
if (nn(values)) {
for (var o : values) {
@@ -297,7 +298,7 @@ public class Sets<E> {
if (sparse && e(set))
return null;
- var set2 = (Set<E>)null;
+ Set<E> set2 = null;
if (ordered) {
set2 = new LinkedHashSet<>();
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
index 25062b53e9..0f212ac39f 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
@@ -1096,7 +1096,7 @@ public class BeanCreator2<T> {
* @return The created bean.
* @throws ExecutableException if bean could not be created.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "java:S3776" })
private T findBeanImpl() {
var store = this.store;
var builder = explicitBuilder != null ? explicitBuilder :
this.builder.get(); // Use explicit builder if set, otherwise get from supplier
@@ -1571,9 +1571,7 @@ public class BeanCreator2<T> {
var returnType = x.getReturnType();
return returnType.is(beanSubType.inner()) ||
returnType.is(beanType.inner()) || returnType.isParentOf(beanSubType);
})
- .filter(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) || x.getParameterCount() == 0)
- .findFirst()
- .isPresent();
+ .anyMatch(x ->
x.getAnnotations().stream().map(AnnotationInfo::getNameSimple).anyMatch(n ->
eqAny(n, "Inject", "Autowired")) || x.getParameterCount() == 0);
if (hasBuildMethod) {
log("Builder is valid: has build/create/get method
returning bean type");
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
index f3734d0d99..85dc3028b3 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/io/MimeTypeDetector.java
@@ -152,6 +152,7 @@ public class MimeTypeDetector {
* @param mimeTypesLines The MIME types lines or file contents.
* @return This builder.
*/
+ @SuppressWarnings("java:S3776")
public Builder addTypes(String...mimeTypesLines) {
for (var input : mimeTypesLines) {
if (ne(input)) {
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index 796c4fb3d7..26c95a0916 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -292,7 +292,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
* @return
* The same StringBuilder for method chaining.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
public StringBuilder appendNameFormatted(StringBuilder sb,
ClassNameFormat nameFormat, boolean includeTypeParams, char separator,
ClassArrayFormat arrayFormat) {
var dim = getDimensions();
@@ -1374,6 +1374,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
* @param pt The parameterized type class containing the parameterized
type to resolve (e.g. <c>HashMap</c>).
* @return The resolved real class.
*/
+ @SuppressWarnings("java:S3776")
public Class<?> getParameterType(int index, Class<?> pt) {
assertArgNotNull("pt", pt);
@@ -2529,6 +2530,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
return toString.get();
}
+ @SuppressWarnings("java:S3776")
private String findToString() {
var sb = new StringBuilder(256);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
index d663efe892..07a70a4b40 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
@@ -843,6 +843,7 @@ public abstract class ExecutableInfo extends AccessibleInfo
{
return toString.get();
}
+ @SuppressWarnings("java:S3776")
private String findToString() {
var sb = new StringBuilder(256);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
index 5876498f29..3f3f1610cb 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
@@ -580,6 +580,7 @@ public class FieldInfo extends AccessibleInfo implements
Comparable<FieldInfo>,
* @return The same bean instance (for method chaining).
* @throws ExecutableException If a required field (non-Optional,
non-collection) cannot be resolved from the bean store.
*/
+ @SuppressWarnings("java:S3776")
public <T> T inject(BeanStore beanStore, T bean) {
accessible();
var fieldType = getFieldType();
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
index f05fb934a9..c3c2fe00cd 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
@@ -869,6 +869,7 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
* @throws ExecutableException If a required parameter (non-Optional,
non-collection) cannot be resolved
* from the bean store or <c>otherBeans</c>.
*/
+ @SuppressWarnings("java:S3776")
public Object resolveValue(BeanStore beanStore, Object... otherBeans) {
var pt = getParameterType();
var bq = getResolvedQualifier();
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
index 44ce9ab765..2fb1a53f97 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
@@ -387,6 +387,7 @@ public class CollectionUtils {
* Returns null if the input is null.
* @throws IllegalArgumentException if the input is not an array.
*/
+ @SuppressWarnings("java:S3776")
public static List<Object> arrayToList(Object array) {
assertArgNotNull("array", array);
assertArg(isArray(array), "Input must be an array but was {0}",
cn(array));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
index 9cf865afd3..98e09b234c 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
@@ -85,7 +85,7 @@ public class IoUtils {
*/
@SuppressWarnings("null")
public static void close(Object...o) throws IOException {
- var ex = (IOException)null;
+ IOException ex = null;
for (var o2 : o) {
try {
if (o2 instanceof InputStream o3)
@@ -226,7 +226,7 @@ public class IoUtils {
*/
@SuppressWarnings("null")
public static void flush(Object...o) throws IOException {
- var ex = (IOException)null;
+ IOException ex = null;
for (var o2 : o) {
try {
if (o2 instanceof OutputStream o3)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
index 32290f228c..e37f0f0321 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
@@ -2031,7 +2031,7 @@ public class StringUtils {
if (in == null)
return null;
- var sb = (StringBuilder)null;
+ StringBuilder sb = null;
var m = 0;
@@ -2187,6 +2187,7 @@ public class StringUtils {
* @param resolver The function that resolves variable names to values.
* @return The new string with variables replaced, or the original
string if it didn't have variables in it.
*/
+ @SuppressWarnings("java:S3776")
public static String formatNamed(String s, Function<String,Object>
resolver) {
if (s == null)
@@ -3150,6 +3151,7 @@ public class StringUtils {
* @param s The string to check.
* @return <jk>true</jk> if the specified string is numeric.
*/
+ @SuppressWarnings("java:S3776")
public static boolean isDecimal(String s) {
if (s == null || s.isEmpty() || !
FIRST_NUMBER_CHARS.contains(s.charAt(0)))
return false;
@@ -4334,6 +4336,7 @@ public class StringUtils {
* @param str The string to generate a Metaphone code for. Can be
<jk>null</jk>.
* @return The Metaphone code, or <jk>null</jk> if input is
<jk>null</jk> or empty.
*/
+ @SuppressWarnings("java:S3776")
public static String metaphone(String str) {
if (isEmpty(str))
return null;
@@ -4561,6 +4564,7 @@ public class StringUtils {
* @param str2 The second string.
* @return A negative integer, zero, or a positive integer as the first
string is less than, equal to, or greater than the second.
*/
+ @SuppressWarnings("java:S3776")
public static int naturalCompare(String str1, String str2) {
if (str1 == str2)
return 0;
@@ -5227,6 +5231,7 @@ public class StringUtils {
* If <jk>null</jk> or <c>Number</c>, uses the best guess.
* @return The parsed number, or <jk>null</jk> if the string was null.
*/
+ @SuppressWarnings("java:S3776")
public static Number parseNumber(String s, Class<? extends Number>
type) {
if (s == null)
return null;
@@ -6431,6 +6436,7 @@ public class StringUtils {
* @param trim Trim strings after parsing.
* @return The parsed map, or null if the string was null.
*/
+ @SuppressWarnings("java:S3776")
public static Map<String,String> splitMap(String s, boolean trim) {
if (s == null)
@@ -6448,7 +6454,7 @@ public class StringUtils {
var sArray = s.toCharArray();
var x1 = 0;
var escapeCount = 0;
- var key = (String)null;
+ String key = null;
for (var i = 0; i < sArray.length + 1; i++) {
var c = i == sArray.length ? ',' : sArray[i];
if (c == '\\')
@@ -6600,6 +6606,7 @@ public class StringUtils {
* The results, or <jk>null</jk> if the input was <jk>null</jk>.
* <br>An empty string results in an empty array.
*/
+ @SuppressWarnings("java:S3776")
public static List<String> splitNestedInner(String s) {
assertArg(nn(s), "String was null.");
assertArg(ne(s), "String was empty.");
@@ -6680,6 +6687,7 @@ public class StringUtils {
* The results, or <jk>null</jk> if the input was <jk>null</jk>.
* <br>An empty string results in an empty array.
*/
+ @SuppressWarnings("java:S3776")
public static String[] splitQuoted(String s, boolean keepQuotes) {
if (s == null)
@@ -7417,6 +7425,7 @@ public class StringUtils {
* @param escaped The characters escaped.
* @return A new string if characters were removed, or the same string
if not or if the input was <jk>null</jk>.
*/
+ @SuppressWarnings("java:S3776")
public static String unescapeChars(String s, AsciiSet escaped) {
if (s == null || s.isEmpty())
return s;
@@ -7611,6 +7620,7 @@ public class StringUtils {
* @param o The object to encode.
* @return The URL encoded string, or <jk>null</jk> if the object was
null.
*/
+ @SuppressWarnings("java:S3776")
public static String urlEncodePath(Object o) {
if (o == null)
@@ -7755,6 +7765,7 @@ public class StringUtils {
* @return The wrapped string, or <jk>null</jk> if input is
<jk>null</jk>.
* @throws IllegalArgumentException if wrapLength is <= 0 or newline
is <jk>null</jk>.
*/
+ @SuppressWarnings("java:S3776")
public static String wrap(String str, int wrapLength, String newline) {
if (str == null)
return null;
@@ -7938,6 +7949,7 @@ public class StringUtils {
* @param ip The IPv6 address string to validate.
* @return <jk>true</jk> if the string is a valid IPv6 address format,
<jk>false</jk> otherwise.
*/
+ @SuppressWarnings("java:S3776")
public static boolean isValidIPv6Address(String ip) {
if (ip == null || ip.isEmpty())
return false;
@@ -8150,6 +8162,7 @@ public class StringUtils {
* @param value The numeric value.
* @return The value in milliseconds, or <c>-1</c> if the unit is
invalid.
*/
+ @SuppressWarnings("java:S3776")
private static long parseUnit(String unit, double value) {
if (isEmpty(unit)) {
// No unit means milliseconds
@@ -8213,6 +8226,7 @@ public class StringUtils {
* @param r The StringReader positioned at the start of a comment (at
the first <js>'/'</js>).
* @throws IOException If an I/O error occurs.
*/
+ @SuppressWarnings("java:S3776")
public static void skipComments(StringReader r) throws IOException {
var c = r.read();
// "/* */" style comments
@@ -8255,6 +8269,7 @@ public class StringUtils {
* @param str The string to split.
* @return A list of words, or empty list if input is null or empty.
*/
+ @SuppressWarnings("java:S3776")
private static List<String> splitWords(String str) {
if (str == null || isEmpty(str))
return Collections.emptyList();
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
index abbeeaa0f4..509a78336c 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Config.java
@@ -1180,6 +1180,7 @@ public class Config extends Context implements
ConfigEventListener {
return s;
}
+ @SuppressWarnings("java:S3776")
private String serialize(Object value, Serializer serializer) throws
SerializeException {
if (value == null)
return "";
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 0bd07602f9..6b62c371c1 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -672,6 +672,7 @@ public class ConfigMap implements ConfigStoreListener {
return w;
}
+ @SuppressWarnings("java:S3776")
private ConfigMap applyChange(boolean addToChangeList, ConfigEvent ce) {
if (ce == null)
return this;
@@ -727,6 +728,7 @@ public class ConfigMap implements ConfigStoreListener {
}
}
+ @SuppressWarnings("java:S3776")
private ConfigEvents findDiffs(String updatedContents) throws
IOException {
var changes2 = new ConfigEvents();
var newMap = new ConfigMap(store, name, updatedContents);
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
index 2368419c02..e6178edf4c 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/FileStore.java
@@ -500,6 +500,7 @@ public class FileStore extends ConfigStore {
}
@Override /* Overridden from ConfigStore */
+ @SuppressWarnings("java:S3776")
public synchronized String write(String name, String expectedContents,
String newContents) throws IOException {
name = resolveName(name);
@@ -601,6 +602,7 @@ public class FileStore extends ConfigStore {
}
@Override
+ @SuppressWarnings("java:S3776")
protected String resolveName(String name) {
if (! nameCache.containsKey(name)) {
String n = null;
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 3b96638556..238407cd2a 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
@@ -4244,6 +4244,7 @@ public class BeanContext extends Context {
* @param ci The class info being tested.
* @return <jk>true</jk> if the specified class matches any of the
exclusion parameters.
*/
+ @SuppressWarnings("java:S3776")
protected final boolean isNotABean(ClassInfo ci) {
if (ci.isArray() || ci.isPrimitive() || ci.isEnum() ||
ci.isAnnotation())
return true;
@@ -4319,6 +4320,7 @@ public class BeanContext extends Context {
* Can be <jk>null</jk> if the information is not known.
* @return The new {@code ClassMeta} object wrapped around the type.
*/
+ @SuppressWarnings("java:S3776")
protected final <T> ClassMeta<T> resolveClassMeta(AnnotationInfo<Beanp>
p, ClassInfo ci, TypeVariables typeVarImpls) {
var cm = resolveClassMeta(ci, typeVarImpls);
var cm2 = cm;
@@ -4372,6 +4374,7 @@ public class BeanContext extends Context {
return cmString;
}
+ @SuppressWarnings("java:S3776")
final ClassMeta[] findParameters(Type o, Class c) {
if (o == null)
o = c;
@@ -4408,6 +4411,7 @@ public class BeanContext extends Context {
return null;
}
+ @SuppressWarnings("java:S3776")
final ClassMeta resolveClassMeta(Type o, TypeVariables typeVars) {
if (o == null)
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 6f6d3d3025..6d42aaacf7 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -121,7 +121,7 @@ public class BeanMeta<T> {
return true;
// Get the bean property type from the getter/field.
- var pt = (Class<?>)null; // TODO - Convert to ClassInfo
+ Class<?> pt = null; // TODO - Convert to ClassInfo
if (nn(b.getter))
pt = b.getter.getReturnType().inner();
else if (nn(b.field))
@@ -384,6 +384,7 @@ public class BeanMeta<T> {
* @param pNames Explicit list of property names and order. If
<jk>null</jk>, properties are determined automatically.
* @param implClass Optional implementation class constructor to use if
one cannot be found. Can be <jk>null</jk>.
*/
+ @SuppressWarnings("java:S3776")
protected BeanMeta(ClassMeta<T> cm, BeanFilter bf, String[] pNames,
ClassInfo implClass) {
classMeta = cm;
beanContext = cm.getBeanContext();
@@ -399,7 +400,7 @@ public class BeanMeta<T> {
var ap = beanContext.getAnnotationProvider();
var c = cm.inner();
var ci = cm;
- var _notABeanReason = (String)null;
+ String _notABeanReason = null;
var _properties = Value.<Map<String,BeanPropertyMeta>>empty();
var _hiddenProperties =
CollectionUtils.<String,BeanPropertyMeta>map();
var _getterProps = CollectionUtils.<Method,String>map(); //
Convert to MethodInfo keys
@@ -427,7 +428,7 @@ public class BeanMeta<T> {
if (beanContext.isUseJavaBeanIntrospector()) {
var c2 = bfo.map(x ->
x.getInterfaceClass()).filter(Objects::nonNull).orElse(classMeta);
- var bi = (BeanInfo)null;
+ BeanInfo bi = null;
if (! c2.isInterface())
bi =
Introspector.getBeanInfo(c2.inner(), stopClass.inner());
else
@@ -945,6 +946,7 @@ public class BeanMeta<T> {
* the number of properties specified in {@link Beanc @Beanc}
doesn't match the number of constructor parameters,
* or if parameter names cannot be determined from the bytecode.
*/
+ @SuppressWarnings("java:S3776")
private BeanConstructor findBeanConstructor() {
var ap = beanContext.getAnnotationProvider();
var vis = beanContext.getBeanConstructorVisibility();
@@ -1057,6 +1059,7 @@ public class BeanMeta<T> {
*
* @return A list of {@link BeanMethod} objects representing all found
bean methods.
*/
+ @SuppressWarnings("java:S3776")
private List<BeanMethod> findBeanMethods() {
var l = new LinkedList<BeanMethod>();
var ap = beanContext.getAnnotationProvider();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index 595b60ea8a..15db18b4ee 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -268,6 +268,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return <jk>true</jk> if this property is valid,
<jk>false</jk> otherwise.
* @throws Exception If validation fails.
*/
+ @SuppressWarnings("java:S3776")
public boolean validate(BeanContext bc, BeanRegistry
parentBeanRegistry, TypeVariables typeVarImpls, Set<String> bpro, Set<String>
bpwo) throws Exception {
var bdClasses = list();
@@ -505,6 +506,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @param value The value to add to the field.
* @throws BeanRuntimeException If field is not a collection or array.
*/
+ @SuppressWarnings("java:S3776")
public void add(BeanMap<?> m, String pName, Object value) throws
BeanRuntimeException {
// Read-only beans get their properties stored in a cache.
@@ -531,9 +533,9 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
var v = session.convertToType(value, elementType);
if (isCollection) {
- var c = (Collection)invokeGetter(bean, pName);
+ Collection c = (Collection)invokeGetter(bean,
pName);
- var c2 = (Collection)null;
+ Collection c2 = null;
if (nn(c)) {
if (canAddTo(c)) {
c.add(v);
@@ -591,6 +593,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @param value The value to add to the field.
* @throws BeanRuntimeException If field is not a map or array.
*/
+ @SuppressWarnings("java:S3776")
public void add(BeanMap<?> m, String pName, String key, Object value)
throws BeanRuntimeException {
// Read-only beans get their properties stored in a cache.
@@ -954,6 +957,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @return The previous property value.
* @throws BeanRuntimeException If property could not be set.
*/
+ @SuppressWarnings("java:S3776")
public Object set(BeanMap<?> m, String pName, Object value) throws
BeanRuntimeException {
Object value1 = m.meta.onWriteProperty(m.bean, pName, value);
try {
@@ -1178,6 +1182,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
return o;
}
+ @SuppressWarnings("java:S3776")
private Object getInner(BeanMap<?> m, String pName) {
try {
@@ -1234,7 +1239,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
private Object invokeGetter(Object bean, String pName) throws
IllegalArgumentException {
if (isDyna) {
- var m = (Map)null;
+ Map m = null;
if (nn(getter)) {
if (! isDynaGetterMap)
return getter.invoke(bean, pName);
@@ -1256,7 +1261,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
if (isDyna) {
if (nn(setter))
return setter.invoke(bean, pName, val);
- var m = (Map)null;
+ Map m = null;
if (nn(field))
m = (Map<String,Object>)field.get(bean);
else if (nn(getter))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 326019fc69..fed9b36791 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -1141,7 +1141,7 @@ public class BeanSession extends ContextSession {
* @throws InvalidDataConversionException If the specified value cannot
be converted to the specified type.
* @return The converted value.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
protected final <T> T convertToMemberType(Object outer, Object value,
ClassMeta<T> to) throws InvalidDataConversionException {
if (to == null)
to = (ClassMeta<T>)object();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
index c536d33958..bce4c81ec5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MediaType.java
@@ -393,6 +393,7 @@ public class MediaType implements Comparable<MediaType> {
* @param allowExtraSubTypes If <jk>true</jk>,
* @return <jk>true</jk> if the media types match.
*/
+ @SuppressWarnings("java:S3776")
public final int match(MediaType o, boolean allowExtraSubTypes) {
if (o == null)
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 3763de51ae..8aca834647 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
@@ -1781,7 +1781,7 @@ public class JsonMap extends LinkedHashMap<String,Object>
{
/*
* Converts this map to the specified class type.
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes", "java:S3776" })
private <T> T cast2(ClassMeta<T> cm) {
BeanSession bs = bs();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index 4b0216bd13..ac27b20be2 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -263,6 +263,7 @@ public class BeanCreator<T> {
* @return A new bean.
* @throws ExecutableException if bean could not be created and {@link
#silent()} was not enabled.
*/
+ @SuppressWarnings("java:S3776")
public T run() {
if (nn(impl))
@@ -372,7 +373,7 @@ public class BeanCreator<T> {
if (silent)
return null;
- var msg = (String)null;
+ String msg = null;
if (found.isEmpty()) {
msg = "No public/protected constructors found";
} else if (found.get().equals("STATIC_CREATOR")) {
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 1180f00dcf..971b478716 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
@@ -249,14 +249,14 @@ public class Messages extends ResourceBundle {
return this;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "java:S3776" })
@Override /* Overridden from BeanBuilder */
protected Messages buildDefault() {
if (! locations.isEmpty()) {
Tuple2<Class<?>,String>[] mbl =
locations.toArray(new Tuple2[0]);
- var x = (Builder)null;
+ Messages.Builder x = null;
for (var i = mbl.length - 1; i >= 0; i--) {
var c = firstNonNull(mbl[i].getA(),
forClass);
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 542aa92314..ce6d929335 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
@@ -227,7 +227,7 @@ public class CsvSerializerSession extends
WriterSerializerSession {
try (var w = getCsvWriter(pipe)) {
var cm = getClassMetaForObject(o);
- var l = (Collection<?>)null;
+ Collection<?> l = null;
if (cm.isArray()) {
l = l((Object[])o);
} else if (cm.isCollection()) {
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 04c7eed60d..9075b33a93 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
@@ -1593,6 +1593,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
return x;
}
+ @SuppressWarnings("java:S3776")
private static List<String> mergeNavLinks(List<String> old,
String[] newValues) {
List<String> x = listOfSize(newValues.length);
for (var s : newValues) {
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 902ebb5f10..8b5e7fcf65 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
@@ -273,13 +273,14 @@ public class HtmlParserSession extends XmlParserSession {
* Precondition: Must be pointing at outer START_ELEMENT.
* Postcondition: Pointing at outer END_ELEMENT.
*/
+ @SuppressWarnings("java:S3776")
private <T> T parseAnything(ClassMeta<T> eType, XmlReader r, Object
outer, boolean isRoot, BeanPropertyMeta pMeta) throws IOException,
ParseException, ExecutableException, XMLStreamException {
if (eType == null)
eType = (ClassMeta<T>)object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -312,7 +313,7 @@ public class HtmlParserSession extends XmlParserSession {
if (hcm.getFormat() == HtmlFormat.XML)
return super.parseAnything(eType, null, r, outer,
false, pMeta);
- var o = (Object)null;
+ Object o = null;
var isValid = true;
var tag = (event == CHARACTERS ? null :
HtmlTag.forString(r.getName().getLocalPart(), false));
@@ -470,6 +471,7 @@ public class HtmlParserSession extends XmlParserSession {
* Precondition: Must be pointing at event following <table> event.
* Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.
*/
+ @SuppressWarnings("java:S3776")
private <T> BeanMap<T> parseIntoBean(XmlReader r, BeanMap<T> m) throws
IOException, ParseException, ExecutableException, XMLStreamException {
while (true) {
HtmlTag tag = nextTag(r, TR, xTABLE);
@@ -562,6 +564,7 @@ public class HtmlParserSession extends XmlParserSession {
* Precondition: Must be pointing at event following <ul> event.
* Postcondition: Pointing at next START_ELEMENT or END_DOCUMENT event.
*/
+ @SuppressWarnings("java:S3776")
private <E> Collection<E> parseTableIntoCollection(XmlReader r,
Collection<E> l, ClassMeta<E> type, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
@@ -582,7 +585,7 @@ public class HtmlParserSession extends XmlParserSession {
if (tag == xTABLE)
break;
- var elementType = (ClassMeta)null;
+ ClassMeta elementType = null;
String beanType = getAttribute(r,
getBeanTypePropertyName(type), null);
if (nn(beanType))
elementType = getClassMeta(beanType, pMeta,
null);
@@ -801,6 +804,7 @@ public class HtmlParserSession extends XmlParserSession {
* @throws XMLStreamException Thrown by underlying XML stream.
*/
@Override /* Overridden from XmlParserSession */
+ @SuppressWarnings("java:S3776")
protected String parseText(XmlReader r) throws IOException,
ParseException, XMLStreamException {
StringBuilder sb = getStringBuilder();
@@ -811,7 +815,7 @@ public class HtmlParserSession extends XmlParserSession {
int depth = 0;
- var characters = (String)null;
+ String characters = null;
while (true) {
if (et == START_ELEMENT) {
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 90c62db065..4e1141cc18 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
@@ -331,7 +331,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* Returns an empty array if it should be treated as a table but
without headers.
* 2-dimensional tables are used for collections of objects that all
have the same set of property names.
*/
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes", "unchecked", "java:S3776" })
private Object[] getTableHeaders(Collection c, HtmlBeanPropertyMeta
bpHtml) throws SerializeException {
if (c.isEmpty())
@@ -339,7 +339,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
c = sort(c);
- var o1 = (Object)null;
+ Object o1 = null;
for (var o : c)
if (nn(o)) {
o1 = o;
@@ -394,6 +394,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
return bm.keySet().toArray(new String[bm.size()]);
}
+ @SuppressWarnings("java:S3776")
private void serializeBeanMap(XmlWriter out, BeanMap<?> m, ClassMeta<?>
eType, BeanPropertyMeta ppMeta) throws SerializeException {
HtmlClassMeta cHtml = getHtmlClassMeta(m.getClassMeta());
@@ -426,8 +427,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
if (canIgnoreValue(cMeta, key, value))
return;
- var link = (String)null;
- var anchorText = (String)null;
+ String link = null;
+ String anchorText = null;
if (! cMeta.isCollectionOrArray()) {
link = m.resolveVars(getLink(pMeta));
anchorText =
m.resolveVars(getAnchorText(pMeta));
@@ -464,7 +465,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
out.ie(i).eTag("table").nl(i);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes", "unchecked", "java:S3776" })
private void serializeCollection(XmlWriter out, Object in, ClassMeta<?>
sType, ClassMeta<?> eType, String name, BeanPropertyMeta ppMeta) throws
SerializeException {
HtmlClassMeta cHtml = getHtmlClassMeta(sType);
@@ -482,7 +483,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
return;
}
- var type2 = (String)null;
+ String type2 = null;
if (sType != eType)
type2 = sType.getBeanDictionaryName();
if (type2 == null)
@@ -560,8 +561,8 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
if (pMeta.canRead()) {
Object value =
p.getValue();
- var link = (String)null;
- var anchorText =
(String)null;
+ String link = null;
+ String anchorText =
null;
if (!
pMeta.getClassMeta().isCollectionOrArray()) {
link =
m2.resolveVars(getLink(pMeta));
anchorText =
m2.resolveVars(getAnchorText(pMeta));
@@ -654,7 +655,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
@SuppressWarnings("rawtypes")
private void serializeMapEntry(XmlWriter out, Map.Entry e, ClassMeta<?>
keyType, ClassMeta<?> valueType, int i, BeanPropertyMeta ppMeta) throws
SerializeException {
Object key = generalize(e.getKey(), keyType);
- var value = (Object)null;
+ Object value = null;
try {
value = e.getValue();
} catch (StackOverflowError t) {
@@ -802,7 +803,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
* @return The type of content encountered. Either simple (no
whitespace) or normal (elements with whitespace).
* @throws SerializeException Generic serialization error occurred.
*/
- @SuppressWarnings({ "rawtypes", "unchecked", "null" })
+ @SuppressWarnings({ "rawtypes", "unchecked", "null", "java:S3776" })
protected ContentResult serializeAnything(XmlWriter out, Object o,
ClassMeta<?> eType, String name, BeanPropertyMeta pMeta, int xIndent, boolean
isRoot, boolean nlIfElement)
throws SerializeException {
@@ -849,7 +850,7 @@ public class HtmlSerializerSession extends
XmlSerializerSession {
sType = aType;
- var typeName = (String)null;
+ String typeName = null;
if (isAddBeanTypes() && ! eType.equals(aType))
typeName = aType.getBeanDictionaryName();
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 1b8f744556..a04d977769 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
@@ -2845,6 +2845,7 @@ public class HttpPartSchema {
* @return This object.
* @since 9.2.0
*/
+ @SuppressWarnings("java:S3776")
Builder applyJakartaValidation(Annotation a) {
String simpleName = cns(a.annotationType());
@@ -3615,6 +3616,7 @@ public class HttpPartSchema {
final Number exclusiveMaximumValue, exclusiveMinimumValue;
+ @SuppressWarnings("java:S3776")
HttpPartSchema(Builder b) {
name = b.name;
default_ = b.default_;
@@ -4169,6 +4171,7 @@ public class HttpPartSchema {
* @return The same object passed in.
* @throws SchemaValidationException if the specified pre-parsed input
does not validate against this schema.
*/
+ @SuppressWarnings("java:S3776")
public String validateInput(String in) throws SchemaValidationException
{
if (! isValidRequired(in))
throw new SchemaValidationException("No value
specified.");
@@ -4200,6 +4203,7 @@ public class HttpPartSchema {
* @return The same object passed in.
* @throws SchemaValidationException if the specified parsed output
does not validate against this schema.
*/
+ @SuppressWarnings("java:S3776")
public <T> T validateOutput(T o, BeanContext bc) throws
SchemaValidationException {
if (o == null) {
if (! isValidRequired(o))
@@ -4430,6 +4434,7 @@ public class HttpPartSchema {
return x.isEmpty() || x.matches("^(/[^/]*)*$");
}
+ @SuppressWarnings("java:S3776")
private boolean isValidMaximum(Number x) {
// Check Draft 2020-12 exclusiveMaximumValue first (takes
precedence)
if (nn(exclusiveMaximumValue)) {
@@ -4474,6 +4479,7 @@ public class HttpPartSchema {
return maxProperties == null || x.size() <= maxProperties;
}
+ @SuppressWarnings("java:S3776")
private boolean isValidMinimum(Number x) {
// Check Draft 2020-12 exclusiveMinimumValue first (takes
precedence)
if (nn(exclusiveMinimumValue)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
index 98c8712d9e..45d91c953b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/JsonParserSession.java
@@ -195,13 +195,14 @@ public class JsonParserSession extends
ReaderParserSession {
ctx = builder.ctx;
}
+ @SuppressWarnings("java:S3776")
private <T> T parseAnything(ClassMeta<?> eType, ParserReader r, Object
outer, BeanPropertyMeta pMeta) throws IOException, ParseException,
ExecutableException {
if (eType == null)
eType = object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -215,7 +216,7 @@ public class JsonParserSession extends ReaderParserSession {
setCurrentClass(sType);
var wrapperAttr = getJsonClassMeta(sType).getWrapperAttr();
- var o = (Object)null;
+ Object o = null;
skipCommentsAndSpace(r);
if (nn(wrapperAttr))
@@ -356,6 +357,7 @@ public class JsonParserSession extends ReaderParserSession {
throw new ParseException(this, "Could not find the end of the
field name.");
}
+ @SuppressWarnings("java:S3776")
private <T> BeanMap<T> parseIntoBeanMap2(ParserReader r, BeanMap<T> m)
throws IOException, ParseException, ExecutableException {
// S1: Looking for outer {
@@ -446,6 +448,7 @@ public class JsonParserSession extends ReaderParserSession {
return null; // Unreachable.
}
+ @SuppressWarnings("java:S3776")
private <E> Collection<E> parseIntoCollection2(ParserReader r,
Collection<E> l, ClassMeta<?> type, BeanPropertyMeta pMeta) throws IOException,
ParseException, ExecutableException {
// S1: Looking for outermost [
@@ -508,6 +511,7 @@ public class JsonParserSession extends ReaderParserSession {
return null; // Unreachable.
}
+ @SuppressWarnings("java:S3776")
private <K,V> Map<K,V> parseIntoMap2(ParserReader r, Map<K,V> m,
ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws
IOException, ParseException, ExecutableException {
if (keyType == null)
@@ -522,7 +526,7 @@ public class JsonParserSession extends ReaderParserSession {
skipCommentsAndSpace(r);
var state = S1;
- var currAttr = (String)null;
+ String currAttr = null;
int c = 0;
while (c != -1) {
c = r.read();
@@ -612,6 +616,7 @@ public class JsonParserSession extends ReaderParserSession {
return parseNumber(r, r.parseNumberString(), type);
}
+ @SuppressWarnings("java:S3776")
private Number parseNumber(ParserReader r, String s, Class<? extends
Number> type) throws ParseException {
// JSON has slightly different number rules from Java.
@@ -658,6 +663,7 @@ public class JsonParserSession extends ReaderParserSession {
* If the string consists of a concatenation of strings (e.g. 'AAA' +
"BBB"), this method
* will automatically concatenate the strings and return the result.
*/
+ @SuppressWarnings("java:S3776")
private String parseString(ParserReader r) throws IOException,
ParseException {
r.mark();
int qc = r.read(); // The quote character being
used (" or ')
@@ -666,7 +672,7 @@ public class JsonParserSession extends ReaderParserSession {
throw new ParseException(this, msg, (char)qc);
}
final boolean isQuoted = (qc == '\'' || qc == '"');
- var s = (String)null;
+ String s = null;
boolean isInEscape = false;
int c = 0;
while (c != -1) {
@@ -740,6 +746,7 @@ public class JsonParserSession extends ReaderParserSession {
* Doesn't actually parse anything, but when positioned at the
beginning of comment,
* it will move the pointer to the last character in the comment.
*/
+ @SuppressWarnings("java:S3776")
private void skipComments(ParserReader r) throws ParseException,
IOException {
int c = r.read();
// "/* */" style comments
@@ -806,6 +813,7 @@ public class JsonParserSession extends ReaderParserSession {
* Doesn't actually parse anything, but moves the position beyond the
construct "{wrapperAttr:" when
* the @Json(wrapperAttr) annotation is used on a class.
*/
+ @SuppressWarnings("java:S3776")
private void skipWrapperAttrStart(ParserReader r, String wrapperAttr)
throws IOException, ParseException {
// S1: Looking for outer '{'
@@ -814,7 +822,7 @@ public class JsonParserSession extends ReaderParserSession {
// S4: Found :, looking for valStart: { [ " ' LITERAL.
var state = S1;
- var currAttr = (String)null;
+ String currAttr = null;
int c = 0;
while (c != -1) {
c = r.read();
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 3ce25bb096..5eeeb78a09 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
@@ -347,7 +347,7 @@ public class JsonSerializerSession extends
WriterSerializerSession {
* @return The same writer passed in.
* @throws SerializeException General serialization error occurred.
*/
- @SuppressWarnings({ "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "java:S3776" })
protected JsonWriter serializeAnything(JsonWriter out, Object o,
ClassMeta<?> eType, String attrName, BeanPropertyMeta pMeta) throws
SerializeException {
if (o == null) {
@@ -358,8 +358,8 @@ public class JsonSerializerSession extends
WriterSerializerSession {
if (eType == null)
eType = object();
- var aType = (ClassMeta<?>)null; // The actual
type
- var sType = (ClassMeta<?>)null; // The
serialized type
+ ClassMeta<?> aType = null; // The actual
type
+ ClassMeta<?> sType = null; // The
serialized type
aType = push2(attrName, o, eType);
boolean isRecursion = aType == null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index d631bc4b2b..2996e67d0a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -302,7 +302,7 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
return null;
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({ "unchecked", "rawtypes", "java:S3776" })
private JsonMap getSchema(ClassMeta<?> eType, String attrName,
List<String> pNames, boolean exampleAdded, boolean descriptionAdded,
JsonSchemaBeanPropertyMeta jsbpm)
throws BeanRecursionException, SerializeException {
@@ -314,18 +314,18 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
if (eType == null)
eType = object();
- var aType = (ClassMeta<?>)null; // The actual
type (will be null if recursion occurs)
- var sType = (ClassMeta<?>)null; // The
serialized type
+ ClassMeta<?> aType = null; // The actual
type (will be null if recursion occurs)
+ ClassMeta<?> sType = null; // The
serialized type
var objectSwap = eType.getSwap(this);
aType = push(attrName, eType, null);
sType = eType.getSerializedClassMeta(this);
- var type = (String)null;
- var format = (String)null;
- var example = (Object)null;
- var description = (Object)null;
+ String type = null;
+ String format = null;
+ Object example = null;
+ Object description = null;
boolean useDef = isUseBeanDefs() && sType.isBean() && pNames ==
null;
@@ -339,14 +339,14 @@ public class JsonSchemaGeneratorSession extends
BeanTraverseSession {
return new JsonMap().append("$ref",
getBeanDefUri(sType));
}
- var jscm = (JsonSchemaClassMeta)null;
+ JsonSchemaClassMeta jscm = null;
var objectSwapCM = objectSwap == null ? null :
getClassMeta(objectSwap.getClass());
if (nn(objectSwapCM) &&
getAnnotationProvider().has(Schema.class, objectSwapCM))
jscm = getJsonSchemaClassMeta(objectSwapCM);
if (jscm == null)
jscm = getJsonSchemaClassMeta(sType);
- var tc = (TypeCategory)null;
+ TypeCategory tc = null;
if (sType.isNumber()) {
tc = NUMBER;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
index fc0c86c5da..c077a5128f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParserSession.java
@@ -175,13 +175,14 @@ public class MsgPackParserSession extends
InputStreamParserSession {
/*
* Workhorse method.
*/
+ @SuppressWarnings("java:S3776")
private <T> T parseAnything(ClassMeta<?> eType, MsgPackInputStream is,
Object outer, BeanPropertyMeta pMeta) throws IOException, ParseException,
ExecutableException {
if (eType == null)
eType = object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -194,7 +195,7 @@ public class MsgPackParserSession extends
InputStreamParserSession {
setCurrentClass(sType);
- var o = (Object)null;
+ Object o = null;
DataType dt = is.readDataType();
int length = (int)is.readLength();
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 719765c4fb..143ed58185 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
@@ -210,7 +210,7 @@ public class MsgPackSerializerSession extends
OutputStreamSerializerSession {
* Workhorse method.
* Determines the type of object, and then calls the appropriate
type-specific serialization method.
*/
- @SuppressWarnings({ "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "java:S3776" })
private MsgPackOutputStream serializeAnything(MsgPackOutputStream out,
Object o, ClassMeta<?> eType, String attrName, BeanPropertyMeta pMeta) throws
SerializeException {
if (o == null)
@@ -219,8 +219,8 @@ public class MsgPackSerializerSession extends
OutputStreamSerializerSession {
if (eType == null)
eType = object();
- var aType = (ClassMeta<?>)null; // The actual
type
- var sType = (ClassMeta<?>)null; // The
serialized type
+ ClassMeta<?> aType = null; // The actual
type
+ ClassMeta<?> sType = null; // The
serialized type
aType = push2(attrName, o, eType);
boolean isRecursion = aType == null;
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 de36002657..0a19b81941 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
@@ -243,7 +243,7 @@ public class OpenApiParserSession extends UonParserSession {
return t;
}
- @SuppressWarnings({ "unchecked" })
+ @SuppressWarnings({ "unchecked", "java:S3776" })
private <T> T parseInner(HttpPartType partType, HttpPartSchema schema,
String in, ClassMeta<T> type) throws SchemaValidationException, ParseException {
schema.validateInput(in);
if (in == null || "null".equals(in)) {
@@ -254,7 +254,7 @@ public class OpenApiParserSession extends UonParserSession {
var swap = (ObjectSwap<T,Object>)type.getSwap(this);
var builder =
(BuilderSwap<T,Object>)type.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
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 4c14076ceb..cbc3eaadca 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
@@ -281,6 +281,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
}
@Override /* Overridden from PartSerializer */
+ @SuppressWarnings("java:S3776")
public String serialize(HttpPartType partType, HttpPartSchema schema,
Object value) throws SerializeException, SchemaValidationException {
ClassMeta<?> type = getClassMetaForObject(value);
@@ -311,7 +312,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
if (cf == HttpPartCollectionFormat.NO_COLLECTION_FORMAT)
cf = ctx.getCollectionFormat();
- var out = (String)null;
+ String out = null;
schema.validateOutput(value, ctx.getBeanContext());
@@ -495,7 +496,7 @@ public class OpenApiSerializerSession extends
UonSerializerSession {
return m;
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "java:S3776" })
private Object toObject(HttpPartType partType, Object o, HttpPartSchema
s) throws SerializeException, SchemaValidationException {
if (o == null)
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
index 36f6c57506..98cb7c1d7a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectPaginator.java
@@ -62,7 +62,7 @@ public class ObjectPaginator implements ObjectTool<PageArgs> {
}
@Override /* Overridden from ObjectTool */
- @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes", "unchecked", "java:S3776" })
public Object run(BeanSession session, Object input, PageArgs args) {
if (input == null)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
index 559c15ca10..e3b2e2fc85 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
@@ -85,7 +85,7 @@ public class ObjectViewer implements ObjectTool<ViewArgs> {
if (type.isBean())
return new DelegateBeanMap(input,
session).filterKeys(view);
- var l = (ArrayList<Object>)null;
+ ArrayList<Object> l = null;
if (type.isArray()) {
var size = Array.getLength(input);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
index 75cdd970c3..b6737dfca4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSession.java
@@ -915,7 +915,7 @@ public class ParserSession extends BeanSession {
* @return The resolved class, or <jk>null</jk> if the type name could
not be resolved.
*/
protected final ClassMeta<?> getClassMeta(String typeName,
BeanPropertyMeta pMeta, ClassMeta<?> eType) {
- var br = (BeanRegistry)null;
+ BeanRegistry br = null;
// Resolve via @Beanp(dictionary={})
if (nn(pMeta)) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
index b1e28eedd2..dbe32092b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSession.java
@@ -350,6 +350,7 @@ public class SerializerSession extends BeanTraverseSession {
* @return <jk>true</jk> if the specified value should not be
serialized.
* @throws SerializeException If recursion occurred.
*/
+ @SuppressWarnings("java:S3776")
public final boolean canIgnoreValue(ClassMeta<?> cm, String attrName,
Object value) throws SerializeException {
if (value == null && ! isKeepNullProperties())
@@ -762,7 +763,7 @@ public class SerializerSession extends BeanTraverseSession {
* @param pMeta The current bean property being serialized.
* @return The bean dictionary name, or <jk>null</jk> if a name could
not be found.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
protected final String getBeanTypeName(SerializerSession session,
ClassMeta<?> eType, ClassMeta<?> aType, BeanPropertyMeta pMeta) {
if (eType == aType || ! (isAddBeanTypes() || (session.isRoot()
&& isAddRootType())))
return null;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
index f1fdfd394c..d15c35ec1c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/AutoNumberSwap.java
@@ -208,7 +208,7 @@ public class AutoNumberSwap<T> extends ObjectSwap<T,Number>
{
this.unswapMethod = unswapMethod == null ? null :
bc.getBeanMethodVisibility().transform(unswapMethod.inner());
this.unswapConstructor = unswapConstructor == null ? null :
bc.getBeanConstructorVisibility().transform(unswapConstructor.inner());
- var unswapType = (Class<?>)null;
+ Class<?> unswapType = null;
if (nn(unswapMethod)) {
for (var pi : unswapMethod.getParameters())
if (!
pi.getParameterType().is(BeanSession.class))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
index 31018b67ca..3bf5a8a463 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
@@ -95,7 +95,7 @@ public class BuilderSwap<T,B> {
public static BuilderSwap<?,?> findSwapFromObjectClass(BeanContext bc,
Class<?> objectClass, Visibility cVis, Visibility mVis) {
var builderClass = Value.<Class<?>>empty();
MethodInfo objectCreateMethod, builderCreateMethod;
- var objectConstructor = (ConstructorInfo)null;
+ ConstructorInfo objectConstructor = null;
ConstructorInfo builderConstructor;
var pci = info(objectClass);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index f194585da0..26b71051a0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -295,13 +295,14 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
* @throws ParseException Malformed input encountered.
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
+ @SuppressWarnings("java:S3776")
public <T> T parseAnything(ClassMeta<?> eType, UonReader r, Object
outer, boolean isUrlParamValue, BeanPropertyMeta pMeta) throws IOException,
ParseException, ExecutableException {
if (eType == null)
eType = object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -314,7 +315,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
setCurrentClass(sType);
- var o = (Object)null;
+ Object o = null;
int c = r.peekSkipWs();
@@ -450,6 +451,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
throw new ParseException(this, "Unrecognized syntax for
boolean. ''{0}''.", s);
}
+ @SuppressWarnings("java:S3776")
private <T> BeanMap<T> parseIntoBeanMap(UonReader r, BeanMap<T> m)
throws IOException, ParseException, ExecutableException {
int c = r.readSkipWs();
@@ -567,6 +569,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
return null; // Unreachable.
}
+ @SuppressWarnings("java:S3776")
private <E> Collection<E> parseIntoCollection(UonReader r,
Collection<E> l, ClassMeta<E> type, boolean isUrlParamValue, BeanPropertyMeta
pMeta)
throws IOException, ParseException, ExecutableException {
@@ -654,6 +657,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
return null; // Unreachable.
}
+ @SuppressWarnings("java:S3776")
private <K,V> Map<K,V> parseIntoMap(UonReader r, Map<K,V> m,
ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta) throws
IOException, ParseException, ExecutableException {
if (keyType == null)
@@ -865,6 +869,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
* @throws IOException Exception thrown by underlying stream.
* @throws ParseException Attribute name was malformed.
*/
+ @SuppressWarnings("java:S3776")
protected final String parseAttrName(UonReader r, boolean encoded)
throws IOException, ParseException {
// If string is of form 'xxx', we're looking for ' at the end.
@@ -931,7 +936,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
r.mark();
boolean isInEscape = false;
- var s = (String)null;
+ String s = null;
var endChars = (isUrlParamValue ? endCharsParam :
endCharsNormal);
while (c != -1) {
c = r.read();
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 dbe9df307d..c8d8920195 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
@@ -395,7 +395,7 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
* @return The same writer passed in.
* @throws SerializeException Generic serialization error occurred.
*/
- @SuppressWarnings({ "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "java:S3776" })
protected SerializerWriter serializeAnything(UonWriter out, Object o,
ClassMeta<?> eType, String attrName, BeanPropertyMeta pMeta) throws
SerializeException {
if (o == null) {
@@ -406,8 +406,8 @@ public class UonSerializerSession extends
WriterSerializerSession implements Htt
if (eType == null)
eType = object();
- var aType = (ClassMeta<?>)null; // The actual
type
- var sType = (ClassMeta<?>)null; // The
serialized type
+ ClassMeta<?> aType = null; // The actual
type
+ ClassMeta<?> sType = null; // The
serialized type
aType = push2(attrName, o, eType);
boolean isRecursion = aType == null;
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 810d73be79..f8f5d63f54 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
@@ -211,13 +211,14 @@ public class UrlEncodingParserSession extends
UonParserSession {
return false;
}
+ @SuppressWarnings("java:S3776")
private <T> T parseAnything(ClassMeta<T> eType, UonReader r, Object
outer) throws IOException, ParseException, ExecutableException {
if (eType == null)
eType = (ClassMeta<T>)object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -290,6 +291,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
return (T)o;
}
+ @SuppressWarnings("java:S3776")
private <T> BeanMap<T> parseIntoBeanMap(UonReader r, BeanMap<T> m)
throws IOException, ParseException, ExecutableException {
int c = r.peekSkipWs();
@@ -416,6 +418,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
return null; // Unreachable.
}
+ @SuppressWarnings("java:S3776")
private <K,V> Map<K,V> parseIntoMap2(UonReader r, Map<K,V> m,
ClassMeta<?> type, Object outer) throws IOException, ParseException,
ExecutableException {
var keyType = (ClassMeta<K>)(type.isArgs() ||
type.isCollectionOrArray() ? getClassMeta(Integer.class) : type.getKeyType());
@@ -433,7 +436,7 @@ public class UrlEncodingParserSession extends
UonParserSession {
var state = S1;
int argIndex = 0;
- var currAttr = (K)null;
+ K currAttr = null;
while (c != -1) {
c = r.read();
if (! isInEscape) {
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 cfe7e82d03..46b24bf188 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
@@ -223,10 +223,11 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
/*
* Workhorse method. Determines the type of object, and then calls the
appropriate type-specific serialization method.
*/
+ @SuppressWarnings("java:S3776")
private SerializerWriter serializeAnything(UonWriter out, Object o)
throws IOException, SerializeException {
- var aType = (ClassMeta<?>)null; // The actual
type
- var sType = (ClassMeta<?>)null; // The
serialized type
+ ClassMeta<?> aType = null; // The actual
type
+ ClassMeta<?> sType = null; // The
serialized type
var eType = getExpectedRootType(o);
aType = push2("root", o, eType);
@@ -276,6 +277,7 @@ public class UrlEncodingSerializerSession extends
UonSerializerSession {
return out;
}
+ @SuppressWarnings("java:S3776")
private SerializerWriter serializeBeanMap(UonWriter out, BeanMap<?> m,
String typeName) throws SerializeException {
var addAmp = Flag.create();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
index 8dae2c6a7c..0108b71e1d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlParserSession.java
@@ -290,12 +290,12 @@ public class XmlParserSession extends ReaderParserSession
{
return decodeString(s);
}
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
private Object getUnknown(XmlReader r) throws IOException,
ParseException, ExecutableException, XMLStreamException {
if (r.getEventType() != START_ELEMENT) {
throw new ParseException(this, "Parser must be on
START_ELEMENT to read next text.");
}
- var m = (JsonMap)null;
+ JsonMap m = null;
// If this element has attributes, then it's always a JsonMap.
if (r.getAttributeCount() > 0) {
@@ -369,7 +369,7 @@ public class XmlParserSession extends ReaderParserSession {
return key.equals(getBeanTypePropertyName(null)) ||
key.equals(getNamePropertyName());
}
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
private <T> BeanMap<T> parseIntoBean(XmlReader r, BeanMap<T> m, boolean
isNil) throws IOException, ParseException, ExecutableException,
XMLStreamException {
var bMeta = m.getMeta();
var xmlMeta = getXmlBeanMeta(bMeta);
@@ -401,9 +401,9 @@ public class XmlParserSession extends ReaderParserSession {
var cpf = xmlMeta.getContentFormat();
var trim = cp == null || ! cpf.isOneOf(MIXED_PWS, TEXT_PWS);
var cpcm = (cp == null ? object() : cp.getClassMeta());
- var sb = (StringBuilder)null;
+ StringBuilder sb = null;
var breg = cp == null ? null : cp.getBeanRegistry();
- var l = (LinkedList<Object>)null;
+ LinkedList<Object> l = null;
int depth = 0;
do {
@@ -543,6 +543,7 @@ public class XmlParserSession extends ReaderParserSession {
return l;
}
+ @SuppressWarnings("java:S3776")
private <K,V> Map<K,V> parseIntoMap(XmlReader r, Map<K,V> m,
ClassMeta<K> keyType, ClassMeta<V> valueType, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
int depth = 0;
@@ -761,7 +762,7 @@ public class XmlParserSession extends ReaderParserSession {
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
* @throws XMLStreamException Malformed XML encountered.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
protected <T> T parseAnything(ClassMeta<T> eType, String currAttr,
XmlReader r, Object outer, boolean isRoot, BeanPropertyMeta pMeta)
throws IOException, ParseException, ExecutableException,
XMLStreamException {
@@ -769,7 +770,7 @@ public class XmlParserSession extends ReaderParserSession {
eType = (ClassMeta<T>)object();
var swap = (ObjectSwap<T,Object>)eType.getSwap(this);
var builder = (BuilderSwap<T,Object>)eType.getBuilderSwap(this);
- var sType = (ClassMeta<?>)null;
+ ClassMeta<?> sType = null;
if (nn(builder))
sType = builder.getBuilderClassMeta(this);
else if (nn(swap))
@@ -802,7 +803,7 @@ public class XmlParserSession extends ReaderParserSession {
if (nn(tcm))
sType = eType = tcm;
- var o = (Object)null;
+ Object o = null;
if (jsonType == NULL) {
r.nextTag(); // Discard end tag
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 e2fee9639c..65f3a76e70 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
@@ -357,7 +357,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
return xcm.getFormat() == XMLTEXT;
}
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
private ContentResult serializeBeanMap(XmlWriter out, BeanMap<?> m,
Namespace elementNs, boolean isCollapsed, boolean isMixedOrText) throws
SerializeException {
boolean hasChildren = false;
var bm = m.getMeta();
@@ -378,10 +378,10 @@ public class XmlSerializerSession extends
WriterSerializerSession {
var contentProperty = xbm.getContentPropertyName();
// @formatter:on
- var cf = (XmlFormat)null;
+ XmlFormat cf = null;
- var content = (Object)null;
- var contentType = (ClassMeta<?>)null;
+ Object content = null;
+ ClassMeta<?> contentType = null;
for (var p : lp) {
var n = p.getName();
if (attrs.contains(n) || attrs.contains("*") ||
n.equals(attrsProperty)) {
@@ -510,7 +510,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
var c = (sType.isCollection() ? (Collection)in :
toList(sType.inner(), in));
- var type2 = (String)null;
+ String type2 = null;
var eName = Value.of(type2);
var eNs = Value.<Namespace>empty();
@@ -578,7 +578,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
* @param o The POJO to check.
* @throws SerializeException Thrown if bean recursion occurred.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
protected final void findNsfMappings(Object o) throws
SerializeException {
ClassMeta<?> aType = null;
// The actual type
@@ -601,7 +601,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
// Handle recursion
if (nn(aType) && ! aType.isPrimitive()) {
- var bm = (BeanMap<?>)null;
+ BeanMap<?> bm = null;
if (aType.isBeanMap()) {
bm = (BeanMap<?>)o;
} else if (aType.isBean()) {
@@ -751,7 +751,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
* @return The same writer passed in so that calls to the writer can be
chained.
* @throws SerializeException General serialization error occurred.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
protected ContentResult serializeAnything(XmlWriter out, Object o,
ClassMeta<?> eType, String keyName, String elementName, Namespace
elementNamespace, boolean addNamespaceUris, XmlFormat format,
boolean isMixedOrText, boolean preserveWhitespace,
BeanPropertyMeta pMeta) throws SerializeException {
@@ -895,8 +895,8 @@ public class XmlSerializerSession extends
WriterSerializerSession {
boolean encodeEn = nn(elementName);
var ns = (elementNamespace == null ? null :
elementNamespace.name);
- var dns = (String)null;
- var elementNs = (String)null;
+ String dns = null;
+ String elementNs = null;
if (isEnableNamespaces()) {
dns = elementName == null && nn(defaultNamespace) ?
defaultNamespace.name : null;
elementNs = elementName == null ? dns : ns;
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 5c2d6ba607..6ca5810986 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
@@ -561,7 +561,7 @@ public class Microservice implements ConfigEventListener {
* @throws IOException Problem occurred reading file.
* @throws ParseException Malformed input encountered.
*/
- @SuppressWarnings("resource")
+ @SuppressWarnings({ "resource", "java:S3776" })
protected Microservice(Builder builder) throws IOException,
ParseException {
setInstance(this);
this.builder = builder.copy();
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
index db64494dd2..ba2e9ddcd8 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/HelpCommand.java
@@ -37,6 +37,7 @@ public class HelpCommand extends ConsoleCommand {
private final Messages mb = Messages.of(HelpCommand.class, "Messages");
@Override /* Overridden from ConsoleCommand */
+ @SuppressWarnings("java:S3776")
public boolean execute(Scanner in, PrintWriter out, Args args) throws
Exception {
var commands = Microservice.getInstance().getConsoleCommands();
if (args.size() == 1) {
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 3e8c00f336..ef1fa6171e 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -88,6 +88,7 @@ public class LogEntryFormatter extends Formatter {
* If <jk>true</jk>, only print unique stack traces once and then
refer to them by a simple 8 character hash
* identifier.
*/
+ @SuppressWarnings("java:S3776")
public LogEntryFormatter(String format, String dateFormat, boolean
useStackTraceHashes) {
this.df = new SimpleDateFormat(dateFormat);
if (useStackTraceHashes)
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
index 944cbeb6bb..acee2e87c8 100644
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/LogsResource.java
@@ -209,7 +209,7 @@ public class LogsResource extends BasicRestServlet {
);
}
- @SuppressWarnings("resource")
+ @SuppressWarnings({ "resource", "java:S3776" })
@RestOp(
method="VIEW",
path="/*",
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 9b2030e108..a16d2e4cd2 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -538,6 +538,7 @@ public class JettyMicroservice extends Microservice {
* @throws IOException File could not be read.
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
+ @SuppressWarnings("java:S3776")
public Server createServer() throws ParseException, IOException,
ExecutableException {
listener.onCreateServer(this);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index bbb0421fcf..2eb873cf24 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -214,7 +214,7 @@ public class ResponseContent implements HttpEntity {
* </ul>
* @see BeanSession#getClassMeta(Class) for argument syntax for maps
and collections.
*/
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "java:S3776" })
public <T> T as(ClassMeta<T> type) throws RestCallException {
try {
if (type.is(ResponseContent.class) ||
type.is(HttpEntity.class))
@@ -744,7 +744,7 @@ public class ResponseContent implements HttpEntity {
public Reader asReader() throws IOException {
// Figure out what the charset of the response is.
- var cs = (String)null;
+ String cs = null;
var ct = getContentType().orElse(null);
// First look for "charset=" in Content-Type header of response.
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 087b984aea..589422d830 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
@@ -3001,6 +3001,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <br>Can contain <jk>null</jk> values (ignored).
* @return This object.
*/
+ @SuppressWarnings("java:S3776")
public Builder interceptors(Object...value) {
List<RestCallInterceptor> l = list();
for (var o : value) {
@@ -6267,6 +6268,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* as a parsed object.
* @throws RestCallException REST call failed.
*/
+ @SuppressWarnings("java:S3776")
public RestRequest callback(String callString) throws RestCallException
{
callString = emptyIfNull(callString);
@@ -6279,10 +6281,10 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
var state = S1;
var mark = 0;
- var method = (String)null;
- var headers = (String)null;
- var uri = (String)null;
- var content = (String)null;
+ String method = null;
+ String headers = null;
+ String uri = null;
+ String content = null;
for (var i = 0; i < callString.length(); i++) {
var c = callString.charAt(i);
if (state == S1) {
@@ -6929,7 +6931,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <br>Can be <jk>null</jk> (will use the default parser from the
client).
* @return The new proxy interface.
*/
- @SuppressWarnings({ "unchecked" })
+ @SuppressWarnings({ "unchecked", "java:S3776" })
public <T> T getRemote(Class<T> interfaceClass, Object rootUrl,
Serializer serializer, Parser parser) {
if (rootUrl == null)
@@ -7169,7 +7171,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
* <br>Can be <jk>null</jk> (will use the default parser from the
client).
* @return The new proxy interface.
*/
- @SuppressWarnings({ "unchecked" })
+ @SuppressWarnings({ "unchecked", "java:S3776" })
public <T> T getRrpcInterface(Class<T> interfaceClass, Object uri,
Serializer serializer, Parser parser) {
if (uri == null) {
@@ -7194,7 +7196,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
var rim = rm.getMethodMeta(method);
var uri = rim.getUri();
- var res = (RestResponse)null;
+ RestResponse res = null;
try {
// @formatter:off
@@ -7926,7 +7928,7 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
*/
protected RestRequest request(RestOperation op) throws
RestCallException {
if (isClosed.get()) {
- var e2 = (Exception)null;
+ Exception e2 = null;
if (nn(closedStack)) {
e2 = new Exception("Creation stack:");
e2.setStackTrace(closedStack);
@@ -7975,11 +7977,12 @@ public class RestClient extends BeanContextable
implements HttpClient, Closeable
return callHandler.run(target, request, context);
}
+ @SuppressWarnings("java:S3776")
Object executeRemote(Class<?> interfaceClass, RestRequest rc, Method
method, RemoteOperationMeta rom) throws Throwable {
RemoteOperationReturn ror = rom.getReturns();
try {
- var ret = (Object)null;
+ Object ret = null;
var res = (RestResponse)null;
rc.rethrow(RuntimeException.class);
rom.forEachException(rc::rethrow);
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 358aadbdd8..50e85e9dde 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
@@ -1674,7 +1674,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
*/
public RestRequest queryCustom(Object value) {
try {
- var q = (String)null;
+ String q = null;
if (value instanceof Reader value2)
q = read(value2);
else if (value instanceof InputStream value2)
@@ -1923,7 +1923,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
if (nn(request2)) {
- var input2 = (Object)null;
+ Object input2 = null;
if (content != NO_BODY) {
input2 = content;
} else {
@@ -1933,7 +1933,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
if (input2 instanceof Supplier<?> s)
input2 = s.get();
- var entity = (HttpEntity)null;
+ HttpEntity entity = null;
if (input2 instanceof PartList input22)
entity = new
UrlEncodedFormEntity(input22.stream().map(SimpleFormData::new).filter(SimplePart::isValid).toList());
else if (input2 instanceof HttpResource
input23) {
@@ -1987,7 +1987,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
var message = thrownPart.getMessage();
for (var t : rethrow) {
if (t.getName().equals(className)) {
- var c = (ConstructorInfo)null;
+ ConstructorInfo c = null;
var ci = ClassInfo.of(t);
c = ci.getPublicConstructor(x
-> x.hasParameterTypes(HttpResponse.class)).orElse(null);
if (nn(c))
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
index a41af493d4..86dfe77f5e 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestResponse.java
@@ -389,6 +389,7 @@ public class RestResponse implements HttpResponse,
AutoCloseable {
* </ul>
*/
@Override /* Overridden from AutoCloseable */
+ @SuppressWarnings("java:S3776")
public void close() {
if (isClosed)
return;
@@ -502,7 +503,7 @@ public class RestResponse implements HttpResponse,
AutoCloseable {
*/
public String getCharacterEncoding() throws RestCallException {
var ct = getContentType();
- var s = (String)null;
+ String s = null;
if (ct.isPresent())
s = getContentType().get().getParameter("charset");
return e(s) ? "utf-8" : s;
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
index ad852d541c..13a520fdf8 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationMeta.java
@@ -59,6 +59,7 @@ public class RemoteOperationMeta {
String contentDefault = null;
static final AnnotationProvider AP =
AnnotationProvider.INSTANCE;
+ @SuppressWarnings("java:S3776")
Builder(String parentPath, Method m, String defaultMethod) {
var mi = MethodInfo.of(m);
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
index 06045891ca..c195c5bb96 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/remote/RemoteOperationReturn.java
@@ -51,7 +51,7 @@ public class RemoteOperationReturn {
var ap = AP;
var al = rstream(ap.find(m)).filter(REMOTE_OP_GROUP).toList();
- var rv = (RemoteReturn)null;
+ RemoteReturn rv = null;
if (rt.is(Future.class)) {
isFuture = true;
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 44c0cb1b71..4dfe69f61b 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
@@ -346,8 +346,8 @@ public class HeaderList extends ControlledArrayList<Header>
{
*/
public Optional<Header> get(String name) {
- var first = (Header)null;
- var rest = (List<Header>)null;
+ Header first = null;
+ List<Header> rest = null;
for (var x : this) {
if (eq(x.getName(), name)) {
if (first == null)
@@ -404,8 +404,8 @@ public class HeaderList extends ControlledArrayList<Header>
{
*/
public <T> Optional<T> get(String name, Class<T> type) {
- var first = (Header)null;
- var rest = (List<Header>)null;
+ Header first = null;
+ List<Header> rest = null;
for (var x : this) {
if (eq(x.getName(), name)) {
if (first == null)
@@ -775,6 +775,7 @@ public class HeaderList extends ControlledArrayList<Header>
{
* @param values The headers to replace. <jk>null</jk> values are
ignored.
* @return This object.
*/
+ @SuppressWarnings("java:S3776")
public HeaderList set(List<Header> values) {
if (nn(values)) {
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 a85fb3b705..9c8c79b4f1 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
@@ -330,8 +330,8 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
*/
public Optional<NameValuePair> get(String name) {
- var first = (NameValuePair)null;
- var rest = (List<NameValuePair>)null;
+ NameValuePair first = null;
+ List<NameValuePair> rest = null;
for (var x : this) {
if (eq(x.getName(), name)) {
if (first == null)
@@ -388,8 +388,8 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
*/
public <T> Optional<T> get(String name, Class<T> type) {
- var first = (NameValuePair)null;
- var rest = (List<NameValuePair>)null;
+ NameValuePair first = null;
+ List<NameValuePair> rest = null;
for (var x : this) {
if (eq(x.getName(), name)) {
if (first == null)
@@ -702,6 +702,7 @@ public class PartList extends
ControlledArrayList<NameValuePair> {
* @param values The parts to replace. <jk>null</jk> values are
ignored.
* @return This object.
*/
+ @SuppressWarnings("java:S3776")
public PartList set(List<NameValuePair> values) {
if (nn(values)) {
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 eacd44d846..1149ce061f 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
@@ -211,13 +211,11 @@ public class RestContext extends Context {
return isRestInjectMethod(mi, null);
}
- private static boolean isRestInjectMethod(MethodInfo mi, String
name) {
- return mi.getAnnotations(RestInject.class)
- .map(AnnotationInfo::inner)
- .filter(x -> nn(x) && x.methodScope().length ==
0 && (n(name) || eq(x.name(), name)))
- .findFirst()
- .isPresent();
- }
+ private static boolean isRestInjectMethod(MethodInfo mi, String name) {
+ return mi.getAnnotations(RestInject.class)
+ .map(AnnotationInfo::inner)
+ .anyMatch(x -> nn(x) && x.methodScope().length == 0 &&
(n(name) || eq(x.name(), name)));
+ }
private BeanContext.Builder beanContext;
private BeanCreator<CallLogger> callLogger;
@@ -4494,6 +4492,7 @@ public class RestContext extends Context {
* @return A new REST children list.
* @throws Exception If a problem occurred instantiating one of
the child rest contexts.
*/
+ @SuppressWarnings("java:S3776")
protected RestChildren.Builder
createRestChildren(BasicBeanStore beanStore, Supplier<?> resource, RestContext
restContext) throws Exception {
// Default value.
@@ -4599,6 +4598,7 @@ public class RestContext extends Context {
* @return A new REST operations list.
* @throws ServletException If a problem occurred instantiating
one of the child rest contexts.
*/
+ @SuppressWarnings("java:S3776")
protected RestOperations.Builder
createRestOperations(BasicBeanStore beanStore, Supplier<?> resource,
RestContext restContext) throws ServletException {
// Default value.
@@ -5157,6 +5157,7 @@ public class RestContext extends Context {
* @throws ServletException General servlet exception.
* @throws IOException Thrown by underlying stream.
*/
+ @SuppressWarnings("java:S3776")
public void execute(Object resource, HttpServletRequest r1,
HttpServletResponse r2) throws ServletException, IOException {
// Must be careful not to bleed thread-locals.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index d164b83d98..2aef289921 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -1970,6 +1970,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
*
* @return The path matchers for this method.
*/
+ @SuppressWarnings("java:S3776")
protected UrlPathMatcherList getPathMatchers() {
var v = Value.of(UrlPathMatcherList.create());
@@ -2030,6 +2031,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
* <p>
* This includes: {@link Header}, {@link Query}, {@link
FormData}.
*/
+ @SuppressWarnings("java:S3776")
protected void processParameterAnnotations() {
for (var aa : restMethod.getParameterAnnotations()) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
index f9b9adcb81..56614b8ae8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOperations.java
@@ -145,6 +145,7 @@ public class RestOperations {
* @throws PreconditionFailed At least one method was found but it
didn't match one or more matchers.
* @throws NotFound HTTP method match was found but matching path was
not.
*/
+ @SuppressWarnings("java:S3776")
public RestOpContext findOperation(RestSession session) throws
MethodNotAllowed, PreconditionFailed, NotFound {
String m = session.getMethod();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 369afb3edb..0f19de62d8 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -1156,6 +1156,7 @@ public class RestRequest extends
HttpServletRequestWrapper {
* @param rbm The metadata about the request bean interface to create.
* @return A new request bean proxy for this REST request.
*/
+ @SuppressWarnings("java:S3776")
public <T> T getRequest(RequestBeanMeta rbm) {
try {
var c = (Class<T>)rbm.getClassMeta().inner();
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 f6acaf6c3f..734ea20715 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
@@ -128,6 +128,7 @@ public class RestResponse extends
HttpServletResponseWrapper {
/**
* Constructor.
*/
+ @SuppressWarnings("java:S3776")
RestResponse(RestOpContext opContext, RestSession session, RestRequest
req) throws Exception {
super(session.getResponse());
@@ -373,6 +374,7 @@ public class RestResponse extends
HttpServletResponseWrapper {
* @throws NotAcceptable If unsupported Accept-Encoding value specified.
* @throws IOException Thrown by underlying stream.
*/
+ @SuppressWarnings("java:S3776")
public FinishableServletOutputStream getNegotiatedOutputStream() throws
NotAcceptable, IOException {
if (os == null) {
Encoder encoder = null;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
index dc9c22179f..e34dd50b53 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestSession.java
@@ -315,6 +315,7 @@ public class RestSession extends ContextSession {
* @return The HTTP method name, always uppercased.
* @throws NotFound If the method parameter contains invalid/malformed
characters.
*/
+ @SuppressWarnings("java:S3776")
public String getMethod() throws NotFound {
if (method == null) {
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 b7901c65b2..df856f40b6 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
@@ -523,6 +523,7 @@ public class RequestContent {
}
/* Workhorse method */
+ @SuppressWarnings("java:S3776")
private <T> T parse(ClassMeta<T> cm) throws SchemaValidationException,
ParseException, UnsupportedMediaType, IOException {
if (cm.isReader())
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 9e09ee5158..08d29d91e9 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
@@ -129,7 +129,7 @@ public class RequestFormParams extends
ArrayList<RequestFormParam> {
* @param caseSensitive Whether case-sensitive name matching is enabled.
* @throws Exception Any exception can be thrown.
*/
- @SuppressWarnings("null")
+ @SuppressWarnings({ "null", "java:S3776" })
public RequestFormParams(RestRequest req, boolean caseSensitive) throws
Exception {
this.req = req;
this.caseSensitive = caseSensitive;
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 52a3fd5443..bf1d7f8386 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
@@ -542,6 +542,7 @@ public class CallLogger {
* @param req The servlet request.
* @param res The servlet response.
*/
+ @SuppressWarnings("java:S3776")
public void log(HttpServletRequest req, HttpServletResponse res) {
var rule = getRule(req, res);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
index c0557191f8..4b0b2b6c4c 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/rrpc/RrpcRestOpSession.java
@@ -103,6 +103,7 @@ public class RrpcRestOpSession extends RestOpSession {
}
@Override
+ @SuppressWarnings("java:S3776")
public void run() throws Throwable {
super.run();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
index 6f83a7b492..a0cf9f6d20 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java
@@ -599,6 +599,7 @@ public class BasicSwaggerProviderSession {
// @formatter:on
}
+ @SuppressWarnings("java:S3776")
private void addBodyExamples(RestOpContext sm, JsonMap piri, boolean
response, Type type, Locale locale) throws Exception {
var sex = piri.getString("example");
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 dbeea13d70..524a43cc03 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
@@ -219,7 +219,7 @@ public class RestUtils {
return safe(()-> parseQuery(new ParserPipe(qs)));
}
- @SuppressWarnings("java:S2677")
+ @SuppressWarnings({ "java:S2677", "java:S3776" })
private static Map<String,List<String>> parseQuery(ParserPipe p) throws
IOException {
var m = CollectionUtils.<String,List<String>>map();
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 c9a2d32c11..06c2376c40 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
@@ -89,6 +89,7 @@ public class RequestSwaggerVar extends MultipartResolvingVar {
}
@Override /* Overridden from Var */
+ @SuppressWarnings("java:S3776")
public String resolve(VarResolverSession session, String key) throws
BasicHttpException, InternalServerError {
try {
RestRequest req =
session.getBean(RestRequest.class).orElseThrow(InternalServerError::new);
