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 af02845e84 SonarQube bug fixes
af02845e84 is described below
commit af02845e842a5d1a825d740de53f1101600a503d
Author: James Bognar <[email protected]>
AuthorDate: Fri Feb 6 10:12:16 2026 -0500
SonarQube bug fixes
---
.../main/java/org/apache/juneau/bean/atom/package.html | 2 +-
.../main/java/org/apache/juneau/bean/html5/package2.html | 2 +-
.../examples/rest/springboot/HelloWorldResource.java | 4 ++--
.../juneau/examples/rest/springboot/RootResources.java | 14 +++++++-------
.../apache/juneau/examples/rest/HelloWorldResource.java | 4 ++--
.../apache/juneau/examples/rest/HtmlBeansResource.java | 8 ++++----
.../org/apache/juneau/examples/rest/PhotosResource.java | 2 +-
.../apache/juneau/examples/rest/RequestEchoResource.java | 6 +++---
.../org/apache/juneau/examples/rest/RootResources.java | 14 +++++++-------
.../juneau/examples/rest/UtilityBeansResource.java | 8 ++++----
.../org/apache/juneau/examples/rest/dto/DtoExamples.java | 2 +-
.../juneau/examples/rest/dto/JsonSchemaResource.java | 2 +-
.../apache/juneau/microservice/resources/ConfigEdit.html | 2 +-
.../springboot/template/HelloWorldResource.java | 4 ++--
.../microservice/springboot/template/RootResources.java | 12 ++++++------
.../java/org/apache/juneau/rest/converter/Queryable.java | 8 ++++----
.../apache/juneau/commons/io/MimeTypeDetector_Test.java | 2 +-
.../test/java/org/apache/juneau/cp/FileFinder_Test.java | 2 +-
.../org/apache/juneau/mstat/MethodExecStore_Test.java | 16 ++++++++--------
scripts/prompt-pgp-passphrase.py | 2 +-
scripts/push.py | 2 +-
scripts/revert-staged.py | 2 +-
scripts/revert-unstaged.py | 2 +-
23 files changed, 61 insertions(+), 61 deletions(-)
diff --git
a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
index b40eac588c..e1093a5958 100644
---
a/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
+++
b/juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/package.html
@@ -531,7 +531,7 @@
</div>
</div>
-<p align="center"><i><b>*** fín ***</b></i></p>
+<p style="text-align: center;"><i><b>*** fín ***</b></i></p>
</body>
</html>
\ No newline at end of file
diff --git
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
index 7682258d7a..b45a1662e7 100644
---
a/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
+++
b/juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/package2.html
@@ -306,7 +306,7 @@
</div>
</div>
-<p align="center"><i><b>*** fín ***</b></i></p>
+<p style="text-align: center;"><i><b>*** fín ***</b></i></p>
</body>
</html>
\ No newline at end of file
diff --git
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/HelloWorldResource.java
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/HelloWorldResource.java
index 2288727963..93b1292063 100644
---
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/HelloWorldResource.java
+++
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/HelloWorldResource.java
@@ -37,8 +37,8 @@ import org.springframework.beans.factory.annotation.*;
@HtmlDocConfig(
aside={
"<div style='max-width:400px' class='text'>",
- " <p>This page shows a resource that simply response with
a 'Hello world!' message</p>",
- " <p>The POJO serialized is a simple String.</p>",
+ "\t<p>This page shows a resource that simply response with a
'Hello world!' message</p>",
+ "\t<p>The POJO serialized is a simple String.</p>",
"</div>"
}
)
diff --git
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/RootResources.java
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/RootResources.java
index 91b6f96325..f00d75e3b0 100644
---
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/RootResources.java
+++
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/RootResources.java
@@ -59,13 +59,13 @@ import org.apache.juneau.serializer.annotation.*;
},
aside={
"<div class='text'>",
- " <p>This is an example of a 'router' page that serves as
a jumping-off point to child resources.</p>",
- " <p>Resources can be nested arbitrarily deep through
router pages.</p>",
- " <p>Note the <span class='link'>API</span> link provided
that lets you see the generated swagger doc for this page.</p>",
- " <p>Also note the <span class='link'>STATS</span> link
that provides basic usage statistics.</p>",
- " <p>Also note the <span class='link'>SOURCE</span> link
on these pages to view the source code for the page.</p>",
- " <p>All content on pages in the UI are serialized POJOs.
In this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
- " <p>Other features (such as this aside) are added
through annotations.</p>",
+ "\t<p>This is an example of a 'router' page that serves as a
jumping-off point to child resources.</p>",
+ "\t<p>Resources can be nested arbitrarily deep through router
pages.</p>",
+ "\t<p>Note the <span class='link'>API</span> link provided that
lets you see the generated swagger doc for this page.</p>",
+ "\t<p>Also note the <span class='link'>STATS</span> link that
provides basic usage statistics.</p>",
+ "\t<p>Also note the <span class='link'>SOURCE</span> link on
these pages to view the source code for the page.</p>",
+ "\t<p>All content on pages in the UI are serialized POJOs. In
this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
+ "\t<p>Other features (such as this aside) are added through
annotations.</p>",
"</div>"
},
asideFloat="RIGHT"
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index c280a09cc8..188c3b2ec1 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -32,8 +32,8 @@ import org.apache.juneau.rest.servlet.*;
@HtmlDocConfig(
aside={
"<div style='max-width:400px' class='text'>",
- " <p>This page shows a resource that simply response with
a 'Hello world!' message</p>",
- " <p>The POJO serialized is a simple String.</p>",
+ "\t<p>This page shows a resource that simply response with a
'Hello world!' message</p>",
+ "\t<p>The POJO serialized is a simple String.</p>",
"</div>"
}
)
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HtmlBeansResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HtmlBeansResource.java
index 620f6de6d4..94f96e67eb 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HtmlBeansResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HtmlBeansResource.java
@@ -51,7 +51,7 @@ import org.apache.juneau.rest.widget.*;
},
aside={
"<div class='text'>",
- " <p>Examples of serialized HTML beans.</p>",
+ "\t<p>Examples of serialized HTML beans.</p>",
"</div>"
},
asideFloat="RIGHT"
@@ -69,7 +69,7 @@ public class HtmlBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized div tag.</p>",
+ "\t<p>Example of serialized div tag.</p>",
"</div>"
}
)
@@ -89,7 +89,7 @@ public class HtmlBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized HTML form.</p>",
+ "\t<p>Example of serialized HTML form.</p>",
"</div>"
}
)
@@ -111,7 +111,7 @@ public class HtmlBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized table.</p>",
+ "\t<p>Example of serialized table.</p>",
"</div>"
}
)
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
index 6ead564468..78d51c0553 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/PhotosResource.java
@@ -57,7 +57,7 @@ import org.apache.juneau.rest.widget.*;
},
aside={
"<div class='text'>",
- " <p>Examples of serialized beans in the
org.apache.juneau.rest.utilitybeans package.</p>",
+ "\t<p>Examples of serialized beans in the
org.apache.juneau.rest.utilitybeans package.</p>",
"</div>"
},
asideFloat="RIGHT"
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index b9cb636206..1099b8a2f2 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -58,9 +58,9 @@ import jakarta.servlet.http.*;
},
aside={
"<div style='max-width:400px;min-width:200px' class='text'>",
- " <p>Shows how even arbitrary POJOs such as
<c>HttpServletRequest</c> can be serialized by the framework.</p>",
- " <p>Also shows how to specify serializer properties,
filters, and swaps at the servlet level to control how POJOs are
serialized.</p>",
- " <p>Also provides an example of how to use the
Traversable and Queryable APIs.</p>",
+ "\t<p>Shows how even arbitrary POJOs such as
<c>HttpServletRequest</c> can be serialized by the framework.</p>",
+ "\t<p>Also shows how to specify serializer properties, filters,
and swaps at the servlet level to control how POJOs are serialized.</p>",
+ "\t<p>Also provides an example of how to use the Traversable
and Queryable APIs.</p>",
"</div>"
},
nowrap="false"
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index 796e49a8a0..7b13a934a3 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -55,13 +55,13 @@ import org.apache.juneau.serializer.annotation.*;
},
aside={
"<div class='text'>",
- " <p>This is an example of a 'router' page that serves as
a jumping-off point to child resources.</p>",
- " <p>Resources can be nested arbitrarily deep through
router pages.</p>",
- " <p>Note the <span class='link'>API</span> link provided
that lets you see the generated swagger doc for this page.</p>",
- " <p>Also note the <span class='link'>STATS</span> link
to view runtime statistics on this page.</p>",
- " <p>Also note the <span class='link'>SOURCE</span> link
to view the source code for the page.</p>",
- " <p>All content on pages in the UI are serialized POJOs.
In this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
- " <p>Other features (such as this aside) are added
through annotations.</p>",
+ "\t<p>This is an example of a 'router' page that serves as a
jumping-off point to child resources.</p>",
+ "\t<p>Resources can be nested arbitrarily deep through router
pages.</p>",
+ "\t<p>Note the <span class='link'>API</span> link provided that
lets you see the generated swagger doc for this page.</p>",
+ "\t<p>Also note the <span class='link'>STATS</span> link to
view runtime statistics on this page.</p>",
+ "\t<p>Also note the <span class='link'>SOURCE</span> link to
view the source code for the page.</p>",
+ "\t<p>All content on pages in the UI are serialized POJOs. In
this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
+ "\t<p>Other features (such as this aside) are added through
annotations.</p>",
"</div>"
},
asideFloat="RIGHT"
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UtilityBeansResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UtilityBeansResource.java
index 085dc57850..fdb4a616a9 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UtilityBeansResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UtilityBeansResource.java
@@ -49,7 +49,7 @@ import org.apache.juneau.rest.widget.*;
},
aside={
"<div class='text'>",
- " <p>Examples of serialized beans in the
org.apache.juneau.rest.utilitybeans package.</p>",
+ "\t<p>Examples of serialized beans in the
org.apache.juneau.rest.utilitybeans package.</p>",
"</div>"
},
asideFloat="RIGHT"
@@ -94,7 +94,7 @@ public class UtilityBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized ResourceDescriptions
bean.</p>",
+ "\t<p>Example of serialized ResourceDescriptions
bean.</p>",
"</div>"
}
)
@@ -110,7 +110,7 @@ public class UtilityBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized Hyperlink bean.</p>",
+ "\t<p>Example of serialized Hyperlink bean.</p>",
"</div>"
}
)
@@ -127,7 +127,7 @@ public class UtilityBeansResource extends BasicRestObject {
@HtmlDocConfig(
aside={
"<div class='text'>",
- " <p>Example of serialized
org.apache.juneau.rest.utilitybeans.SeeOtherRoot bean.</p>",
+ "\t<p>Example of serialized
org.apache.juneau.rest.utilitybeans.SeeOtherRoot bean.</p>",
"</div>"
}
)
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
index eb9ce2dcbb..e92c8ba606 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
@@ -49,7 +49,7 @@ import org.apache.juneau.serializer.annotation.*;
},
aside={
"<div style='max-width:400px' class='text'>",
- " <p>This is an example of a nested 'router' page that
serves as a jumping-off point to other child resources.</p>",
+ "\t<p>This is an example of a nested 'router' page that serves
as a jumping-off point to other child resources.</p>",
"</div>"
}
)
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
index 0bcca39890..947f896529 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
@@ -56,7 +56,7 @@ import org.apache.juneau.rest.widget.*;
},
aside={
"<div style='min-width:200px' class='text'>",
- " <p>Shows how to produce JSON-Schema documents in a
variety of languages using the JSON-Schema DTOs.</p>",
+ "\t<p>Shows how to produce JSON-Schema documents in a variety
of languages using the JSON-Schema DTOs.</p>",
"</div>"
}
)
diff --git
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigEdit.html
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigEdit.html
index 00c014c78b..818bdae2f7 100755
---
a/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigEdit.html
+++
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/resources/ConfigEdit.html
@@ -29,7 +29,7 @@
<form id='form' action='$R{servletURI}' method='POST'
enctype='application/x-www-form-urlencoded'>
<div class='data'>
<table>
- <tr><td colspan='2' align='right'><button
type='submit'>Submit</button><button type='reset'>Reset</button></td></tr>
+ <tr><td colspan='2' style='text-align:
right;'><button type='submit'>Submit</button><button
type='reset'>Reset</button></td></tr>
<tr><th colspan='2'
scope='colgroup'>Contents</th></tr>
<tr><td colspan='2'><textarea name='contents'
rows='40' cols='120' style='white-space: pre; word-wrap: normal; overflow-x:
scroll;'>$A{contents}</textarea></td></tr>
</table>
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
index 37ec1b4d90..72ffd14264 100644
---
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
+++
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/HelloWorldResource.java
@@ -34,8 +34,8 @@ import org.springframework.beans.factory.annotation.*;
* </ul>
*/
@Rest(title = "Hello World", description = "An example of the
simplest-possible resource", path = "/helloWorld")
-@HtmlDocConfig(aside = { "<div style='max-width:400px' class='text'>", "
<p>This page shows a resource that simply response with a 'Hello world!'
message</p>",
- " <p>The POJO serialized is a simple String.</p>", "</div>" })
+@HtmlDocConfig(aside = { "<div style='max-width:400px' class='text'>",
"\t<p>This page shows a resource that simply response with a 'Hello world!'
message</p>",
+ "\t<p>The POJO serialized is a simple String.</p>", "</div>" })
public class HelloWorldResource extends BasicRestObject {
private final String message;
diff --git
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
index eb122c6a45..8faf1d8e75 100644
---
a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
+++
b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
@@ -55,12 +55,12 @@ import org.apache.juneau.serializer.annotation.*;
},
aside={
"<div class='text'>",
- " <p>This is an example of a 'router' page that serves as
a jumping-off point to child resources.</p>",
- " <p>Resources can be nested arbitrarily deep through
router pages.</p>",
- " <p>Note the <span class='link'>options</span> link
provided that lets you see the generated swagger doc for this page.</p>",
- " <p>Also note the <span class='link'>sources</span> link
on these pages to view the source code for the page.</p>",
- " <p>All content on pages in the UI are serialized POJOs.
In this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
- " <p>Other features (such as this aside) are added
through annotations.</p>",
+ "\t<p>This is an example of a 'router' page that serves as a
jumping-off point to child resources.</p>",
+ "\t<p>Resources can be nested arbitrarily deep through router
pages.</p>",
+ "\t<p>Note the <span class='link'>options</span> link provided
that lets you see the generated swagger doc for this page.</p>",
+ "\t<p>Also note the <span class='link'>sources</span> link on
these pages to view the source code for the page.</p>",
+ "\t<p>All content on pages in the UI are serialized POJOs. In
this case, it's a serialized array of beans with 2 properties, 'name' and
'description'.</p>",
+ "\t<p>Other features (such as this aside) are added through
annotations.</p>",
"</div>"
},
asideFloat="RIGHT"
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
index 02998c6a5b..b668592f2d 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/Queryable.java
@@ -88,10 +88,10 @@ public class Queryable implements RestConverter {
in:'query',
name:'s',
description:'Search.
- Key/value pairs representing column names and
search tokens.
- \\'*\\' and \\'?\\' can be used as
meta-characters in string fields.
- \\'>\\', \\'>=\\', \\'<\\', and \\'<=\\' can be
used as limits on numeric and date fields.
- Date fields can be matched with partial dates
(e.g. \\'2018\\' to match any date in the year 2018).',
+\t\t\t\tKey/value pairs representing column names and search tokens.
+\t\t\t\t\\'*\\' and \\'?\\' can be used as meta-characters in string fields.
+\t\t\t\t\\'>\\', \\'>=\\', \\'<\\', and \\'<=\\' can be used as limits on
numeric and date fields.
+\t\t\t\tDate fields can be matched with partial dates (e.g. \\'2018\\' to
match any date in the year 2018).',
type:'array',
collectionFormat:'csv',
examples:{example:'?s=Bill*,birthDate>2000'}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
index 52d054e1d1..bbb2838993 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/MimeTypeDetector_Test.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.io.*;
/**
* Test class for {@link MimeTypeDetector}.
*/
-public class MimeTypeDetector_Test {
+class MimeTypeDetector_Test {
@TempDir
Path tempDir;
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
index 94375df68a..cb507e751f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/FileFinder_Test.java
@@ -30,7 +30,7 @@ import org.apache.juneau.commons.io.*;
import org.apache.juneau.cp.sub.*;
import org.junit.jupiter.api.*;
-@SuppressWarnings({"java:S117","java:S5961"})
+@SuppressWarnings({"java:S117","java:S5961", "java:S5786"}) // S5786: Must be
public for cross-package subclass FileFinder_Test2
public class FileFinder_Test extends TestBase {
private static String read(FileFinder ff, String path) throws Exception
{
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
index dd4e02554c..e8588c0da8 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/mstat/MethodExecStore_Test.java
@@ -105,9 +105,9 @@ class MethodExecStore_Test extends TestBase {
}
}
- @Test public void a06_builder_statsImplClass() throws Exception {
+ @Test void a06_builder_statsImplClass() throws Exception {
var bs = BasicBeanStore.create().build();
- var m =
MethodExecStore_Test.class.getMethod("a06_builder_statsImplClass");
+ var m =
MethodExecStore_Test.class.getDeclaredMethod("a06_builder_statsImplClass");
assertThrowsWithMessage(Exception.class, "Public constructor
found but could not find prerequisites: A6a",
()->MethodExecStore.create(bs).statsImplClass(A6b.class).build().getStats(m));
assertInstanceOf(A6c.class,
MethodExecStore.create(bs).statsImplClass(A6c.class).build().getStats(m));
@@ -117,8 +117,8 @@ class MethodExecStore_Test extends TestBase {
assertInstanceOf(A6c.class,
MethodExecStore.create(bs).statsImplClass(A6c.class).build().getStats(m));
}
- @Test public void a07_builder_thrownStore() throws Exception {
- var m =
MethodExecStore_Test.class.getMethod("a07_builder_thrownStore");
+ @Test void a07_builder_thrownStore() throws Exception {
+ var m =
MethodExecStore_Test.class.getDeclaredMethod("a07_builder_thrownStore");
var s = ThrownStore.create().build();
var store = MethodExecStore.create().thrownStore(s).build();
@@ -136,8 +136,8 @@ class MethodExecStore_Test extends TestBase {
// Store tests.
//------------------------------------------------------------------------------------------------------------------
- @Test public void b01_store_getStats() throws Exception {
- var m =
MethodExecStore_Test.class.getMethod("b01_store_getStats");
+ @Test void b01_store_getStats() throws Exception {
+ var m =
MethodExecStore_Test.class.getDeclaredMethod("b01_store_getStats");
var s = ThrownStore.create().build();
var store = MethodExecStore.create().thrownStore(s).build();
@@ -152,8 +152,8 @@ class MethodExecStore_Test extends TestBase {
// MethodExecStats tests.
//------------------------------------------------------------------------------------------------------------------
- @Test public void c01_stats_basic() throws Exception {
- var m = MethodExecStore_Test.class.getMethod("c01_stats_basic");
+ @Test void c01_stats_basic() throws Exception {
+ var m =
MethodExecStore_Test.class.getDeclaredMethod("c01_stats_basic");
var s = ThrownStore.create().build();
var store = MethodExecStore.create().thrownStore(s).build();
diff --git a/scripts/prompt-pgp-passphrase.py b/scripts/prompt-pgp-passphrase.py
index 87e241d7d8..de2402cc5f 100755
--- a/scripts/prompt-pgp-passphrase.py
+++ b/scripts/prompt-pgp-passphrase.py
@@ -49,7 +49,7 @@ def prompt_pgp_passphrase():
# Attempt to sign the dummy file (this will prompt for passphrase)
# Don't use --batch so it will prompt interactively for passphrase
# Use --yes to auto-confirm overwrite prompts, but allow
passphrase prompt
- result = subprocess.run(
+ subprocess.run(
["gpg", "--yes", "--clearsign", tmp_path],
capture_output=False, # Don't capture output so user can see
the prompt
text=True,
diff --git a/scripts/push.py b/scripts/push.py
index 7ce24642a4..8d2acc673b 100755
--- a/scripts/push.py
+++ b/scripts/push.py
@@ -61,7 +61,7 @@ def run_command(cmd, description, cwd=None):
print(f"Running: {' '.join(cmd) if isinstance(cmd, list) else cmd}")
try:
- result = subprocess.run(
+ subprocess.run(
cmd,
cwd=cwd,
shell=isinstance(cmd, str),
diff --git a/scripts/revert-staged.py b/scripts/revert-staged.py
index 23692f3004..0c9886f444 100755
--- a/scripts/revert-staged.py
+++ b/scripts/revert-staged.py
@@ -57,7 +57,7 @@ def main():
print()
try:
- result = subprocess.run(
+ subprocess.run(
["git", "restore", "--source=HEAD", file_path],
check=True,
capture_output=True,
diff --git a/scripts/revert-unstaged.py b/scripts/revert-unstaged.py
index 3bf6a26a5f..2df940e0f7 100755
--- a/scripts/revert-unstaged.py
+++ b/scripts/revert-unstaged.py
@@ -50,7 +50,7 @@ def main():
print()
try:
- result = subprocess.run(
+ subprocess.run(
["git", "restore", "--source=INDEX", file_path],
check=True,
capture_output=True,
