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 590f713cac SonarQube bug fixes
590f713cac is described below
commit 590f713cacbfa42dd8127a68f30f58114e6c9394
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 4 21:05:00 2026 -0500
SonarQube bug fixes
---
docs/src/javadoc/javadoc.css | 21 +++++++++------------
.../apache/juneau/annotation/SchemaAnnotation.java | 2 --
.../org/apache/juneau/httppart/HttpPartSchema.java | 3 ---
.../rest/swagger/BasicSwaggerProviderSession.java | 2 --
.../src/main/resources/htdocs/javadoc.css | 6 ++----
.../src/main/resources/htdocs/styles/SwaggerUI.css | 4 +---
.../src/main/resources/htdocs/themes/dark.css | 3 ---
.../src/main/resources/htdocs/themes/devops.css | 5 +----
.../src/main/resources/htdocs/themes/light.css | 2 +-
.../juneau/rest/config/htdocs/styles/SwaggerUI.css | 4 +---
.../juneau/rest/config/htdocs/themes/dark.css | 3 ---
.../juneau/rest/config/htdocs/themes/devops.css | 5 +----
.../juneau/rest/config/htdocs/themes/light.css | 2 +-
.../juneau/commons/utils/ThrowableUtils_Test.java | 12 ++++++------
.../juneau/httppart/HttpPartSchema_Body_Test.java | 3 ---
.../juneau/jsonschema/JsonSchemaGeneratorTest.java | 2 --
.../annotation/SchemaAnnotation_Test.java | 2 --
17 files changed, 23 insertions(+), 58 deletions(-)
diff --git a/docs/src/javadoc/javadoc.css b/docs/src/javadoc/javadoc.css
index cb976e5bfa..efc39f1331 100755
--- a/docs/src/javadoc/javadoc.css
+++ b/docs/src/javadoc/javadoc.css
@@ -452,10 +452,10 @@ div.table-tabs > button.table-tab {
background:#dee3e9;
font-weight: bold;
}
-.col-first, .col-first {
+.col-first {
font-size:13px;
}
-.col-second, .col-second, .col-last, .col-constructor-name,
.col-summary-item-name, .col-last {
+.col-second, .col-last, .col-constructor-name, .col-summary-item-name {
font-size:13px;
}
.col-first, .col-second, .col-constructor-name {
@@ -467,8 +467,6 @@ div.table-tabs > button.table-tab {
}
.col-first a:link, .col-first a:visited,
.col-second a:link, .col-second a:visited,
-.col-first a:link, .col-first a:visited,
-.col-second a:link, .col-second a:visited,
.col-constructor-name a:link, .col-constructor-name a:visited,
.col-summary-item-name a:link, .col-summary-item-name a:visited {
font-weight:bold;
@@ -1274,9 +1272,14 @@ h2.topic, h3.topic, h4.topic {
h2.topic { font-size:14pt; }
h3.topic { font-size:13pt; }
h4.topic { font-size:12pt; }
-h5.topic { font-size:11pt; }
+h5.topic {
+ font-size:11pt;
+ background:linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
+ background:-moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat
scroll 0% 0% transparent;
+ background:-webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
+ max-width:800px;
+}
.topic p { max-width:800px; }
-/*.topic ul li, .topic ol li { max-width:750px; }*/
div.topic { margin-left:10px; max-width:950px; }
h5.figure { color:#2c4557; margin-left:30px; margin-right:30px;
margin-top:10px; margin-bottom:0px; font-style:italic; }
@@ -1308,12 +1311,6 @@ div.contentContainer > div.block > p:first-child {
background:-webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
max-width:900px;
}
-h5.topic {
- background:linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
- background:-moz-linear-gradient(to bottom, #F5F5F5, #DEE3E9) repeat
scroll 0% 0% transparent;
- background:-webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
- max-width:800px;
-}
/* Dark-colored background headers */
div.header > div.subTitle > div.block,
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 0925fbf489..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;
@@ -1713,7 +1712,6 @@ 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 531d740969..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
@@ -2626,7 +2626,6 @@ public class HttpPartSchema {
return this;
}
- @SuppressWarnings("deprecation")
Builder apply(Items a) {
default_(joinnlOrNull(a.default_(), a.df()));
enum_(toSet(a.enum_(), a.e()));
@@ -2745,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()));
@@ -2800,7 +2798,6 @@ 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 c5bac24d5a..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
@@ -862,7 +862,6 @@ public class BasicSwaggerProviderSession {
return om;
}
- @SuppressWarnings("deprecation")
private JsonMap merge(JsonMap om, Items a) throws ParseException {
if (ItemsAnnotation.empty(a))
return om;
@@ -912,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-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
index c6e0839fd3..7ad5aaaaa9 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/javadoc.css
@@ -74,6 +74,7 @@ h5 {
}
h6 {
font-size:1.1em;
+ margin:10px 0px;
}
ul {
list-style-type:disc;
@@ -134,7 +135,7 @@ Navigation bar styles
background-repeat:repeat-x;
color:#FFFFFF;
padding:.8em .5em .4em .8em;
- height:auto;/*height:1.8em;*/
+ height:auto;
font-size:1em;
margin:0;
}
@@ -698,9 +699,6 @@ h5.topic,h6.topic {
color: rgb(44,69,87);
text-decoration: underline;
}
-h6 {
- margin:10px 0px;
-}
h6.figure {
color: rgb(44,69,87);
margin-left: 30px;
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/styles/SwaggerUI.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/styles/SwaggerUI.css
index b55ffc6cc8..e1b5d564f9 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/styles/SwaggerUI.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/styles/SwaggerUI.css
@@ -13,7 +13,7 @@
***************************************************************************************************************************
*/
-.swagger-ui {
+.swagger-ui {
}
/*-----------------------------------------------------------------------------------------------------------
@@ -251,7 +251,6 @@ td.parameter-value, td.response-value {
.op-block-contents .example-select {
margin: 10px 0 5px 0;
- border-width: 1px;
font-weight:bold;
padding: 5px 40px 5px 10px;
border: 1px solid #41444e;
@@ -332,7 +331,6 @@ div.headers {
}
.section-table {
-/* display: inline-block;*/
}
.responses .section-table td {
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/dark.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/dark.css
index 0a3499543a..dfd5b0727b 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/dark.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/dark.css
@@ -23,9 +23,6 @@ body {
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
color: #EEE;
height: 100%;
-}
-
-body {
font-size: 14px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
index d757a92d67..144953b125 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/devops.css
@@ -22,10 +22,7 @@ body {
margin: 0px;
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
color: #B3B3B3;
- height: 100%;
-}
-
-body {
+ height: 100%;
font-size: 14px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/light.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/light.css
index 3875da3a9e..0540af0f09 100644
--- a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/light.css
+++ b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/light.css
@@ -49,7 +49,7 @@ header {
}
header * {
- color: #af2222;;
+ color: #af2222;
font-weight: lighter;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/styles/SwaggerUI.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/styles/SwaggerUI.css
index b55ffc6cc8..e1b5d564f9 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/styles/SwaggerUI.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/styles/SwaggerUI.css
@@ -13,7 +13,7 @@
***************************************************************************************************************************
*/
-.swagger-ui {
+.swagger-ui {
}
/*-----------------------------------------------------------------------------------------------------------
@@ -251,7 +251,6 @@ td.parameter-value, td.response-value {
.op-block-contents .example-select {
margin: 10px 0 5px 0;
- border-width: 1px;
font-weight:bold;
padding: 5px 40px 5px 10px;
border: 1px solid #41444e;
@@ -332,7 +331,6 @@ div.headers {
}
.section-table {
-/* display: inline-block;*/
}
.responses .section-table td {
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/dark.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/dark.css
index 0a3499543a..dfd5b0727b 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/dark.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/dark.css
@@ -23,9 +23,6 @@ body {
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
color: #EEE;
height: 100%;
-}
-
-body {
font-size: 14px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
index d757a92d67..144953b125 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/devops.css
@@ -22,10 +22,7 @@ body {
margin: 0px;
font-family: HelveticaNeue-Light,"Helvetica Neue Light","Helvetica
Neue",Helvetica,Arial,"Lucida Grande",sans-serif;
color: #B3B3B3;
- height: 100%;
-}
-
-body {
+ height: 100%;
font-size: 14px;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/light.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/light.css
index 3875da3a9e..0540af0f09 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/light.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/light.css
@@ -49,7 +49,7 @@ header {
}
header * {
- color: #af2222;;
+ color: #af2222;
font-weight: lighter;
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ThrowableUtils_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ThrowableUtils_Test.java
index a3e8211500..8b1b41f07c 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ThrowableUtils_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/utils/ThrowableUtils_Test.java
@@ -229,25 +229,25 @@ class ThrowableUtils_Test extends TestBase {
// Same exception type and stack trace should produce same hash
assertDoesNotThrow(() -> {
- int hash1 = hash(ex1, null);
- int hash2 = hash(ex2, null);
+ hash(ex1, null);
+ hash(ex2, null);
// Note: hash might be different due to different stack
traces, but should be consistent
// Test with stop class - covers line 180 (break when
stopClass matches)
// Use a class name that will be in the stack trace
String testClassName =
ThrowableUtils_Test.class.getName();
- int hash3 = hash(ex1, testClassName);
+ hash(ex1, testClassName);
// Test with stop class that doesn't match (should
process all stack frames)
- int hash4 = hash(ex1, "java.lang.Object");
+ hash(ex1, "java.lang.Object");
// Test with nested exception
var cause = new IOException("cause");
var wrapped = new RuntimeException("wrapped", cause);
- int hash5 = hash(wrapped, null);
+ hash(wrapped, null);
// Test with stop class matching a class in the cause
chain - covers line 180
- int hash7 = hash(wrapped, "java.io.IOException");
+ hash(wrapped, "java.io.IOException");
});
// Test with null exception
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",
