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 228b345cc2 SonarQube bug fixes
228b345cc2 is described below
commit 228b345cc20769d3450044a856e4fff8ac719e01
Author: James Bognar <[email protected]>
AuthorDate: Mon Feb 9 11:34:20 2026 -0500
SonarQube bug fixes
---
TODO.md | 1 +
.../src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java | 2 +-
.../src/main/java/org/apache/juneau/annotation/Schema.java | 2 +-
.../main/java/org/apache/juneau/annotation/SchemaAnnotation.java | 4 ++--
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../main/java/org/apache/juneau/rest/httppart/RequestHeaders.java | 6 ++++--
.../java/org/apache/juneau/rest/httppart/RequestPathParams.java | 6 ++++--
.../java/org/apache/juneau/rest/httppart/RequestQueryParams.java | 6 ++++--
.../java/org/apache/juneau/httppart/HttpPartSchema_Body_Test.java | 2 +-
.../java/org/apache/juneau/jsonschema/JsonSchemaGeneratorTest.java | 4 ++--
.../apache/juneau/jsonschema/annotation/SchemaAnnotation_Test.java | 4 ++--
11 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/TODO.md b/TODO.md
index 0e674cb1e3..8396ee155c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,3 +3,4 @@
- Find all places where we have system properties defined for juneau and
convert them to use the new Settings class.
- Document "juneau.enableVerboseExceptions" setting.
- Change field names that start with underscore so that they end with
underscore (e.g. "_enum"->"enum_")
+- Investigate navlinks URL generation issue: Either
"request:?Accept=text/json&plainText=true" should be supported, or
"request:/?Accept=text/json&plainText=true" should not append '/' to the
request URL. Currently, "request:/?Accept=..." generates URLs like
"http://localhost:5000/rest/db/request:?Accept=..."; which is incorrect.
\ No newline at end of file
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
index 8ee502aff1..1e04793786 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ClassInfo.java
@@ -258,7 +258,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
this.declaredMethods = mem(() -> opt(inner).map(x ->
stream(x.getDeclaredMethods()).filter(m -> neq("$jacocoInit",
m.getName())).map(this::getMethod).sorted().toList()).orElse(liste()));
this.allMethods = mem(() ->
allParents.get().stream().flatMap(c2 ->
c2.getDeclaredMethods().stream()).toList());
this.allMethodsTopDown = mem(() ->
rstream(getAllParents()).flatMap(c2 ->
c2.getDeclaredMethods().stream()).toList());
- this.publicFields = mem(() -> parents.get().stream().flatMap(c2
-> c2.getDeclaredFields().stream()).filter(f -> f.isPublic() &&
neq("$jacocoData", f.getName())).collect(toMap(FieldInfo::getName, x -> x, (a,
b) -> a, LinkedHashMap::new)).values().stream().sorted().collect(toList()));
+ this.publicFields = mem(() -> parents.get().stream().flatMap(c2
-> c2.getDeclaredFields().stream()).filter(f -> f.isPublic() &&
neq("$jacocoData", f.getName())).collect(toMap(FieldInfo::getName, x -> x, (a,
b) -> a, LinkedHashMap::new)).values().stream().sorted().toList());
this.declaredFields = mem(() -> opt(inner).map(x ->
stream(x.getDeclaredFields()).filter(f -> neq("$jacocoData",
f.getName())).map(this::getField).sorted().toList()).orElse(liste()));
this.allFields = mem(() -> rstream(allParents.get()).flatMap(c2
-> c2.getDeclaredFields().stream()).toList());
this.publicConstructors = mem(() -> opt(inner).map(x ->
stream(x.getConstructors()).map(this::getConstructor).sorted().toList()).orElse(liste()));
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
index 810f905a28..496144bbb9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/Schema.java
@@ -654,7 +654,7 @@ public @interface Schema {
*
* @return The annotation value.
*/
- boolean deprecatedProperty() default false;
+ boolean deprecated_() default false;
/**
* <mk>description</mk> field of the <a class="doclink"
href="https://swagger.io/specification/v2#schemaObject";>Swagger Schema
Object</a>.
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 6cacd4168f..20051579fa 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
@@ -1383,7 +1383,7 @@ public class SchemaAnnotation {
}
@Override /* Overridden from Schema */
- public boolean deprecatedProperty() {
+ public boolean deprecated_() {
return deprecatedProperty;
}
@@ -1731,7 +1731,7 @@ public class SchemaAnnotation {
.appendIf(ne, PROP_const, joinnl(a.const_()))
.appendIf(nec, PROP_examples, a.examples().length == 0
? null : l(a.examples()))
.appendIf(ne, PROP_comment, joinnl(a.$comment()))
- .appendIf(nf, PROP_deprecated, a.deprecatedProperty())
+ .appendIf(nf, PROP_deprecated, a.deprecated_())
.appendIf(ne, PROP_contentMediaType,
a.contentMediaType())
.appendIf(ne, PROP_contentEncoding, a.contentEncoding())
.appendIf(ne, PROP_prefixItems, joinnl(a.prefixItems()))
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 85a9892688..583e2dab34 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
@@ -2843,7 +2843,7 @@ public class HttpPartSchema {
// JSON Schema Draft 2020-12 properties
const_(joinnlOrNull(a.const_()));
examples(a.examples());
- deprecated(a.deprecatedProperty());
+ deprecated(a.deprecated_());
return this;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
index 250fa03855..32bfc158ec 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestHeaders.java
@@ -351,9 +351,10 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
*
* @param name The header name.
* @return The list of all headers with matching names. Never
<jk>null</jk>.
+ * <br>List is unmodifiable.
*/
public List<RequestHeader> getAll(String name) {
- return stream(name).collect(toList());
+ return stream(name).toList();
}
/**
@@ -391,8 +392,9 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
/**
* Returns all the unique header names in this list.
* @return The list of all unique header names in this list.
+ * <br>List is unmodifiable.
*/
- public List<String> getNames() { return
stream().map(RequestHeader::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().collect(toList()); }
+ public List<String> getNames() { return
stream().map(RequestHeader::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().toList(); }
/**
* Returns all headers in sorted order.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
index 991f5acb52..fadf2ceb58 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestPathParams.java
@@ -350,10 +350,11 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
*
* @param name The parameter name.
* @return The list of all parameters with the specified name, or an
empty list if none are found.
+ * <br>List is unmodifiable.
*/
public List<RequestPathParam> getAll(String name) {
assertArgNotNull(ARG_name, name);
- return stream(name).collect(toList());
+ return stream(name).toList();
}
/**
@@ -391,8 +392,9 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
/**
* Returns all the unique header names in this list.
* @return The list of all unique header names in this list.
+ * <br>List is unmodifiable.
*/
- public List<String> getNames() { return
stream().map(RequestPathParam::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().collect(toList()); }
+ public List<String> getNames() { return
stream().map(RequestPathParam::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().toList(); }
/**
* Returns the decoded remainder of the URL following any path pattern
matches.
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
index 44fa6cdd4d..ff8918de16 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestQueryParams.java
@@ -385,9 +385,10 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
*
* @param name The parameter name.
* @return The list of all parameters with the specified name, or an
empty list if none are found.
+ * <br>List is unmodifiable.
*/
public List<RequestQueryParam> getAll(String name) {
- return stream(name).collect(toList());
+ return stream(name).toList();
}
/**
@@ -425,8 +426,9 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
/**
* Returns all the unique header names in this list.
* @return The list of all unique header names in this list.
+ * <br>List is unmodifiable.
*/
- public List<String> getNames() { return
stream().map(RequestQueryParam::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().collect(toList()); }
+ public List<String> getNames() { return
stream().map(RequestQueryParam::getName).map(x -> caseSensitive ? x :
x.toLowerCase()).distinct().toList(); }
/**
* Locates the position/limit query arguments ({@code &p=}, {@code
&l=}) in the query string and returns them as a {@link PageArgs} object.
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 dce9218fd9..31afd1f039 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
@@ -929,7 +929,7 @@ class HttpPartSchema_Body_Test extends TestBase {
//-----------------------------------------------------------------------------------------------------------------
@Content
- @Schema(deprecatedProperty=true)
+ @Schema(deprecated_=true)
public static class D04a {}
@Test void d04a_deprecated() {
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..7830abb567 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
@@ -1339,7 +1339,7 @@ class JsonSchemaGeneratorTest extends TestBase {
assertBean(schema, "deprecated", "true");
}
- @Schema(type="string", deprecatedProperty=true)
+ @Schema(type="string", deprecated_=true)
public static class DeprecatedBean {
public String value;
}
@@ -1497,7 +1497,7 @@ class JsonSchemaGeneratorTest extends TestBase {
const_="FIXED",
examples={"ex1", "ex2"},
$comment="A comprehensive example",
- deprecatedProperty=true,
+ deprecated_=true,
exclusiveMaximumValue="100",
exclusiveMinimumValue="0")
public static class CombinedPropertiesBean {
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 a88f9f5a1a..0e7ee86c26 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
@@ -392,7 +392,7 @@ class SchemaAnnotation_Test extends TestBase {
const_="constantValue",
examples={"example1", "example2"},
$comment="This is a schema comment",
- deprecatedProperty=true,
+ deprecated_=true,
exclusiveMaximumValue="100",
exclusiveMinimumValue="0",
contentMediaType="application/json",
@@ -415,7 +415,7 @@ class SchemaAnnotation_Test extends TestBase {
const_="constantValue",
examples={"example1", "example2"},
$comment="This is a schema comment",
- deprecatedProperty=true,
+ deprecated_=true,
exclusiveMaximumValue="100",
exclusiveMinimumValue="0",
contentMediaType="application/json",
