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 91875fda82 SonarQube bug fixes
91875fda82 is described below
commit 91875fda82b8053c3ed07e93953c5b2f27a7071c
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 20:48:42 2026 -0500
SonarQube bug fixes
---
.../juneau-marshall/src/main/java/org/apache/juneau/MediaType.java | 5 ++---
.../src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java | 1 -
.../src/main/java/org/apache/juneau/cp/FileFinder.java | 3 ++-
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 1 -
.../src/main/java/org/apache/juneau/serializer/SerializerSet.java | 2 --
.../src/main/java/org/apache/juneau/http/header/Debug.java | 1 +
.../src/main/java/org/apache/juneau/http/header/NoTrace.java | 1 +
.../org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java | 1 -
.../java/org/apache/juneau/commons/io/NoCloseOutputStream_Test.java | 4 ++--
.../test/java/org/apache/juneau/commons/io/NoCloseWriter_Test.java | 4 ++--
.../test/java/org/apache/juneau/commons/utils/DateUtils_Test.java | 3 ---
.../test/java/org/apache/juneau/commons/utils/SystemUtils_Test.java | 3 ---
.../java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java | 3 ---
.../java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java | 2 --
.../apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java | 2 --
15 files changed, 10 insertions(+), 26 deletions(-)
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 caaec6b1d5..13a6a2f046 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
@@ -48,11 +48,10 @@ public class MediaType implements Comparable<MediaType> {
private static final Cache<String,MediaType> CACHE =
Cache.of(String.class, MediaType.class).build();
/** Reusable predefined media type */
- @SuppressWarnings("javadoc")
public static final MediaType CSV = of("text/csv");
- @SuppressWarnings("javadoc")
+ /** Reusable predefined media type */
public static final MediaType HTML = of("text/html");
- @SuppressWarnings("javadoc")
+ /** Reusable predefined media type */
public static final MediaType JSON = of("application/json");
@SuppressWarnings("javadoc")
public static final MediaType MSGPACK = of("octal/msgpack");
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
index 7432ac2d3b..2665c70325 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java
@@ -1602,7 +1602,6 @@ public class SchemaAnnotation {
* @return The schema converted to a map, or and empty map if the
annotation was null.
* @throws ParseException Malformed input encountered.
*/
- @SuppressWarnings("deprecation")
public static JsonMap asMap(Schema a) throws ParseException {
if (a == null)
return JsonMap.EMPTY_MAP;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 298dcd7383..7e7fdf92c0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -90,8 +90,9 @@ import org.apache.juneau.commons.io.*;
@SuppressWarnings("java:S115")
public interface FileFinder {
- // Argument name constants for assertArgNotNull
+ /** Argument name constant for assertArgNotNull. */
String ARG_value = "value";
+ /** Argument name constant for assertArgNotNull. */
String ARG_c = "c";
/**
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 c8dea949d1..b97229ba85 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
@@ -2744,7 +2744,6 @@ public class HttpPartSchema {
// Other
//
-----------------------------------------------------------------------------------------------------------------
- @SuppressWarnings("deprecation")
Builder apply(Schema a) {
default_(joinnlOrNull(a.default_(), a.df()));
enum_(toSet(a.enum_(), a.e()));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
index 231006e0e6..d47113b11a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/SerializerSet.java
@@ -418,7 +418,6 @@ public class SerializerSet {
* <p>
* Used by {@link SerializerSet.Builder#set(Class...)}
*/
- @SuppressWarnings("javadoc")
public abstract static class Inherit extends Serializer {
protected Inherit(Serializer.Builder builder) {
super(builder);
@@ -430,7 +429,6 @@ public class SerializerSet {
* <p>
* Used by {@link SerializerSet.Builder#add(Class...)}
*/
- @SuppressWarnings("javadoc")
public abstract static class NoInherit extends Serializer {
protected NoInherit(Serializer.Builder builder) {
super(builder);
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
index d1d29fe53d..0da041108d 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/Debug.java
@@ -48,6 +48,7 @@ public class Debug extends BasicBooleanHeader {
@SuppressWarnings("javadoc")
public static final Debug TRUE = of(true);
+ /** Constant for <jk>false</jk> value. */
public static final Debug FALSE = of(false);
/**
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
index 66891ae2f6..166f22c1ef 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/NoTrace.java
@@ -36,6 +36,7 @@ public class NoTrace extends BasicBooleanHeader {
@SuppressWarnings("javadoc")
public static final NoTrace TRUE = of(true);
+ /** Constant for <jk>false</jk> value. */
public static final NoTrace FALSE = of(false);
/**
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 fb2370b86f..4ef0bd2ad2 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
@@ -911,7 +911,6 @@ public class BasicSwaggerProviderSession {
// @formatter:on
}
- @SuppressWarnings("deprecation")
private JsonMap merge(JsonMap om, Schema a) {
try {
if (SchemaAnnotation.empty(a))
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseOutputStream_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseOutputStream_Test.java
index ff8b6a6405..c41d2238dd 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseOutputStream_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseOutputStream_Test.java
@@ -62,7 +62,7 @@ class NoCloseOutputStream_Test extends TestBase {
assertEquals("test", baos.toString());
}
- @Test void b02_flush_multipleTimes() throws IOException {
+ @Test void b02_flush_multipleTimes() {
var baos = new ByteArrayOutputStream();
var wrapper = new NoCloseOutputStream(baos);
assertDoesNotThrow(() -> {
@@ -94,7 +94,7 @@ class NoCloseOutputStream_Test extends TestBase {
assertEquals("test", baos.toString());
}
- @Test void c03_close_multipleTimes() throws IOException {
+ @Test void c03_close_multipleTimes() {
var baos = new ByteArrayOutputStream();
var wrapper = new NoCloseOutputStream(baos);
assertDoesNotThrow(() -> {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseWriter_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseWriter_Test.java
index fa1255f71c..3c8842ae1c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseWriter_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/NoCloseWriter_Test.java
@@ -110,7 +110,7 @@ class NoCloseWriter_Test extends TestBase {
assertEquals("test", sw.toString());
}
- @Test void c02_flush_multipleTimes() throws IOException {
+ @Test void c02_flush_multipleTimes() {
var sw = new StringWriter();
var wrapper = new NoCloseWriter(sw);
assertDoesNotThrow(() -> {
@@ -142,7 +142,7 @@ class NoCloseWriter_Test extends TestBase {
assertEquals("test", sw.toString());
}
- @Test void d03_close_multipleTimes() throws IOException {
+ @Test void d03_close_multipleTimes() {
var sw = new StringWriter();
var wrapper = new NoCloseWriter(sw);
assertDoesNotThrow(() -> {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/DateUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/DateUtils_Test.java
index c5cc274b08..1102eace48 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/DateUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/DateUtils_Test.java
@@ -16,10 +16,7 @@
*/
package org.apache.juneau.commons.utils;
-import static org.junit.jupiter.api.Assertions.*;
-
import org.apache.juneau.*;
-import org.junit.jupiter.api.*;
class DateUtils_Test extends TestBase {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SystemUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SystemUtils_Test.java
index f6ea5b6fb4..9ecd680472 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SystemUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/SystemUtils_Test.java
@@ -16,10 +16,7 @@
*/
package org.apache.juneau.commons.utils;
-import static org.junit.jupiter.api.Assertions.*;
-
import org.apache.juneau.*;
-import org.junit.jupiter.api.*;
/**
* Tests for {@link SystemUtils}.
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
index 6c6fef0b69..a2b5ec2930 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
@@ -875,7 +875,6 @@ class HttpPartSchema_Body_Test extends TestBase {
// Backward compatibility: Old boolean exclusiveMaximum/exclusiveMinimum
//-----------------------------------------------------------------------------------------------------------------
- @SuppressWarnings("deprecation")
@Content
@Schema(t="integer", exclusiveMaximum=true, exclusiveMinimum=true,
maximum="100", minimum="0")
public static class D03a {}
@@ -893,7 +892,6 @@ class HttpPartSchema_Body_Test extends TestBase {
assertThrowsWithMessage(SchemaValidationException.class,
"Maximum value exceeded.", ()->s.validateOutput(101, BeanContext.DEFAULT));
}
- @SuppressWarnings("deprecation")
@Content
@Schema(t="integer", exclusiveMaximum=false, exclusiveMinimum=false,
maximum="100", minimum="0")
public static class D03b {}
@@ -911,7 +909,6 @@ class HttpPartSchema_Body_Test extends TestBase {
assertThrowsWithMessage(SchemaValidationException.class,
"Maximum value exceeded.", ()->s.validateOutput(101, BeanContext.DEFAULT));
}
- @SuppressWarnings("deprecation")
@Content
@Schema(t="integer", exclusiveMaximumValue="100",
exclusiveMinimumValue="0", exclusiveMaximum=false, exclusiveMinimum=false)
public static class D03c {}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
index 78d6a0af7e..f6fddd603a 100755
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java
@@ -1514,7 +1514,6 @@ class JsonSchemaGeneratorTest extends TestBase {
assertBean(schema,
"exclusiveMaximum,exclusiveMinimum,maximum,minimum", "true,true,100,0");
}
- @SuppressWarnings("deprecation")
@Schema(type="integer", exclusiveMaximum=true, exclusiveMinimum=true,
maximum="100", minimum="0")
public static class OldStyleExclusiveBean {
public int value;
@@ -1527,7 +1526,6 @@ class JsonSchemaGeneratorTest extends TestBase {
assertBean(schema, "exclusiveMaximum,exclusiveMinimum",
"100,0");
}
- @SuppressWarnings("deprecation")
@Schema(type="integer",
exclusiveMaximumValue="100",
exclusiveMinimumValue="0",
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
index 12fb88b6f1..247f223833 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java
@@ -199,7 +199,6 @@ class SchemaAnnotation_Test extends TestBase {
// Comparison with declared annotations.
//------------------------------------------------------------------------------------------------------------------
- @SuppressWarnings("deprecation")
@Schema(
default_="a",
enum_="b",
@@ -259,7 +258,6 @@ class SchemaAnnotation_Test extends TestBase {
public static class D1 {}
Schema d1 = D1.class.getAnnotationsByType(Schema.class)[0];
- @SuppressWarnings("deprecation")
@Schema(
default_="a",
enum_="b",
