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 ca2e852683 SonarQube bug fixes
ca2e852683 is described below
commit ca2e8526838edd85a58a364195cdecb708da390f
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 20:51:58 2026 -0500
SonarQube bug fixes
---
.../src/main/java/org/apache/juneau/annotation/SchemaAnnotation.java | 2 ++
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 3 +++
.../org/apache/juneau/rest/swagger/BasicSwaggerProviderSession.java | 2 ++
.../test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java | 3 +++
.../java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java | 2 ++
.../org/apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java | 2 ++
6 files changed, 14 insertions(+)
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 2665c70325..0925fbf489 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,6 +1602,7 @@ 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;
@@ -1712,6 +1713,7 @@ public class SchemaAnnotation {
return a == null || DEFAULT.equals(a);
}
+ @SuppressWarnings("deprecation")
private static JsonMap merge(JsonMap m, Items a) throws ParseException {
if (ItemsAnnotation.empty(a))
return m;
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 b97229ba85..531d740969 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
@@ -2626,6 +2626,7 @@ public class HttpPartSchema {
return this;
}
+ @SuppressWarnings("deprecation")
Builder apply(Items a) {
default_(joinnlOrNull(a.default_(), a.df()));
enum_(toSet(a.enum_(), a.e()));
@@ -2744,6 +2745,7 @@ public class HttpPartSchema {
// Other
//
-----------------------------------------------------------------------------------------------------------------
+ @SuppressWarnings("deprecation")
Builder apply(Schema a) {
default_(joinnlOrNull(a.default_(), a.df()));
enum_(toSet(a.enum_(), a.e()));
@@ -2798,6 +2800,7 @@ public class HttpPartSchema {
return this;
}
+ @SuppressWarnings("deprecation")
Builder apply(SubItems a) {
default_(joinnlOrNull(a.default_(), a.df()));
enum_(toSet(a.enum_(), a.e()));
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 4ef0bd2ad2..c5bac24d5a 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
@@ -862,6 +862,7 @@ public class BasicSwaggerProviderSession {
return om;
}
+ @SuppressWarnings("deprecation")
private JsonMap merge(JsonMap om, Items a) throws ParseException {
if (ItemsAnnotation.empty(a))
return om;
@@ -911,6 +912,7 @@ 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/httppart/HttpPartSchema_Body_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java
index a2b5ec2930..6c6fef0b69 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,6 +875,7 @@ 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 {}
@@ -892,6 +893,7 @@ 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 {}
@@ -909,6 +911,7 @@ 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 f6fddd603a..78d6a0af7e 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,6 +1514,7 @@ 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;
@@ -1526,6 +1527,7 @@ 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 247f223833..12fb88b6f1 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,6 +199,7 @@ class SchemaAnnotation_Test extends TestBase {
// Comparison with declared annotations.
//------------------------------------------------------------------------------------------------------------------
+ @SuppressWarnings("deprecation")
@Schema(
default_="a",
enum_="b",
@@ -258,6 +259,7 @@ class SchemaAnnotation_Test extends TestBase {
public static class D1 {}
Schema d1 = D1.class.getAnnotationsByType(Schema.class)[0];
+ @SuppressWarnings("deprecation")
@Schema(
default_="a",
enum_="b",
