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 8dd5d8a9f8 SonarQube bug fixes
8dd5d8a9f8 is described below
commit 8dd5d8a9f8bf5b720e5ef6b34bcdafa5e3d3052e
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 18 13:14:11 2026 -0500
SonarQube bug fixes
---
.../src/main/java/org/apache/juneau/BeanMeta.java | 12 ++++--------
.../java/org/apache/juneau/bean/openapi3/License_Test.java | 2 +-
.../org/apache/juneau/commons/io/PathReaderBuilder_Test.java | 12 ++++++++++--
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index 11cec3d986..2487873876 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -1090,17 +1090,13 @@ public class BeanMeta<T> {
classHierarchy.get().stream().forEach(c2 -> {
for (var m : c2.getDeclaredMethods()) {
var mm = m.getMatchingMethods();
+ var beanps = ap.find(Beanp.class,
m).stream().map(AnnotationInfo::inner).toList();
+ var names = ap.find(Name.class,
m).stream().map(AnnotationInfo::inner).toList();
// Skip static, bridge, or methods with >2
params; skip if ignored, transient, or not visible
if (m.isStatic() || m.isBridge() ||
m.getParameterCount() > 2
|| mm.stream().anyMatch(m2 ->
ap.has(BeanIgnore.class, m2, SELF))
- || mm.stream().anyMatch(m2 ->
ap.find(Transient.class, m2, SELF).stream().map(x ->
x.inner().value()).findFirst().orElse(false))) {
- continue;
- }
-
- var beanps = ap.find(Beanp.class,
m).stream().map(AnnotationInfo::inner).toList();
- var names = ap.find(Name.class,
m).stream().map(AnnotationInfo::inner).toList();
-
- if (! (m.isVisible(v) || ne(beanps) ||
ne(names)))
+ || mm.stream().anyMatch(m2 ->
ap.find(Transient.class, m2, SELF).stream().map(x ->
x.inner().value()).findFirst().orElse(false))
+ || ! (m.isVisible(v) || ne(beanps) ||
ne(names)))
continue;
var n = m.getNameSimple();
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/bean/openapi3/License_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/bean/openapi3/License_Test.java
index 9691755eb5..6457fafc8d 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/bean/openapi3/License_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/bean/openapi3/License_Test.java
@@ -208,7 +208,7 @@ class License_Test extends TestBase {
@Test void c10_nullPropertyValue() {
var license = bean();
assertThrows(IllegalArgumentException.class,
()->license.get(null));
- assertThrows(IllegalArgumentException.class,
()->bean().get(null, String.class));
+ assertThrows(IllegalArgumentException.class,
()->license.get(null, String.class));
assertThrows(IllegalArgumentException.class,
()->license.set(null, "a"));
}
}
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
index f0e50acf6d..1a0f9c1659 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/io/PathReaderBuilder_Test.java
@@ -48,8 +48,16 @@ class PathReaderBuilder_Test extends TestBase {
}
@Test void a02_allowNoFileException() {
- assertThrows(IllegalStateException.class, () ->
PathReaderBuilder.create().build());
- assertThrows(NoSuchFileException.class, () ->
PathReaderBuilder.create().path("this file does not exist, at all.").build());
+ assertThrows(IllegalStateException.class,
this::buildReaderWithoutPath);
+ assertThrows(NoSuchFileException.class,
this::buildReaderForNonExistentPath);
+ }
+
+ private Reader buildReaderWithoutPath() throws IOException {
+ return PathReaderBuilder.create().build();
+ }
+
+ private Reader buildReaderForNonExistentPath() throws IOException {
+ return PathReaderBuilder.create().path("this file does not
exist, at all.").build();
}
@Test void a03_charsetCharset() throws IOException {
