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 de83d84c0a SonarQube bug fixes
de83d84c0a is described below
commit de83d84c0a4931cae23f4b4686c84964c143d834
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 20:34:02 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/bean/jsonschema/JsonSchemaProperty.java | 11 -----------
.../org/apache/juneau/bean/jsonschema/JsonSchemaRef.java | 11 -----------
.../org/apache/juneau/commons/inject/BasicBeanStore2.java | 12 ++++--------
.../java/org/apache/juneau/commons/reflect/MethodInfo.java | 5 ++---
.../src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/BeanTraverseSession.java | 4 ++--
.../src/main/java/org/apache/juneau/csv/CsvParser.java | 5 -----
.../src/main/java/org/apache/juneau/csv/CsvSerializer.java | 5 -----
.../src/main/java/org/apache/juneau/encoders/EncoderSet.java | 4 ++--
.../src/main/java/org/apache/juneau/html/HtmlParser.java | 5 -----
.../org/apache/juneau/html/HtmlStrippedDocSerializer.java | 5 -----
.../main/java/org/apache/juneau/httppart/HttpPartSchema.java | 8 ++++----
.../main/java/org/apache/juneau/msgpack/MsgPackParser.java | 5 -----
.../src/main/java/org/apache/juneau/parser/Parser.java | 2 +-
.../src/main/java/org/apache/juneau/parser/ParserSet.java | 4 ++--
.../java/org/apache/juneau/plaintext/PlainTextParser.java | 5 -----
.../org/apache/juneau/plaintext/PlainTextSerializer.java | 5 -----
.../main/java/org/apache/juneau/serializer/Serializer.java | 2 +-
.../java/org/apache/juneau/serializer/SerializerSet.java | 4 ++--
.../main/java/org/apache/juneau/uon/UonParserSession.java | 2 +-
.../java/org/apache/juneau/xml/XmlSerializerSession.java | 4 +---
21 files changed, 23 insertions(+), 87 deletions(-)
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
index b3c603af71..96487b3b22 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaProperty.java
@@ -162,17 +162,6 @@ public class JsonSchemaProperty extends JsonSchema {
return this;
}
- @Override /* Overridden from JsonSchema */
- public JsonSchema getNot() { return super.getNot(); }
-
- @Override /* Overridden from JsonSchema */
- public JsonSchema getUnevaluatedItems() { return
super.getUnevaluatedItems(); }
-
- @Override /* Overridden from JsonSchema */
- public JsonSchema resolve() {
- return super.resolve();
- }
-
@Override /* Overridden from JsonSchema */
public JsonSchemaProperty setAllOf(List<JsonSchema> value) {
super.setAllOf(value);
diff --git
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
index f32e019c69..71d9d6c7f5 100644
---
a/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
+++
b/juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaRef.java
@@ -163,17 +163,6 @@ public class JsonSchemaRef extends JsonSchema {
return this;
}
- @Override /* Overridden from JsonSchema */
- public JsonSchema getNot() { return super.getNot(); }
-
- @Override /* Overridden from JsonSchema */
- public JsonSchema getUnevaluatedItems() { return
super.getUnevaluatedItems(); }
-
- @Override /* Overridden from JsonSchema */
- public JsonSchema resolve() {
- return super.resolve();
- }
-
@Override /* Overridden from JsonSchema */
public JsonSchemaRef setAllOf(List<JsonSchema> value) {
super.setAllOf(value);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore2.java
index ee361684b2..ea47f0260b 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BasicBeanStore2.java
@@ -316,14 +316,10 @@ public class BasicBeanStore2 implements WritableBeanStore
{
protected FluentMap<String,Object> properties() {
// @formatter:off
var entryList = list();
- entries.forEach((type, typeMap) -> {
- typeMap.forEach((name, supplier) -> {
- entryList.add(filteredBeanPropertyMap()
- .a("type", cns(type))
- .a("bean", id(supplier.get()))
- .a("name", name));
- });
- });
+ entries.forEach((type, typeMap) -> typeMap.forEach((name,
supplier) -> entryList.add(filteredBeanPropertyMap()
+ .a("type", cns(type))
+ .a("bean", id(supplier.get()))
+ .a("name", name))));
return filteredBeanPropertyMap()
.a("entries", entryList)
.a("identity", id(this))
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
index a7d7c765f3..5adb04d94d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/MethodInfo.java
@@ -28,6 +28,7 @@ import java.util.*;
import java.util.function.*;
import java.util.stream.*;
+import org.apache.juneau.commons.function.ThrowingSupplier;
import org.apache.juneau.commons.inject.*;
import org.apache.juneau.commons.utils.*;
@@ -654,9 +655,7 @@ public class MethodInfo extends ExecutableInfo implements
Comparable<MethodInfo>
* @throws ExecutableException Exception occurred on invoked
constructor/method/field.
*/
public Object invokeLenient(Object pojo, Object...args) throws
ExecutableException {
- return safe(() -> {
- return inner.invoke(pojo,
ClassUtils.getMatchingArgs(inner.getParameterTypes(), args));
- }, e -> exex(e instanceof InvocationTargetException ?
((InvocationTargetException)e).getTargetException() : e));
+ return safe((ThrowingSupplier<Object>)() -> inner.invoke(pojo,
ClassUtils.getMatchingArgs(inner.getParameterTypes(), args)), e -> exex(e
instanceof InvocationTargetException ?
((InvocationTargetException)e).getTargetException() : e));
}
@Override
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index de7f6abf0f..326019fc69 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -239,7 +239,7 @@ public class BeanSession extends ContextSession {
*
* @return The name property name. Never <jk>null</jk>.
*/
- public final static String getNamePropertyName() { return "_name"; }
+ public static final String getNamePropertyName() { return "_name"; }
private static int getMultiplier(String s) {
if (s.endsWith("G"))
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
index 3ac19e05a9..9249ce1d02 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanTraverseSession.java
@@ -52,7 +52,7 @@ public class BeanTraverseSession extends BeanSession {
/**
* Builder class.
*/
- public static abstract class Builder extends BeanSession.Builder {
+ public abstract static class Builder extends BeanSession.Builder {
private BeanTraverseContext ctx;
private int initialDepth;
@@ -291,7 +291,7 @@ public class BeanTraverseSession extends BeanSession {
* @param cm The meta to check.
* @return <jk>true</jk> if the specified meta is an {@link Optional}.
*/
- protected final static boolean isOptional(ClassMeta<?> cm) {
+ protected static final boolean isOptional(ClassMeta<?> cm) {
return (nn(cm) && cm.isOptional());
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
index f0ae3df43f..92f31eb034 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -359,11 +359,6 @@ public class CsvParser extends ReaderParser implements
CsvMetaProvider {
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
index 0aeef30ccb..125f01baa3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializer.java
@@ -386,11 +386,6 @@ public class CsvSerializer extends WriterSerializer
implements CsvMetaProvider {
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index ef6af3ec8a..536723f39f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -252,14 +252,14 @@ public class EncoderSet {
* <p>
* Used by {@link Builder#set(Class...)}
*/
- public static abstract class Inherit extends Encoder {}
+ public abstract static class Inherit extends Encoder {}
/**
* An identifier that the previous encoders in this group should not be
inherited.
* <p>
* Used by {@link Builder#add(Class...)}
*/
- public static abstract class NoInherit extends Encoder {}
+ public abstract static class NoInherit extends Encoder {}
/**
* Static creator.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
index de0feaaf05..2764b5bb19 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -381,11 +381,6 @@ public class HtmlParser extends XmlParser implements
HtmlMetaProvider {
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
index 8511e6c0cc..0356445376 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlStrippedDocSerializer.java
@@ -493,11 +493,6 @@ public class HtmlStrippedDocSerializer extends
HtmlSerializer {
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
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 baba9797b3..1b8f744556 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
@@ -3537,7 +3537,7 @@ public class HttpPartSchema {
return in == null ? emptySet() : u(copyOf(in));
}
- final static JsonMap toJsonMap(String[] ss) {
+ static final JsonMap toJsonMap(String[] ss) {
String s = StringUtils.joinnl(ss);
if (s.isEmpty())
return null;
@@ -3550,7 +3550,7 @@ public class HttpPartSchema {
}
}
- final static Number toNumber(String...s) {
+ static final Number toNumber(String...s) {
try {
for (var ss : s)
if (ne(ss))
@@ -3561,7 +3561,7 @@ public class HttpPartSchema {
}
}
- final static Set<String> toSet(String s) {
+ static final Set<String> toSet(String s) {
if (isEmpty(s))
return null;
Set<String> set = set();
@@ -3573,7 +3573,7 @@ public class HttpPartSchema {
return set;
}
- final static Set<String> toSet(String[]...s) {
+ static final Set<String> toSet(String[]...s) {
var isNotEmpty = false;
for (var ss : s)
isNotEmpty |= ss.length > 0;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
index 592a837150..04e20a044a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/MsgPackParser.java
@@ -381,11 +381,6 @@ public class MsgPackParser extends InputStreamParser
implements MsgPackMetaProvi
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
index c73f6ba2b2..ecbec4e811 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/Parser.java
@@ -960,7 +960,7 @@ public class Parser extends BeanContextable {
/**
* Represents no Parser.
*/
- public static abstract class Null extends Parser {
+ public abstract static class Null extends Parser {
private Null(Builder builder) {
super(builder);
}
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 b7b42d3935..25501f27b1 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
@@ -422,7 +422,7 @@ public class ParserSet {
* <p>
* Used by {@link ParserSet.Builder#set(Class...)}
*/
- public static abstract class Inherit extends Parser {
+ public abstract static class Inherit extends Parser {
protected Inherit(Parser.Builder builder) {
super(builder);
}
@@ -433,7 +433,7 @@ public class ParserSet {
* <p>
* Used by {@link ParserSet.Builder#add(Class...)}
*/
- public static abstract class NoInherit extends Parser {
+ public abstract static class NoInherit extends Parser {
protected NoInherit(Parser.Builder builder) {
super(builder);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
index 48e911d2fd..63d618d0ac 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextParser.java
@@ -378,11 +378,6 @@ public class PlainTextParser extends ReaderParser
implements PlainTextMetaProvid
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
index e25c60079d..6a9a8af72f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/plaintext/PlainTextSerializer.java
@@ -394,11 +394,6 @@ public class PlainTextSerializer extends WriterSerializer
implements PlainTextMe
return this;
}
- @Override /* Overridden from Context.Builder */
- public HashKey hashKey() {
- return super.hashKey();
- }
-
@Override /* Overridden from Builder */
public Builder ignoreInvocationExceptionsOnGetters() {
super.ignoreInvocationExceptionsOnGetters();
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
index 0cdad42b3f..00924108d9 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -1247,7 +1247,7 @@ public class Serializer extends BeanTraverseContext {
/**
* Represents no Serializer.
*/
- public static abstract class Null extends Serializer {
+ public abstract static class Null extends Serializer {
private Null(Builder builder) {
super(builder);
}
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 6327166a43..da82058e25 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
@@ -419,7 +419,7 @@ public class SerializerSet {
* Used by {@link SerializerSet.Builder#set(Class...)}
*/
@SuppressWarnings("javadoc")
- public static abstract class Inherit extends Serializer {
+ public abstract static class Inherit extends Serializer {
public Inherit(Serializer.Builder builder) {
super(builder);
}
@@ -431,7 +431,7 @@ public class SerializerSet {
* Used by {@link SerializerSet.Builder#add(Class...)}
*/
@SuppressWarnings("javadoc")
- public static abstract class NoInherit extends Serializer {
+ public abstract static class NoInherit extends Serializer {
public NoInherit(Serializer.Builder builder) {
super(builder);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
index 83b5b9b4a0..f194585da0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/UonParserSession.java
@@ -247,7 +247,7 @@ public class UonParserSession extends ReaderParserSession
implements HttpPartPar
* @return A new {@link UonReader} object.
* @throws IOException Thrown by underlying stream.
*/
- public final static UonReader getUonReader(ParserPipe pipe, boolean
decodeChars) throws IOException {
+ public static final UonReader getUonReader(ParserPipe pipe, boolean
decodeChars) throws IOException {
var r = pipe.getReader();
if (r instanceof UonReader r2)
return r2;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index cab5f3415d..e2fee9639c 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -365,9 +365,7 @@ public class XmlSerializerSession extends
WriterSerializerSession {
var lp = new ArrayList<BeanPropertyValue>();
var checkNull = (Predicate<Object>)(x -> isKeepNullProperties()
|| nn(x));
- m.forEachValue(checkNull, (pMeta, key, value, thrown) -> {
- lp.add(new BeanPropertyValue(pMeta, key, value,
thrown));
- });
+ m.forEachValue(checkNull, (pMeta, key, value, thrown) ->
lp.add(new BeanPropertyValue(pMeta, key, value, thrown)));
var xbm = getXmlBeanMeta(bm);
