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 29568b4d2e SonarQube bug fixes
29568b4d2e is described below
commit 29568b4d2e4c090046b94bc5723839ef23b471fe
Author: James Bognar <[email protected]>
AuthorDate: Fri Feb 6 09:39:39 2026 -0500
SonarQube bug fixes
---
docs/src/javadoc/javadoc.css | 13 +++++--------
.../src/main/java/org/apache/juneau/parser/ParserSet.java | 9 ++++++---
.../java/org/apache/juneau/serializer/SerializerSet.java | 4 +++-
.../java/org/apache/juneau/rest/client/RestResponse.java | 2 +-
.../java/org/apache/juneau/http/header/BasicHeader.java | 12 ++++++++----
.../src/main/java/org/apache/juneau/rest/RestContext.java | 2 +-
.../src/main/resources/htdocs/javadoc.css | 6 +++---
.../src/main/resources/htdocs/styles/SwaggerUI.css | 6 ------
.../src/main/resources/htdocs/themes/original.css | 4 ++--
.../apache/juneau/rest/config/htdocs/styles/SwaggerUI.css | 6 ------
.../apache/juneau/rest/config/htdocs/themes/original.css | 4 ++--
scripts/check-fluent-setter-overrides.py | 2 +-
12 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/docs/src/javadoc/javadoc.css b/docs/src/javadoc/javadoc.css
index efc39f1331..c1faddaad5 100755
--- a/docs/src/javadoc/javadoc.css
+++ b/docs/src/javadoc/javadoc.css
@@ -480,10 +480,6 @@ div.table-tabs > button.table-tab {
/*
* Styles for contents.
*/
-div.block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
.col-last div {
padding-top:0;
}
@@ -1020,9 +1016,11 @@ pre.snippet .highlighted {
/* --------------------------------- Overrides
---------------------------------------*/
h3.topic {
font-style:normal;
+ font-size:13pt;
}
div.block {
+ font-size:14px;
font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
}
@@ -1270,12 +1268,11 @@ 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;
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:-moz-linear-gradient(top, #F5F5F5, #DEE3E9) repeat scroll 0%
0% transparent;
background:-webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
max-width:800px;
}
@@ -1307,7 +1304,7 @@ h2.title,
div.docSummary > div.block,
div.contentContainer > div.block > p:first-child {
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:-moz-linear-gradient(top, #F5F5F5, #DEE3E9) repeat scroll 0%
0% transparent;
background:-webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9) );
max-width:900px;
}
@@ -1319,7 +1316,7 @@ h1.title,
div.contentContainer > h2:first-of-type,
body > p:first-child {
background:linear-gradient(to bottom, #3B596D, #6289A3) repeat scroll
0% 0% transparent;
- background:-moz-linear-gradient(to bottom, #3B596D, #6289A3) repeat
scroll 0% 0% transparent;
+ background:-moz-linear-gradient(top, #3B596D, #6289A3) repeat scroll 0%
0% transparent;
background:-webkit-gradient(linear, left top, left bottom,
from(#3B596D), to(#6289A3) );
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
index 514498f840..b29f703771 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ParserSet.java
@@ -92,6 +92,9 @@ public class ParserSet {
*/
public static class Builder extends BeanBuilder<ParserSet> {
+ private static final String CLASS_NoInherit = "NoInherit";
+ private static final String CLASS_Inherit = "Inherit";
+
List<Object> entries;
private BeanContext.Builder bcBuilder;
@@ -157,12 +160,12 @@ public class ParserSet {
public Builder add(Class<?>...values) {
List<Object> l = list();
for (var v : values)
- if (v.getSimpleName().equals("NoInherit"))
+ if (v.getSimpleName().equals(CLASS_NoInherit))
clear();
for (var v : values) {
if (Parser.class.isAssignableFrom(v)) {
l.add(createBuilder(v));
- } else if (!
v.getSimpleName().equals("NoInherit")) {
+ } else if (!
v.getSimpleName().equals(CLASS_NoInherit)) {
throw rex("Invalid type passed to
ParserSet.Builder.add(): {0}", cn(v));
}
}
@@ -344,7 +347,7 @@ public class ParserSet {
public Builder set(Class<?>...values) {
List<Object> l = list();
for (var v : values) {
- if (v.getSimpleName().equals("Inherit")) {
+ if (v.getSimpleName().equals(CLASS_Inherit)) {
l.addAll(entries);
} else if (Parser.class.isAssignableFrom(v)) {
l.add(createBuilder(v));
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 07fc637e0a..17ffb8aff3 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
@@ -91,6 +91,8 @@ public class SerializerSet {
*/
public static class Builder extends BeanBuilder<SerializerSet> {
+ private static final String CLASS_Inherit = "Inherit";
+
List<Object> entries;
private BeanContext.Builder bcBuilder;
@@ -340,7 +342,7 @@ public class SerializerSet {
public Builder set(Class<?>...values) {
List<Object> l = list();
for (var e : values) {
- if (e.getSimpleName().equals("Inherit")) {
+ if (e.getSimpleName().equals(CLASS_Inherit)) {
l.addAll(entries);
} else if
(Serializer.class.isAssignableFrom(e)) {
l.add(createBuilder(e));
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 58b7f04ac2..fe68520151 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
@@ -457,7 +457,7 @@ public class RestResponse implements HttpResponse,
AutoCloseable {
return this;
}
- private void appendRequestContent(StringBuilder sb, HttpEntity e) {
+ private static void appendRequestContent(StringBuilder sb, HttpEntity
e) {
try {
sb.append("\n---request
content---\n").append(EntityUtils.toString(e));
} catch (Exception ex) {
diff --git
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
index 36e775463b..07fb86c9af 100644
---
a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
+++
b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/BasicHeader.java
@@ -145,11 +145,15 @@ public class BasicHeader implements Header, Cloneable,
Serializable {
@Override
public BasicHeader clone() {
- BasicHeader cloned = new BasicHeader(this);
- if (this.elements != null) {
- cloned.elements = this.elements.clone();
+ try {
+ BasicHeader cloned = (BasicHeader) super.clone();
+ if (this.elements != null) {
+ cloned.elements = this.elements.clone();
+ }
+ return cloned;
+ } catch (CloneNotSupportedException e) {
+ throw new AssertionError(e); // Should never happen
since we implement Cloneable
}
- return cloned;
}
/**
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 3ee21ebe1c..1c665aab24 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
@@ -6132,7 +6132,7 @@ public class RestContext extends Context {
}
}
- private PrintWriter getResponseWriter(HttpServletResponse res) throws
IOException {
+ private static PrintWriter getResponseWriter(HttpServletResponse res)
throws IOException {
try {
return res.getWriter();
} catch (@SuppressWarnings("unused") IllegalStateException x) {
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 6a4e0b51ad..68fc862616 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
@@ -15,7 +15,7 @@
Overall document style
*/
body {
- background-image: linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF
70px);
+ background-image: linear-gradient(to bottom, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-image: -o-linear-gradient(top, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-image: -moz-linear-gradient(top, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-image: -webkit-linear-gradient(top, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
@@ -773,7 +773,7 @@ h5.toc, h6.toc {
border-radius: 15px 15px 15px 0px;
text-decoration: none;
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: -moz-linear-gradient(top, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
background: -webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9));
}
@@ -787,6 +787,6 @@ div.contentContainer > div.block > p:first-child {
border-radius: 15px;
text-decoration: none;
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: -moz-linear-gradient(top, #F5F5F5, #DEE3E9) repeat scroll
0% 0% transparent;
background: -webkit-gradient(linear, left top, left bottom,
from(#F5F5F5), to(#DEE3E9));
}
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 e1b5d564f9..5a87cc570e 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,9 +13,6 @@
***************************************************************************************************************************
*/
-.swagger-ui {
-}
-
/*-----------------------------------------------------------------------------------------------------------
- Header key-value pairs
----------------------------------------------------------------------------------------------------------*/
@@ -330,9 +327,6 @@ div.headers {
text-align: left;
}
-.section-table {
-}
-
.responses .section-table td {
padding: 5px 20px 5px 0px;
text-align: left;
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/original.css
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/original.css
index 722feb3e92..5d7f62e0bf 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/original.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/htdocs/themes/original.css
@@ -18,7 +18,7 @@
/**********************************************************************************************************************/
body {
- background-image: linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF
70px);
+ background-image: linear-gradient(to bottom, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-image: -webkit-linear-gradient(top, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-attachment: fixed;
font-family: Sans-Serif;
@@ -130,7 +130,7 @@ article th {
padding: 3px 5px;
color: #666666;
text-align: center;
- background-image: linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%);
+ background-image: linear-gradient(to bottom, #FBF9E4 0%, #F3F2C2 100%);
background-image: -webkit-linear-gradient(top, #FBF9E4 0%, #F3F2C2
100%);
}
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 e1b5d564f9..5a87cc570e 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,9 +13,6 @@
***************************************************************************************************************************
*/
-.swagger-ui {
-}
-
/*-----------------------------------------------------------------------------------------------------------
- Header key-value pairs
----------------------------------------------------------------------------------------------------------*/
@@ -330,9 +327,6 @@ div.headers {
text-align: left;
}
-.section-table {
-}
-
.responses .section-table td {
padding: 5px 20px 5px 0px;
text-align: left;
diff --git
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/original.css
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/original.css
index 722feb3e92..5d7f62e0bf 100644
---
a/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/original.css
+++
b/juneau-rest/juneau-rest-server/src/main/resources/org/apache/juneau/rest/config/htdocs/themes/original.css
@@ -18,7 +18,7 @@
/**********************************************************************************************************************/
body {
- background-image: linear-gradient(top, #CDDDDF 0, #EAEDED 20px, #FFFFFF
70px);
+ background-image: linear-gradient(to bottom, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-image: -webkit-linear-gradient(top, #CDDDDF 0, #EAEDED 20px,
#FFFFFF 70px);
background-attachment: fixed;
font-family: Sans-Serif;
@@ -130,7 +130,7 @@ article th {
padding: 3px 5px;
color: #666666;
text-align: center;
- background-image: linear-gradient(top, #FBF9E4 0%, #F3F2C2 100%);
+ background-image: linear-gradient(to bottom, #FBF9E4 0%, #F3F2C2 100%);
background-image: -webkit-linear-gradient(top, #FBF9E4 0%, #F3F2C2
100%);
}
diff --git a/scripts/check-fluent-setter-overrides.py
b/scripts/check-fluent-setter-overrides.py
index 325a86b930..6a93d14852 100755
--- a/scripts/check-fluent-setter-overrides.py
+++ b/scripts/check-fluent-setter-overrides.py
@@ -135,7 +135,7 @@ def extract_class_info(file_path):
# Clean up extends (remove generics for simplicity)
if extends:
- extends = re.sub(r'<.*?>', '', extends).strip()
+ extends = re.sub(r'<[^>]*>', '', extends).strip()
java_class = JavaClass(class_name, file_path, extends, package)
