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 2c3d3288e3 SonarQube bug fixes
2c3d3288e3 is described below
commit 2c3d3288e3c1ae949b01edcd07c0a0db88969cd8
Author: James Bognar <[email protected]>
AuthorDate: Wed Feb 18 13:22:38 2026 -0500
SonarQube bug fixes
---
.../java/org/apache/juneau/assertions/FluentArrayAssertion.java | 2 +-
.../main/java/org/apache/juneau/assertions/FluentBeanAssertion.java | 2 +-
.../org/apache/juneau/assertions/FluentCollectionAssertion.java | 2 +-
.../org/apache/juneau/assertions/FluentComparableAssertion.java | 2 +-
.../main/java/org/apache/juneau/assertions/FluentListAssertion.java | 2 +-
.../main/java/org/apache/juneau/assertions/FluentMapAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/FluentObjectAssertion.java | 2 +-
.../org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/FluentStringAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/FluentThrowableAssertion.java | 2 +-
.../src/main/java/org/apache/juneau/commons/lang/Value.java | 2 +-
.../java/org/apache/juneau/commons/settings/FunctionalSource.java | 2 +-
.../java/org/apache/juneau/commons/settings/FunctionalStore.java | 6 +++---
.../main/java/org/apache/juneau/commons/settings/StringSetting.java | 2 +-
.../src/main/java/org/apache/juneau/commons/utils/StringUtils.java | 2 +-
.../src/main/java/org/apache/juneau/config/mod/Mod.java | 6 +++---
16 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index 8b6ec72a47..5a40ee7a15 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -265,7 +265,7 @@ public class FluentArrayAssertion<E,R> extends
FluentObjectAssertion<E[],R> {
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentArrayAssertion<E,R> asTransformed(Function<E[],E[]>
function) {
+ public FluentArrayAssertion<E,R> asTransformed(UnaryOperator<E[]>
function) {
return new FluentArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
index e722f3fa39..3fb22b1996 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentBeanAssertion.java
@@ -164,7 +164,7 @@ public class FluentBeanAssertion<T,R> extends
FluentObjectAssertion<T,R> {
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentBeanAssertion<T,R> asTransformed(Function<T,T> function) {
+ public FluentBeanAssertion<T,R> asTransformed(UnaryOperator<T>
function) {
return new FluentBeanAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index 9739cfb385..e24c043946 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -173,7 +173,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentCollectionAssertion<E,R>
asTransformed(Function<Collection<E>,Collection<E>> function) {
+ public FluentCollectionAssertion<E,R>
asTransformed(UnaryOperator<Collection<E>> function) {
return new FluentCollectionAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
index 9fb35f331f..03fea29d49 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentComparableAssertion.java
@@ -146,7 +146,7 @@ public class FluentComparableAssertion<T extends
Comparable,R> extends FluentObj
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentComparableAssertion<T,R> asTransformed(Function<T,T>
function) {
+ public FluentComparableAssertion<T,R> asTransformed(UnaryOperator<T>
function) {
return new FluentComparableAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
index 79ae46aa6e..f9c447c2d8 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentListAssertion.java
@@ -170,7 +170,7 @@ public class FluentListAssertion<E,R> extends
FluentCollectionAssertion<E,R> {
* @param function The transform to apply.
* @return A new assertion.
*/
- public FluentListAssertion<E,R> asApplied2(Function<List<E>,List<E>>
function) {
+ public FluentListAssertion<E,R> asApplied2(UnaryOperator<List<E>>
function) {
return new FluentListAssertion<>(this,
function.apply((List<E>)orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 75c9a49b57..2ef254ad7c 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -167,7 +167,7 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentMapAssertion<K,V,R>
asTransformed(Function<Map<K,V>,Map<K,V>> function) {
+ public FluentMapAssertion<K,V,R> asTransformed(UnaryOperator<Map<K,V>>
function) {
return new FluentMapAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
index 7a904d0b4d..cd22289419 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentObjectAssertion.java
@@ -261,7 +261,7 @@ public class FluentObjectAssertion<T,R> extends
FluentAssertion<R> {
* @param function The function to apply.
* @return This object.
*/
- public FluentObjectAssertion<T,R> asTransformed(Function<T,T> function)
{
+ public FluentObjectAssertion<T,R> asTransformed(UnaryOperator<T>
function) {
return new FluentObjectAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 626cfde528..feabddd546 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -213,7 +213,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentPrimitiveArrayAssertion<E,T,R> asTransformed(Function<T,T>
function) {
+ public FluentPrimitiveArrayAssertion<E,T,R>
asTransformed(UnaryOperator<T> function) {
return new FluentPrimitiveArrayAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index b63b3bdd85..dda4c03f54 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -287,7 +287,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentStringAssertion<R> asTransformed(Function<String,String>
function) {
+ public FluentStringAssertion<R> asTransformed(UnaryOperator<String>
function) {
return new FluentStringAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
index ef7e289b2c..275684152b 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentThrowableAssertion.java
@@ -338,7 +338,7 @@ public class FluentThrowableAssertion<T extends
Throwable,R> extends FluentObjec
}
@Override /* Overridden from FluentObjectAssertion */
- public FluentThrowableAssertion<T,R> asTransformed(Function<T,T>
function) {
+ public FluentThrowableAssertion<T,R> asTransformed(UnaryOperator<T>
function) {
return new FluentThrowableAssertion<>(this,
function.apply(orElse(null)), returns());
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
index 21480ccd67..320a2a264d 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Value.java
@@ -576,7 +576,7 @@ public class Value<T> {
* @param updater The function to apply to the current value. Must not
be <jk>null</jk>.
* @return This object.
*/
- public Value<T> update(Function<T,T> updater) {
+ public Value<T> update(UnaryOperator<T> updater) {
if (nn(t))
set(updater.apply(t));
return this;
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalSource.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalSource.java
index e927a21b42..90f26d1cd9 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalSource.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalSource.java
@@ -98,7 +98,7 @@ public interface FunctionalSource extends SettingSource {
* @param function The function to delegate property lookups to. Must
not be <c>null</c>.
* @return A new functional source instance.
*/
- static FunctionalSource of(Function<String, String> function) {
+ static FunctionalSource of(UnaryOperator<String> function) {
return name -> {
var v = function.apply(name);
return v == null ? null : opt(v);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalStore.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalStore.java
index 9e8253f184..676d2651c0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalStore.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/FunctionalStore.java
@@ -69,7 +69,7 @@ public class FunctionalStore implements SettingStore {
private static final String ARG_unsetter = "unsetter";
private static final String ARG_clearer = "clearer";
- private final Function<String, String> reader;
+ private final UnaryOperator<String> reader;
private final BiConsumer<String, String> writer;
private final Consumer<String> unsetter;
private final Snippet clearer;
@@ -83,7 +83,7 @@ public class FunctionalStore implements SettingStore {
* @param clearer The snippet to clear all property values. Must not be
<c>null</c>.
*/
public FunctionalStore(
- Function<String, String> reader,
+ UnaryOperator<String> reader,
BiConsumer<String, String> writer,
Consumer<String> unsetter,
Snippet clearer
@@ -170,7 +170,7 @@ public class FunctionalStore implements SettingStore {
* @return A new writable functional store instance.
*/
public static FunctionalStore of(
- Function<String, String> reader,
+ UnaryOperator<String> reader,
BiConsumer<String, String> writer,
Consumer<String> unsetter,
Snippet clearer
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/StringSetting.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/StringSetting.java
index 38e84f6d96..4af023665a 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/StringSetting.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/StringSetting.java
@@ -66,7 +66,7 @@ public class StringSetting extends Setting<String> {
* @param mapper A mapping function to apply to the value, if present.
Must not be <jk>null</jk>.
* @return A StringSetting describing the result of applying a mapping
function to the value of this StringSetting, if a value is present, otherwise
an empty StringSetting.
*/
- public StringSetting mapString(Function<String, String> mapper) {
+ public StringSetting mapString(UnaryOperator<String> mapper) {
assertArgNotNull(ARG_mapper, mapper);
return new StringSetting(getSettings(), () -> {
String value = get();
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
index 26f1ff1a66..baa91e07f0 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/StringUtils.java
@@ -4328,7 +4328,7 @@ public class StringUtils {
* @param mapper The function to apply to each element. Can be
<jk>null</jk>.
* @return A new array with the mapped elements, or an empty array if
the array was <jk>null</jk>.
*/
- public static String[] mapped(String[] array, Function<String,String>
mapper) {
+ public static String[] mapped(String[] array, UnaryOperator<String>
mapper) {
if (array == null)
return new String[0];
if (mapper == null)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/Mod.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/Mod.java
index 657f36ba25..c737b761e6 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/Mod.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/mod/Mod.java
@@ -26,8 +26,8 @@ public class Mod {
/** A no-op modifier. */
public static final Mod NO_OP = new Mod(' ', x -> x, x -> x, x -> true);
private final char id;
- private final Function<String,String> removeFunction;
- private final Function<String,String> applyFunction;
+ private final UnaryOperator<String> removeFunction;
+ private final UnaryOperator<String> applyFunction;
private final Function<String,Boolean> detectFunction;
/**
@@ -44,7 +44,7 @@ public class Mod {
* The function to apply to detect whether the modification has
been made.
* Can be <jk>null</jk> if you override the {@link
#isApplied(String)} method.
*/
- public Mod(char id, Function<String,String> applyFunction,
Function<String,String> removeFunction, Function<String,Boolean>
detectFunction) {
+ public Mod(char id, UnaryOperator<String> applyFunction,
UnaryOperator<String> removeFunction, Function<String,Boolean> detectFunction) {
this.id = id;
this.applyFunction = applyFunction;
this.removeFunction = removeFunction;
