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 1778363627 SonarQube bug fixes
1778363627 is described below
commit 1778363627bf30b84e484f97456ec81c075493c7
Author: James Bognar <[email protected]>
AuthorDate: Tue Feb 3 20:25:55 2026 -0500
SonarQube bug fixes
---
.../apache/juneau/commons/collections/Cache.java | 2 +-
.../apache/juneau/commons/collections/Lists.java | 2 +-
.../apache/juneau/commons/collections/Sets.java | 2 +-
.../commons/function/ResettableSupplier.java | 2 +-
.../juneau/commons/inject/BasicBeanStore2.java | 2 +-
.../apache/juneau/commons/inject/BeanCreator2.java | 4 +-
.../org/apache/juneau/commons/lang/Version.java | 2 +-
.../apache/juneau/commons/reflect/ClassInfo.java | 2 +-
.../juneau/commons/reflect/ExecutableInfo.java | 2 +-
.../apache/juneau/commons/reflect/FieldInfo.java | 2 +-
.../apache/juneau/commons/reflect/PackageInfo.java | 2 +-
.../juneau/commons/reflect/ParameterInfo.java | 2 +-
.../juneau/commons/settings/FunctionalStore.java | 2 +-
.../apache/juneau/commons/settings/Settings.java | 8 +--
.../juneau/commons/settings/StringSetting.java | 4 +-
.../juneau/commons/utils/CollectionUtils.java | 6 +-
.../org/apache/juneau/commons/utils/IoUtils.java | 8 +--
.../apache/juneau/commons/utils/StringUtils.java | 2 +-
.../src/main/java/org/apache/juneau/BeanMeta.java | 18 +++---
.../java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../main/java/org/apache/juneau/UriContext.java | 24 ++++----
.../juneau/annotation/BeanConfigAnnotation.java | 64 ++++++++++----------
.../java/org/apache/juneau/cp/BeanCreator.java | 10 ++--
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../html/annotation/HtmlConfigAnnotation.java | 12 ++--
.../html/annotation/HtmlDocConfigAnnotation.java | 28 ++++-----
.../juneau/http/annotation/HeaderAnnotation.java | 2 +-
.../juneau/http/annotation/PathAnnotation.java | 2 +-
.../juneau/http/annotation/QueryAnnotation.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../json/annotation/JsonConfigAnnotation.java | 8 +--
.../annotation/JsonSchemaConfigAnnotation.java | 22 +++----
.../annotation/MsgPackConfigAnnotation.java | 2 +-
.../oapi/annotation/OpenApiConfigAnnotation.java | 8 +--
.../apache/juneau/objecttools/ObjectViewer.java | 2 +-
.../java/org/apache/juneau/parser/ParserSet.java | 4 +-
.../org/apache/juneau/parser/ReaderParser.java | 2 +-
.../parser/annotation/ParserConfigAnnotation.java | 18 +++---
.../apache/juneau/serializer/SerializerSet.java | 6 +-
.../annotation/SerializerConfigAnnotation.java | 44 +++++++-------
.../soap/annotation/SoapXmlConfigAnnotation.java | 2 +-
.../java/org/apache/juneau/swap/BuilderSwap.java | 2 +-
.../juneau/uon/annotation/UonConfigAnnotation.java | 10 ++--
.../annotation/UrlEncodingConfigAnnotation.java | 4 +-
.../java/org/apache/juneau/xml/XmlClassMeta.java | 4 +-
.../juneau/xml/annotation/XmlConfigAnnotation.java | 22 +++----
.../org/apache/juneau/rest/client/RestRequest.java | 2 +-
.../java/org/apache/juneau/rest/RestContext.java | 68 +++++++++++-----------
.../java/org/apache/juneau/rest/RestOpContext.java | 14 ++---
.../juneau/rest/annotation/RestAnnotation.java | 52 ++++++++---------
.../juneau/rest/annotation/RestPostAnnotation.java | 4 +-
.../org/apache/juneau/rest/arg/FormDataArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/HeaderArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/QueryArg.java | 2 +-
.../apache/juneau/rest/arg/RestOpSessionArgs.java | 2 +-
.../juneau/rest/guard/RoleBasedRestGuard.java | 2 +-
.../juneau/rest/httppart/RequestHeaders.java | 2 +-
.../juneau/rest/httppart/RequestPathParams.java | 2 +-
.../juneau/rest/httppart/RequestQueryParams.java | 2 +-
.../rest/processor/HttpResourceProcessor.java | 2 +-
.../apache/juneau/rest/vars/RequestSwaggerVar.java | 6 +-
.../juneau/commons/collections/MultiList_Test.java | 4 +-
.../juneau/commons/collections/MultiSet_Test.java | 4 +-
.../java/org/apache/juneau/config/Config_Test.java | 8 +--
66 files changed, 284 insertions(+), 284 deletions(-)
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
index 66a6bfecec..fb63943776 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Cache.java
@@ -731,6 +731,6 @@ public class Cache<K,V> {
* @return A cached or new Tuple1 wrapper for the key.
*/
private Tuple1<K> wrap(K key) {
- return getWrapperCache().computeIfAbsent(key, k ->
Tuple1.of(k));
+ return getWrapperCache().computeIfAbsent(key, Tuple1::of);
}
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
index 871294d469..a1e5965a08 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Lists.java
@@ -228,7 +228,7 @@ public class Lists<E> {
for (var o : values) {
if (nn(o)) {
if (o instanceof Collection<?> o2) {
- o2.forEach(x -> addAny(x));
+ o2.forEach(this::addAny);
} else if (isArray(o)) {
for (var i = 0; i <
Array.getLength(o); i++)
addAny(Array.get(o, i));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
index 2fbb7272fc..991630957f 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/collections/Sets.java
@@ -226,7 +226,7 @@ public class Sets<E> {
for (var o : values) {
if (nn(o)) {
if (o instanceof Collection<?> o2) {
- o2.forEach(x -> addAny(x));
+ o2.forEach(this::addAny);
} else if (isArray(o)) {
for (var i = 0; i <
Array.getLength(o); i++)
addAny(Array.get(o, i));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ResettableSupplier.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ResettableSupplier.java
index 1718c89628..3fc3920510 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ResettableSupplier.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/function/ResettableSupplier.java
@@ -177,7 +177,7 @@ public class ResettableSupplier<T> implements
OptionalSupplier<T> {
Optional<T> o = cache.get();
if (o == null)
return new ResettableSupplier<>(supplier);
- return new ResettableSupplier<>(()->o.get());
+ return new ResettableSupplier<>(o::get);
}
/**
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 240ba795b3..ee361684b2 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
@@ -214,7 +214,7 @@ public class BasicBeanStore2 implements WritableBeanStore {
Map<String,T> result = map();
if (nn(parent)) {
var parentBeans = parent.getBeansOfType(beanType);
- parentBeans.forEach((name, bean) -> result.put(name,
bean));
+ parentBeans.forEach(result::put);
}
var typeMap = entries.get(beanType);
if (nn(typeMap)) {
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
index c5d06e7b10..25062b53e9 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/inject/BeanCreator2.java
@@ -433,7 +433,7 @@ public class BeanCreator2<T> {
* @return A resettable supplier that caches the created bean until
reset.
*/
public ResettableSupplier<T> asResettableSupplier() {
- return new ResettableSupplier<>(() -> run());
+ return new ResettableSupplier<>(this::run);
}
/**
@@ -442,7 +442,7 @@ public class BeanCreator2<T> {
* @return A supplier that returns the results of the {@link #run()}
method.
*/
public Supplier<T> asSupplier() {
- return () -> run();
+ return this::run;
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
index 35ece574b2..daf001a1c7 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/lang/Version.java
@@ -93,7 +93,7 @@ public class Version implements Comparable<Version> {
@Override /* Overridden from Object */
public boolean equals(Object o) {
- return o instanceof Version o2 && eq(this, o2, (x, y) ->
x.equals(y));
+ return o instanceof Version o2 && eq(this, o2, Version::equals);
}
/**
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 999831d46e..796c4fb3d7 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
@@ -229,7 +229,7 @@ public class ClassInfo extends ElementInfo implements
Annotatable, Type, Compara
this.isParameterizedType = innerType == null ? false :
(innerType instanceof ParameterizedType);
this.dimensions = mem(this::findDimensions);
this.componentType = mem(this::findComponentType);
- this.packageInfo = mem(() -> opt(inner).map(x ->
x.getPackage()).filter(p -> p != null).map(PackageInfo::of).orElse(null)); //
PackageInfo may be null for primitive types and arrays.
+ this.packageInfo = mem(() ->
opt(inner).map(Class::getPackage).filter(p -> p !=
null).map(PackageInfo::of).orElse(null)); // PackageInfo may be null for
primitive types and arrays.
this.parents = mem(this::findParents);
this.declaredAnnotations = mem(() -> (List)opt(inner).map(x ->
u(l(x.getDeclaredAnnotations()))).orElse(liste()).stream().flatMap(a ->
streamRepeated(a)).map(a -> ai(this, a)).toList());
this.nameFull = mem(() -> getNameFormatted(FULL, true, '$',
BRACKETS));
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
index 92efa6a1ef..d663efe892 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ExecutableInfo.java
@@ -113,7 +113,7 @@ public abstract class ExecutableInfo extends AccessibleInfo
{
this.parameters = mem(this::findParameters);
this.parameterTypes = mem(() ->
getParameters().stream().map(ParameterInfo::getParameterType).toList());
this.exceptions = mem(() ->
stream(inner.getExceptionTypes()).map(ClassInfo::of).map(ClassInfo.class::cast).toList());
- this.declaredAnnotations = mem(() ->
stream(inner.getDeclaredAnnotations()).flatMap(a ->
AnnotationUtils.streamRepeated(a)).map(a -> ai((Annotatable)this, a)).toList());
+ this.declaredAnnotations = mem(() ->
stream(inner.getDeclaredAnnotations()).flatMap(AnnotationUtils::streamRepeated).map(a
-> ai((Annotatable)this, a)).toList());
this.nameShort = mem(() -> f("{0}({1})", getNameSimple(),
getParameters().stream().map(p ->
p.getParameterType().getNameSimple()).collect(joining(","))));
this.nameFull = mem(this::findNameFull);
this.toString = mem(this::findToString);
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
index 048a2a54c0..5876498f29 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/FieldInfo.java
@@ -151,7 +151,7 @@ public class FieldInfo extends AccessibleInfo implements
Comparable<FieldInfo>,
this.declaringClass = declaringClass;
this.inner = inner;
this.type = mem(() -> ClassInfo.of(inner.getType(),
inner.getGenericType()));
- this.annotations = mem(() ->
stream(inner.getAnnotations()).flatMap(a ->
AnnotationUtils.streamRepeated(a)).map(a -> ai(this, a)).toList());
+ this.annotations = mem(() ->
stream(inner.getAnnotations()).flatMap(AnnotationUtils::streamRepeated).map(a
-> ai(this, a)).toList());
this.nameFull = mem(this::findNameFull);
this.toString = mem(this::findToString);
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/PackageInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/PackageInfo.java
index e3a9edbb58..528748fd07 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/PackageInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/PackageInfo.java
@@ -123,7 +123,7 @@ public class PackageInfo implements Annotatable {
assertArgNotNull("inner", inner);
this.inner = inner;
this.annotations = mem(
- () -> opt(inner).map(pkg ->
stream(pkg.getAnnotations()).flatMap(a ->
AnnotationUtils.streamRepeated(a)).map(a -> AnnotationInfo.of(this,
a)).toList()).orElse(liste()));
+ () -> opt(inner).map(pkg ->
stream(pkg.getAnnotations()).flatMap(AnnotationUtils::streamRepeated).map(a ->
AnnotationInfo.of(this, a)).toList()).orElse(liste()));
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
index dae538a0ac..f05fb934a9 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/reflect/ParameterInfo.java
@@ -179,7 +179,7 @@ public class ParameterInfo extends ElementInfo implements
Annotatable {
this.inner = inner;
this.index = index;
this.type = type;
- this.annotations = mem(() ->
stream(inner.getAnnotations()).flatMap(a ->
AnnotationUtils.streamRepeated(a)).map(a -> ai(this, a)).toList());
+ this.annotations = mem(() ->
stream(inner.getAnnotations()).flatMap(AnnotationUtils::streamRepeated).map(a
-> ai(this, a)).toList());
this.matchingParameters = mem(this::findMatchingParameters);
this.toString = mem(this::findToString);
}
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 045f82e36c..6c38c283d9 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
@@ -136,7 +136,7 @@ public class FunctionalStore implements SettingStore {
*/
@Override
public void clear() {
- safe(()->clearer.run());
+ safe(clearer::run);
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
index 0d653d991d..fc4c84b379 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/settings/Settings.java
@@ -189,8 +189,8 @@ public class Settings {
* Builder for creating Settings instances.
*/
public static class Builder {
- private Supplier<SettingStore> globalStoreSupplier = () -> new
MapStore();
- private Supplier<SettingStore> localStoreSupplier = () -> new
MapStore();
+ private Supplier<SettingStore> globalStoreSupplier =
MapStore::new;
+ private Supplier<SettingStore> localStoreSupplier =
MapStore::new;
private final List<SettingSource> sources = new ArrayList<>();
private final Map<Class<?>,Function<String,?>>
customTypeFunctions = new IdentityHashMap<>();
@@ -298,7 +298,7 @@ public class Settings {
}
private static final Settings INSTANCE = new Builder()
-
.globalStore(initProperty(DISABLE_GLOBAL_PROP).map(Boolean::valueOf).orElse(false)
? () -> null : () -> new MapStore())
+
.globalStore(initProperty(DISABLE_GLOBAL_PROP).map(Boolean::valueOf).orElse(false)
? () -> null : MapStore::new)
.setSources(SYSTEM_ENV_SOURCE, SYSTEM_PROPERTY_SOURCE)
.build();
@@ -577,7 +577,7 @@ public class Settings {
ClassInfoTyped<T> ci = info(c);
f = ci.getDeclaredMethod(x -> x.isStatic() &&
x.hasParameterTypes(String.class) && x.hasReturnType(c) &&
FROM_STRING_METHOD_NAMES.contains(x.getName())).map(x -> (Function<String,T>)s2
-> x.invoke(null, s2)).orElse(null);
if (f == null)
- f = ci.getPublicConstructor(x ->
x.hasParameterTypes(String.class)).map(x -> (Function<String,T>)s2 ->
x.newInstance(s2)).orElse(null);
+ f = ci.getPublicConstructor(x ->
x.hasParameterTypes(String.class)).map(x ->
(Function<String,T>)x::newInstance).orElse(null);
if (f != null)
toTypeFunctions.putIfAbsent(c, f);
}
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 0f553e927d..2235b891f8 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
@@ -123,7 +123,7 @@ public class StringSetting extends Setting<String> {
* @return The property value as a Boolean, or {@link Optional#empty()}
if not found.
*/
public Setting<Boolean> asBoolean() {
- return map(v -> Boolean.parseBoolean(v));
+ return map(Boolean::parseBoolean);
}
/**
@@ -163,7 +163,7 @@ public class StringSetting extends Setting<String> {
* @return The property value as a File, or {@link Optional#empty()} if
not found.
*/
public Setting<File> asFile() {
- return map(v -> new File(v));
+ return map(File::new);
}
/**
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
index 9e601cb4ec..44ce9ab765 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/CollectionUtils.java
@@ -2173,7 +2173,7 @@ public class CollectionUtils {
if (value == null || (nullIfEmpty && value.isEmpty()))
return null;
var l = new ArrayList<E>();
- value.forEach(x -> l.add(x));
+ value.forEach(l::add);
return l;
}
@@ -2361,7 +2361,7 @@ public class CollectionUtils {
if (value == null)
return null;
var l = new TreeSet<E>();
- value.forEach(x -> l.add(x));
+ value.forEach(l::add);
return l;
}
@@ -2377,7 +2377,7 @@ public class CollectionUtils {
if (value == null || (nullIfEmpty && value.isEmpty()))
return null;
var l = new TreeSet<E>();
- value.forEach(x -> l.add(x));
+ value.forEach(l::add);
return l;
}
diff --git
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
index 3cbf37289f..9cf865afd3 100644
---
a/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
+++
b/juneau-core/juneau-commons/src/main/java/org/apache/juneau/commons/utils/IoUtils.java
@@ -114,7 +114,7 @@ public class IoUtils {
*/
public static void closeQuietly(InputStream is) {
if (nn(is))
- safe(() -> is.close());
+ safe(is::close);
}
/**
@@ -145,7 +145,7 @@ public class IoUtils {
*/
public static void closeQuietly(OutputStream os) {
if (nn(os))
- quiet(() -> os.close());
+ quiet(os::close);
}
/**
@@ -158,7 +158,7 @@ public class IoUtils {
*/
public static void closeQuietly(Reader r) {
if (nn(r))
- quiet(() -> r.close());
+ quiet(r::close);
}
/**
@@ -171,7 +171,7 @@ public class IoUtils {
*/
public static void closeQuietly(Writer w) {
if (nn(w))
- quiet(() -> w.close());
+ quiet(w::close);
}
/**
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 61483d1b53..32290f228c 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
@@ -5721,7 +5721,7 @@ public class StringUtils {
}
// If no readifier found, use toString() as fallback
- return x -> x.toString();
+ return Object::toString;
});
return f.apply(o);
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 f65483bfa0..6f6d3d3025 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
@@ -391,8 +391,8 @@ public class BeanMeta<T> {
implClassConstructor = opt(implClass).map(x ->
x.getPublicConstructor(x2 -> x2.hasNumParameters(0)).orElse(null)).orElse(null);
fluentSetters = beanContext.isFindFluentSetters() || (nn(bf) &&
bf.isFluentSetters());
stopClass = opt(bf).map(x ->
x.getStopClass()).orElse(info(Object.class));
- beanRegistry = mem(()->findBeanRegistry());
- classHierarchy = mem(()->findClassHierarchy());
+ beanRegistry = mem(this::findBeanRegistry);
+ classHierarchy = mem(this::findClassHierarchy);
beanConstructor = findBeanConstructor();
// Local variables for initialization
@@ -447,7 +447,7 @@ public class BeanMeta<T> {
findBeanFields().forEach(x -> {
var name = ap.find(x).stream()
.filter(x2 ->
x2.isType(Beanp.class) || x2.isType(Name.class))
- .map(x2 -> name(x2))
+ .map(BeanMeta::name)
.filter(Objects::nonNull)
.findFirst()
.orElse(propertyNamer.getPropertyName(x.getName()));
@@ -498,7 +498,7 @@ public class BeanMeta<T> {
var p = i.next();
try {
if (p.field == null)
-
findInnerBeanField(p.name).ifPresent(x -> p.setInnerField(x));
+
findInnerBeanField(p.name).ifPresent(p::setInnerField);
if (p.validate(beanContext,
beanRegistry.get(), typeVarImpls, readOnlyProps, writeOnlyProps)) {
@@ -554,7 +554,7 @@ public class BeanMeta<T> {
// Only include specified properties if
BeanFilter.includeKeys is specified.
// Note that the order must match
includeKeys.
Map<String,BeanPropertyMeta> p2 =
map(); // NOAI
- bfbpi.stream().filter(x ->
p.containsKey(x)).forEach(x -> p2.put(x, p.remove(x)));
+
bfbpi.stream().filter(p::containsKey).forEach(x -> p2.put(x, p.remove(x)));
_hiddenProperties.putAll(p);
_properties.set(p2);
}
@@ -588,7 +588,7 @@ public class BeanMeta<T> {
dynaProperty = _dynaProperty.get();
sortProperties = _sortProperties;
typeProperty = BeanPropertyMeta.builder(this,
typePropertyName).canRead().canWrite().rawMetaType(beanContext.string()).beanRegistry(beanRegistry.get()).build();
- dictionaryName = mem(()->findDictionaryName());
+ dictionaryName = mem(this::findDictionaryName);
beanProxyInvocationHandler =
mem(()->beanContext.isUseInterfaceProxies() && c.isInterface() ? new
BeanProxyInvocationHandler<>(this) : null);
}
@@ -1309,8 +1309,8 @@ public class BeanMeta<T> {
.getParentsAndInterfaces()
.stream()
.skip(1)
- .map(x -> beanContext.getClassMeta(x))
- .map(x -> x.getBeanRegistry())
+ .map(beanContext::getClassMeta)
+ .map(ClassMeta::getBeanRegistry)
.filter(Objects::nonNull)
.map(x -> x.getTypeName(this.classMeta))
.filter(Objects::nonNull)
@@ -1324,7 +1324,7 @@ public class BeanMeta<T> {
.stream()
.map(AnnotationInfo::inner)
.filter(x -> ! x.typeName().isEmpty())
- .map(x -> x.typeName())
+ .map(Bean::typeName)
.findFirst()
.orElse(null);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index d80e46a925..595b60ea8a 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -463,7 +463,7 @@ public class BeanPropertyMeta implements
Comparable<BeanPropertyMeta> {
* @param b The builder to copy fields from.
*/
protected BeanPropertyMeta(Builder b) {
- annotations = mem(() -> findAnnotations());
+ annotations = mem(this::findAnnotations);
bc = b.bc;
beanMeta = b.beanMeta;
beanRegistry = b.beanRegistry;
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 3f2032393c..de7f6abf0f 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
@@ -1579,7 +1579,7 @@ public class BeanSession extends ContextSession {
*/
protected final ClassMeta<Object[]> getArgsClassMeta(Type[] classes) {
assertArgNotNull("classes", classes);
- return new ClassMeta(Arrays.stream(classes).map(x ->
getClassMeta(x)).toList());
+ return new
ClassMeta(Arrays.stream(classes).map(this::getClassMeta).toList());
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
index b77f27b50b..c1d1fb743b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/Context.java
@@ -537,7 +537,7 @@ public abstract class Context {
* @return <jk>true</jk> if any of the annotations/appliers can
be applied to this builder.
*/
public boolean canApply(AnnotationWorkList work) {
- return assertArgNotNull("work",
work).stream().anyMatch(x -> builders.stream().anyMatch(b -> x.canApply(b)));
+ return assertArgNotNull("work",
work).stream().anyMatch(x -> builders.stream().anyMatch(x::canApply));
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
index 6b72d9845c..11bd0fb87b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/UriContext.java
@@ -131,12 +131,12 @@ public class UriContext {
this.servletPath =
nullIfEmpty(trimSlashes(m.getString("servletPath")));
this.pathInfo =
nullIfEmpty(trimSlashes(m.getString("pathInfo")));
this.parentPath = this.pathInfo == null ||
this.pathInfo.indexOf('/') == -1 ? null : this.pathInfo.substring(0,
this.pathInfo.lastIndexOf('/'));
- this.rContextRoot = mem(() -> findRContextRoot());
- this.rResource = mem(() -> findRResource());
- this.rPath = mem(() -> findRPath());
- this.aContextRoot = mem(() -> findAContextRoot());
- this.aServletPath = mem(() -> findAServletPath());
- this.aPathInfo = mem(() -> findAPathInfo());
+ this.rContextRoot = mem(this::findRContextRoot);
+ this.rResource = mem(this::findRResource);
+ this.rPath = mem(this::findRPath);
+ this.aContextRoot = mem(this::findAContextRoot);
+ this.aServletPath = mem(this::findAServletPath);
+ this.aPathInfo = mem(this::findAPathInfo);
}
/**
@@ -164,12 +164,12 @@ public class UriContext {
this.servletPath = nullIfEmpty(trimSlashes(servletPath));
this.pathInfo = nullIfEmpty(trimSlashes(pathInfo));
this.parentPath = this.pathInfo == null ||
this.pathInfo.indexOf('/') == -1 ? null : this.pathInfo.substring(0,
this.pathInfo.lastIndexOf('/'));
- this.rContextRoot = mem(() -> findRContextRoot());
- this.rResource = mem(() -> findRResource());
- this.rPath = mem(() -> findRPath());
- this.aContextRoot = mem(() -> findAContextRoot());
- this.aServletPath = mem(() -> findAServletPath());
- this.aPathInfo = mem(() -> findAPathInfo());
+ this.rContextRoot = mem(this::findRContextRoot);
+ this.rResource = mem(this::findRResource);
+ this.rPath = mem(this::findRPath);
+ this.aContextRoot = mem(this::findAContextRoot);
+ this.aServletPath = mem(this::findAServletPath);
+ this.aPathInfo = mem(this::findAPathInfo);
}
private String findRContextRoot() {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
index ee1c1f2822..79a88e18c1 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/annotation/BeanConfigAnnotation.java
@@ -49,41 +49,41 @@ public class BeanConfigAnnotation {
BeanConfig a = ai.inner();
// @formatter:off
-
string(a.beanClassVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanClassVisibility(x));
-
string(a.beanConstructorVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanConstructorVisibility(x));
-
string(a.beanFieldVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanFieldVisibility(x));
-
string(a.beanMethodVisibility()).map(Visibility::valueOf).ifPresent(x ->
b.beanMethodVisibility(x));
- bool(a.beanMapPutReturnsOldValue()).ifPresent(x ->
b.beanMapPutReturnsOldValue(x));
- bool(a.beansRequireDefaultConstructor()).ifPresent(x ->
b.beansRequireDefaultConstructor(x));
- bool(a.beansRequireSerializable()).ifPresent(x ->
b.beansRequireSerializable(x));
- bool(a.beansRequireSettersForGetters()).ifPresent(x ->
b.beansRequireSettersForGetters(x));
- bool(a.disableBeansRequireSomeProperties()).ifPresent(x
-> b.disableBeansRequireSomeProperties(x));
- bool(a.debug()).ifPresent(x -> b.debug(x));
- bool(a.findFluentSetters()).ifPresent(x ->
b.findFluentSetters(x));
-
bool(a.ignoreInvocationExceptionsOnGetters()).ifPresent(x ->
b.ignoreInvocationExceptionsOnGetters(x));
-
bool(a.ignoreInvocationExceptionsOnSetters()).ifPresent(x ->
b.ignoreInvocationExceptionsOnSetters(x));
- bool(a.disableIgnoreMissingSetters()).ifPresent(x ->
b.disableIgnoreMissingSetters(x));
- bool(a.disableIgnoreTransientFields()).ifPresent(x ->
b.disableIgnoreTransientFields(x));
- bool(a.ignoreUnknownBeanProperties()).ifPresent(x ->
b.ignoreUnknownBeanProperties(x));
- bool(a.ignoreUnknownEnumValues()).ifPresent(x ->
b.ignoreUnknownEnumValues(x));
-
bool(a.disableIgnoreUnknownNullBeanProperties()).ifPresent(x ->
b.disableIgnoreUnknownNullBeanProperties(x));
- bool(a.sortProperties()).ifPresent(x ->
b.sortProperties(x));
- bool(a.useEnumNames()).ifPresent(x ->
b.useEnumNames(x));
- bool(a.disableInterfaceProxies()).ifPresent(x ->
b.disableInterfaceProxies(x));
- bool(a.useJavaBeanIntrospector()).ifPresent(x ->
b.useJavaBeanIntrospector(x));
- string(a.typePropertyName()).ifPresent(x ->
b.typePropertyName(x));
-
string(a.locale()).map(Locale::forLanguageTag).ifPresent(x -> b.locale(x));
- string(a.mediaType()).map(MediaType::of).ifPresent(x ->
b.mediaType(x));
-
string(a.timeZone()).map(TimeZone::getTimeZone).ifPresent(x -> b.timeZone(x));
- classes(a.dictionary()).ifPresent(x ->
b.beanDictionary(x));
+
string(a.beanClassVisibility()).map(Visibility::valueOf).ifPresent(b::beanClassVisibility);
+
string(a.beanConstructorVisibility()).map(Visibility::valueOf).ifPresent(b::beanConstructorVisibility);
+
string(a.beanFieldVisibility()).map(Visibility::valueOf).ifPresent(b::beanFieldVisibility);
+
string(a.beanMethodVisibility()).map(Visibility::valueOf).ifPresent(b::beanMethodVisibility);
+
bool(a.beanMapPutReturnsOldValue()).ifPresent(b::beanMapPutReturnsOldValue);
+
bool(a.beansRequireDefaultConstructor()).ifPresent(b::beansRequireDefaultConstructor);
+
bool(a.beansRequireSerializable()).ifPresent(b::beansRequireSerializable);
+
bool(a.beansRequireSettersForGetters()).ifPresent(b::beansRequireSettersForGetters);
+
bool(a.disableBeansRequireSomeProperties()).ifPresent(b::disableBeansRequireSomeProperties);
+ bool(a.debug()).ifPresent(b::debug);
+
bool(a.findFluentSetters()).ifPresent(b::findFluentSetters);
+
bool(a.ignoreInvocationExceptionsOnGetters()).ifPresent(b::ignoreInvocationExceptionsOnGetters);
+
bool(a.ignoreInvocationExceptionsOnSetters()).ifPresent(b::ignoreInvocationExceptionsOnSetters);
+
bool(a.disableIgnoreMissingSetters()).ifPresent(b::disableIgnoreMissingSetters);
+
bool(a.disableIgnoreTransientFields()).ifPresent(b::disableIgnoreTransientFields);
+
bool(a.ignoreUnknownBeanProperties()).ifPresent(b::ignoreUnknownBeanProperties);
+
bool(a.ignoreUnknownEnumValues()).ifPresent(b::ignoreUnknownEnumValues);
+
bool(a.disableIgnoreUnknownNullBeanProperties()).ifPresent(b::disableIgnoreUnknownNullBeanProperties);
+ bool(a.sortProperties()).ifPresent(b::sortProperties);
+ bool(a.useEnumNames()).ifPresent(b::useEnumNames);
+
bool(a.disableInterfaceProxies()).ifPresent(b::disableInterfaceProxies);
+
bool(a.useJavaBeanIntrospector()).ifPresent(b::useJavaBeanIntrospector);
+
string(a.typePropertyName()).ifPresent(b::typePropertyName);
+
string(a.locale()).map(Locale::forLanguageTag).ifPresent(b::locale);
+
string(a.mediaType()).map(MediaType::of).ifPresent(b::mediaType);
+
string(a.timeZone()).map(TimeZone::getTimeZone).ifPresent(b::timeZone);
+ classes(a.dictionary()).ifPresent(b::beanDictionary);
classes(a.dictionary_replace()).ifPresent(x -> {
b.beanDictionary().clear(); b.beanDictionary(x);});
- classes(a.swaps()).ifPresent(x -> b.swaps(x));
+ classes(a.swaps()).ifPresent(b::swaps);
classes(a.swaps_replace()).ifPresent(x -> {
b.swaps().clear(); b.swaps(x);});
- classes(a.notBeanClasses()).ifPresent(x ->
b.notBeanClasses(x));
+
classes(a.notBeanClasses()).ifPresent(b::notBeanClasses);
classes(a.notBeanClasses_replace()).ifPresent(x -> {
b.notBeanClasses().clear(); b.notBeanClasses(x);});
- type(a.propertyNamer()).ifPresent(x ->
b.propertyNamer(x));
- l(a.interfaces()).stream().map(x ->
BeanAnnotation.create(x).interfaceClass(x).build()).forEach(x ->
b.annotations(x));
- strings(a.notBeanPackages()).ifPresent(x ->
b.notBeanPackages(x));
+ type(a.propertyNamer()).ifPresent(b::propertyNamer);
+ l(a.interfaces()).stream().map(x ->
BeanAnnotation.create(x).interfaceClass(x).build()).forEach(b::annotations);
+
strings(a.notBeanPackages()).ifPresent(b::notBeanPackages);
strings(a.notBeanPackages_replace()).ifPresent(x ->
{b.notBeanPackages().clear(); b.notBeanPackages(x);});
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
index 411e0573ef..4b0216bd13 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanCreator.java
@@ -312,7 +312,7 @@ public class BeanCreator<T> {
var match = new Match<MethodInfo>();
// Look for static creator method.
- type.getPublicMethods().stream().filter(x ->
isStaticCreateMethod(x)).forEach(x -> {
+
type.getPublicMethods().stream().filter(this::isStaticCreateMethod).forEach(x
-> {
found.set("STATIC_CREATOR");
if (hasAllParams(x))
match.add(x);
@@ -377,12 +377,12 @@ public class BeanCreator<T> {
msg = "No public/protected constructors found";
} else if (found.get().equals("STATIC_CREATOR")) {
msg = "Static creator found but could not find
prerequisites: "
- + type.getPublicMethods().stream().filter(x ->
isStaticCreateMethod(x)).map(x ->
getMissingParams(x)).sorted().collect(joining(" or "));
+ +
type.getPublicMethods().stream().filter(this::isStaticCreateMethod).map(this::getMissingParams).sorted().collect(joining("
or "));
} else if (found.get().equals("PUBLIC_CONSTRUCTOR")) {
- msg = "Public constructor found but could not find
prerequisites: " + type.getPublicConstructors().stream().map(x ->
getMissingParams(x)).sorted().collect(joining(" or "));
+ msg = "Public constructor found but could not find
prerequisites: " +
type.getPublicConstructors().stream().map(this::getMissingParams).sorted().collect(joining("
or "));
} else {
msg = "Protected constructor found but could not find
prerequisites: "
- +
type.getDeclaredConstructors().stream().filter(ConstructorInfo::isProtected).map(x
-> getMissingParams(x)).sorted().collect(joining(" or "));
+ +
type.getDeclaredConstructors().stream().filter(ConstructorInfo::isProtected).map(this::getMissingParams).sorted().collect(joining("
or "));
}
throw new ExecutableException("Could not instantiate class {0}:
{1}.", type.getName(), msg);
}
@@ -404,7 +404,7 @@ public class BeanCreator<T> {
* @return A supplier that returns the results of the {@link #run()}
method.
*/
public Supplier<T> supplier() {
- return () -> run();
+ return this::run;
}
/**
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index a95f9cd9d8..04c7eed60d 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -1669,7 +1669,7 @@ public class HtmlDocSerializer extends
HtmlStrippedDocSerializer {
templateBean = newInstance(template);
widgetMap = new HtmlWidgetMap();
- widgets.stream().map(this::newInstance).forEach(x ->
widgetMap.append(x));
+
widgets.stream().map(this::newInstance).forEach(widgetMap::append);
widgetArray = array(widgetMap.values(), HtmlWidget.class);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
index fa6ba9380a..cd7d89f077 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlConfigAnnotation.java
@@ -66,12 +66,12 @@ public class HtmlConfigAnnotation {
public void apply(AnnotationInfo<HtmlConfig> ai,
HtmlSerializer.Builder b) {
HtmlConfig a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesHtml(x));
- bool(a.addKeyValueTableHeaders()).ifPresent(x ->
b.addKeyValueTableHeaders(x));
- bool(a.disableDetectLabelParameters()).ifPresent(x ->
b.disableDetectLabelParameters(x));
- bool(a.disableDetectLinksInStrings()).ifPresent(x ->
b.disableDetectLinksInStrings(x));
- string(a.labelParameter()).ifPresent(x ->
b.labelParameter(x));
-
string(a.uriAnchorText()).map(AnchorText::valueOf).ifPresent(x ->
b.uriAnchorText(x));
+ bool(a.addBeanTypes()).ifPresent(b::addBeanTypesHtml);
+
bool(a.addKeyValueTableHeaders()).ifPresent(b::addKeyValueTableHeaders);
+
bool(a.disableDetectLabelParameters()).ifPresent(b::disableDetectLabelParameters);
+
bool(a.disableDetectLinksInStrings()).ifPresent(b::disableDetectLinksInStrings);
+ string(a.labelParameter()).ifPresent(b::labelParameter);
+
string(a.uriAnchorText()).map(AnchorText::valueOf).ifPresent(b::uriAnchorText);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
index c5514b6609..7be02b54a4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/annotation/HtmlDocConfigAnnotation.java
@@ -49,20 +49,20 @@ public class HtmlDocConfigAnnotation {
public void apply(AnnotationInfo<HtmlDocConfig> ai,
HtmlDocSerializer.Builder b) {
HtmlDocConfig a = ai.inner();
- strings(a.aside()).ifPresent(x -> b.aside(x));
- strings(a.footer()).ifPresent(x -> b.footer(x));
- strings(a.head()).ifPresent(x -> b.head(x));
- strings(a.header()).ifPresent(x -> b.header(x));
- strings(a.nav()).ifPresent(x -> b.nav(x));
- strings(a.navlinks()).ifPresent(x -> b.navlinks(x));
- strings(a.script()).ifPresent(x -> b.script(x));
- strings(a.style()).ifPresent(x -> b.style(x));
- strings(a.stylesheet()).ifPresent(x -> b.stylesheet(x));
- string(a.asideFloat()).filter(x -> !
"DEFAULT".equalsIgnoreCase(x)).map(AsideFloat::valueOf).ifPresent(x ->
b.asideFloat(x));
- string(a.noResultsMessage()).ifPresent(x ->
b.noResultsMessage(x));
- bool(a.nowrap()).ifPresent(x -> b.nowrap(x));
- bool(a.resolveBodyVars()).ifPresent(x ->
b.resolveBodyVars(x));
- type(a.template()).ifPresent(x -> b.template(x));
+ strings(a.aside()).ifPresent(b::aside);
+ strings(a.footer()).ifPresent(b::footer);
+ strings(a.head()).ifPresent(b::head);
+ strings(a.header()).ifPresent(b::header);
+ strings(a.nav()).ifPresent(b::nav);
+ strings(a.navlinks()).ifPresent(b::navlinks);
+ strings(a.script()).ifPresent(b::script);
+ strings(a.style()).ifPresent(b::style);
+ strings(a.stylesheet()).ifPresent(b::stylesheet);
+ string(a.asideFloat()).filter(x -> !
"DEFAULT".equalsIgnoreCase(x)).map(AsideFloat::valueOf).ifPresent(b::asideFloat);
+
string(a.noResultsMessage()).ifPresent(b::noResultsMessage);
+ bool(a.nowrap()).ifPresent(b::nowrap);
+ bool(a.resolveBodyVars()).ifPresent(b::resolveBodyVars);
+ type(a.template()).ifPresent(b::template);
classes(a.widgets()).ifPresent(x -> b.widgets((Class<?
extends HtmlWidget>[])x));
}
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
index 492c2ba90a..eb788c5147 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/HeaderAnnotation.java
@@ -355,7 +355,7 @@ public class HeaderAnnotation {
.map(AnnotationInfo::inner)
.filter(x -> ne(x.def()))
.findFirst()
- .map(x -> x.def());
+ .map(Header::def);
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
index 1ae612c73b..01f0bfa960 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/PathAnnotation.java
@@ -356,7 +356,7 @@ public class PathAnnotation {
.map(AnnotationInfo::inner)
.filter(x -> ne(x.def()) && neq(NONE, x.def()))
.findFirst()
- .map(x -> x.def());
+ .map(Header::def);
// @formatter:on
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
index 503e4a2234..ea81c27c6f 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/annotation/QueryAnnotation.java
@@ -355,7 +355,7 @@ public class QueryAnnotation {
.map(AnnotationInfo::inner)
.filter(x -> ne(x.def()))
.findFirst()
- .map(x -> x.def());
+ .map(Query::def);
// @formatter:on
}
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 1b2b651484..baba9797b3 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
@@ -3583,7 +3583,7 @@ public class HttpPartSchema {
for (var ss : s)
if (nn(ss))
for (var ss2 : ss)
- StringUtils.split(ss2, x -> set.add(x));
+ StringUtils.split(ss2, set::add);
return set.isEmpty() ? null : set;
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
index b5c119a7c4..8ed7825dc3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/json/annotation/JsonConfigAnnotation.java
@@ -48,7 +48,7 @@ public class JsonConfigAnnotation {
public void apply(AnnotationInfo<JsonConfig> ai,
JsonParser.Builder b) {
JsonConfig a = ai.inner();
- bool(a.validateEnd()).ifPresent(x -> b.validateEnd(x));
+ bool(a.validateEnd()).ifPresent(b::validateEnd);
}
}
@@ -70,9 +70,9 @@ public class JsonConfigAnnotation {
public void apply(AnnotationInfo<JsonConfig> ai,
JsonSerializer.Builder b) {
JsonConfig a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesJson(x));
- bool(a.escapeSolidus()).ifPresent(x ->
b.escapeSolidus(x));
- bool(a.simpleAttrs()).ifPresent(x -> b.simpleAttrs(x));
+ bool(a.addBeanTypes()).ifPresent(b::addBeanTypesJson);
+ bool(a.escapeSolidus()).ifPresent(b::escapeSolidus);
+ bool(a.simpleAttrs()).ifPresent(b::simpleAttrs);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
index 52782722a2..bc8afc7037 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/annotation/JsonSchemaConfigAnnotation.java
@@ -48,17 +48,17 @@ public class JsonSchemaConfigAnnotation {
public void apply(AnnotationInfo<JsonSchemaConfig> ai,
JsonSchemaGenerator.Builder b) {
JsonSchemaConfig a = ai.inner();
-
string(a.addDescriptionsTo()).map(TypeCategory::parseArray).ifPresent(x ->
b.addDescriptionsTo(x));
-
string(a.addExamplesTo()).map(TypeCategory::parseArray).ifPresent(x ->
b.addExamplesTo(x));
- bool(a.allowNestedDescriptions()).ifPresent(x ->
b.allowNestedDescriptions(x));
- bool(a.allowNestedExamples()).ifPresent(x ->
b.allowNestedExamples(x));
- type(a.beanDefMapper()).ifPresent(x ->
b.beanDefMapper(x));
- string(a.ignoreTypes()).ifPresent(x ->
b.ignoreTypes(x));
- bool(a.useBeanDefs()).ifPresent(x -> b.useBeanDefs(x));
- bool(a.detectRecursions()).ifPresent(x ->
b.detectRecursions(x));
- bool(a.ignoreRecursions()).ifPresent(x ->
b.ignoreRecursions(x));
- integer(a.initialDepth(), "initialDepth").ifPresent(x
-> b.initialDepth(x));
- integer(a.maxDepth(), "maxDepth").ifPresent(x ->
b.maxDepth(x));
+
string(a.addDescriptionsTo()).map(TypeCategory::parseArray).ifPresent(b::addDescriptionsTo);
+
string(a.addExamplesTo()).map(TypeCategory::parseArray).ifPresent(b::addExamplesTo);
+
bool(a.allowNestedDescriptions()).ifPresent(b::allowNestedDescriptions);
+
bool(a.allowNestedExamples()).ifPresent(b::allowNestedExamples);
+ type(a.beanDefMapper()).ifPresent(b::beanDefMapper);
+ string(a.ignoreTypes()).ifPresent(b::ignoreTypes);
+ bool(a.useBeanDefs()).ifPresent(b::useBeanDefs);
+
bool(a.detectRecursions()).ifPresent(b::detectRecursions);
+
bool(a.ignoreRecursions()).ifPresent(b::ignoreRecursions);
+ integer(a.initialDepth(),
"initialDepth").ifPresent(b::initialDepth);
+ integer(a.maxDepth(),
"maxDepth").ifPresent(b::maxDepth);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
index 891e83fb22..aee5aa8cde 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/msgpack/annotation/MsgPackConfigAnnotation.java
@@ -66,7 +66,7 @@ public class MsgPackConfigAnnotation {
public void apply(AnnotationInfo<MsgPackConfig> ai,
MsgPackSerializer.Builder b) {
MsgPackConfig a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesMsgPack(x));
+
bool(a.addBeanTypes()).ifPresent(b::addBeanTypesMsgPack);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
index a2036193bc..4bf09a5074 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/annotation/OpenApiConfigAnnotation.java
@@ -49,8 +49,8 @@ public class OpenApiConfigAnnotation {
public void apply(AnnotationInfo<OpenApiConfig> ai,
OpenApiParser.Builder b) {
OpenApiConfig a = ai.inner();
-
string(a.format()).map(HttpPartFormat::valueOf).ifPresent(x -> b.format(x));
-
string(a.collectionFormat()).map(HttpPartCollectionFormat::valueOf).ifPresent(x
-> b.collectionFormat(x));
+
string(a.format()).map(HttpPartFormat::valueOf).ifPresent(b::format);
+
string(a.collectionFormat()).map(HttpPartCollectionFormat::valueOf).ifPresent(b::collectionFormat);
}
}
@@ -72,8 +72,8 @@ public class OpenApiConfigAnnotation {
public void apply(AnnotationInfo<OpenApiConfig> ai,
OpenApiSerializer.Builder b) {
OpenApiConfig a = ai.inner();
-
string(a.format()).map(HttpPartFormat::valueOf).ifPresent(x -> b.format(x));
-
string(a.collectionFormat()).map(HttpPartCollectionFormat::valueOf).ifPresent(x
-> b.collectionFormat(x));
+
string(a.format()).map(HttpPartFormat::valueOf).ifPresent(b::format);
+
string(a.collectionFormat()).map(HttpPartCollectionFormat::valueOf).ifPresent(b::collectionFormat);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
index 1cca041713..559c15ca10 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/objecttools/ObjectViewer.java
@@ -96,7 +96,7 @@ public class ObjectViewer implements ObjectTool<ViewArgs> {
var c = (Collection)input;
l = listOfSize(c.size());
List<Object> l2 = l;
- c.forEach(x -> l2.add(x));
+ c.forEach(l2::add);
} else {
return input;
}
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 ff561a5093..b7b42d3935 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
@@ -117,7 +117,7 @@ public class ParserSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
entries = list();
-
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
+
copyFrom.entries.stream().map(this::copyBuilder).forEach(entries::add);
}
/**
@@ -369,7 +369,7 @@ public class ParserSet {
}
private <T extends Parser.Builder> Stream<T> builders(Class<T>
type) {
- return entries.stream().filter(x ->
type.isInstance(x)).map(x -> type.cast(x));
+ return
entries.stream().filter(type::isInstance).map(type::cast);
}
private Object copyBuilder(Object o) {
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
index 7ecf44fdf0..29a3168b37 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/ReaderParser.java
@@ -62,7 +62,7 @@ public class ReaderParser extends Parser {
* Constructor, default settings.
*/
protected Builder() {
- fileCharset = env("ReaderParser.fileCharset").map(x ->
Charset.forName(x)).orElse(Charset.defaultCharset());
+ fileCharset =
env("ReaderParser.fileCharset").map(Charset::forName).orElse(Charset.defaultCharset());
streamCharset = env("ReaderParser.streamCharset", UTF8);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
index 17cfcae75e..6ccf9b0884 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/parser/annotation/ParserConfigAnnotation.java
@@ -48,7 +48,7 @@ public class ParserConfigAnnotation {
public void apply(AnnotationInfo<ParserConfig> ai,
InputStreamParser.Builder b) {
ParserConfig a = ai.inner();
-
string(a.binaryFormat()).map(BinaryFormat::valueOf).ifPresent(x ->
b.binaryFormat(x));
+
string(a.binaryFormat()).map(BinaryFormat::valueOf).ifPresent(b::binaryFormat);
}
}
@@ -70,12 +70,12 @@ public class ParserConfigAnnotation {
public void apply(AnnotationInfo<ParserConfig> ai,
Parser.Builder b) {
ParserConfig a = ai.inner();
- bool(a.autoCloseStreams()).ifPresent(x ->
b.autoCloseStreams(x));
- integer(a.debugOutputLines(),
"debugOutputLines").ifPresent(x -> b.debugOutputLines(x));
- type(a.listener()).ifPresent(x -> b.listener(x));
- bool(a.strict()).ifPresent(x -> b.strict(x));
- bool(a.trimStrings()).ifPresent(x -> b.trimStrings(x));
- bool(a.unbuffered()).ifPresent(x -> b.unbuffered(x));
+
bool(a.autoCloseStreams()).ifPresent(b::autoCloseStreams);
+ integer(a.debugOutputLines(),
"debugOutputLines").ifPresent(b::debugOutputLines);
+ type(a.listener()).ifPresent(b::listener);
+ bool(a.strict()).ifPresent(b::strict);
+ bool(a.trimStrings()).ifPresent(b::trimStrings);
+ bool(a.unbuffered()).ifPresent(b::unbuffered);
}
}
@@ -97,8 +97,8 @@ public class ParserConfigAnnotation {
public void apply(AnnotationInfo<ParserConfig> ai,
ReaderParser.Builder b) {
ParserConfig a = ai.inner();
- charset(a.fileCharset()).ifPresent(x ->
b.fileCharset(x));
- charset(a.streamCharset()).ifPresent(x ->
b.streamCharset(x));
+ charset(a.fileCharset()).ifPresent(b::fileCharset);
+ charset(a.streamCharset()).ifPresent(b::streamCharset);
}
}
}
\ No newline at end of file
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 692f70028f..6327166a43 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
@@ -116,7 +116,7 @@ public class SerializerSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null :
copyFrom.bcBuilder.copy();
entries = list();
-
copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
+
copyFrom.entries.stream().map(this::copyBuilder).forEach(entries::add);
}
/**
@@ -365,7 +365,7 @@ public class SerializerSet {
}
private <T extends Serializer.Builder> Stream<T>
builders(Class<T> type) {
- return entries.stream().filter(x ->
type.isInstance(x)).map(x -> type.cast(x));
+ return
entries.stream().filter(type::isInstance).map(type::cast);
}
private Object copyBuilder(Object o) {
@@ -486,7 +486,7 @@ public class SerializerSet {
lmtr.add(x);
l.add(e);
});
- e.forEachAcceptMediaType(x -> lmt.add(x));
+ e.forEachAcceptMediaType(lmt::add);
}
this.mediaRanges = lmtr.toArray(new MediaRange[lmtr.size()]);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
index 89340c980a..5c483fe20b 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/serializer/annotation/SerializerConfigAnnotation.java
@@ -48,7 +48,7 @@ public class SerializerConfigAnnotation {
public void apply(AnnotationInfo<SerializerConfig> ai,
OutputStreamSerializer.Builder b) {
SerializerConfig a = ai.inner();
-
string(a.binaryFormat()).map(BinaryFormat::valueOf).ifPresent(x ->
b.binaryFormat(x));
+
string(a.binaryFormat()).map(BinaryFormat::valueOf).ifPresent(b::binaryFormat);
}
}
@@ -70,22 +70,22 @@ public class SerializerConfigAnnotation {
public void apply(AnnotationInfo<SerializerConfig> ai,
Serializer.Builder b) {
SerializerConfig a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypes(x));
- bool(a.addRootType()).ifPresent(x -> b.addRootType(x));
- bool(a.keepNullProperties()).ifPresent(x ->
b.keepNullProperties(x));
- type(a.listener()).ifPresent(x -> b.listener(x));
- bool(a.sortCollections()).ifPresent(x ->
b.sortCollections(x));
- bool(a.sortMaps()).ifPresent(x -> b.sortMaps(x));
- bool(a.trimEmptyCollections()).ifPresent(x ->
b.trimEmptyCollections(x));
- bool(a.trimEmptyMaps()).ifPresent(x ->
b.trimEmptyMaps(x));
- bool(a.trimStrings()).ifPresent(x -> b.trimStrings(x));
- string(a.uriContext()).map(UriContext::of).ifPresent(x
-> b.uriContext(x));
-
string(a.uriRelativity()).map(UriRelativity::valueOf).ifPresent(x ->
b.uriRelativity(x));
-
string(a.uriResolution()).map(UriResolution::valueOf).ifPresent(x ->
b.uriResolution(x));
- bool(a.detectRecursions()).ifPresent(x ->
b.detectRecursions(x));
- bool(a.ignoreRecursions()).ifPresent(x ->
b.ignoreRecursions(x));
- integer(a.initialDepth(), "initialDepth").ifPresent(x
-> b.initialDepth(x));
- integer(a.maxDepth(), "maxDepth").ifPresent(x ->
b.maxDepth(x));
+ bool(a.addBeanTypes()).ifPresent(b::addBeanTypes);
+ bool(a.addRootType()).ifPresent(b::addRootType);
+
bool(a.keepNullProperties()).ifPresent(b::keepNullProperties);
+ type(a.listener()).ifPresent(b::listener);
+ bool(a.sortCollections()).ifPresent(b::sortCollections);
+ bool(a.sortMaps()).ifPresent(b::sortMaps);
+
bool(a.trimEmptyCollections()).ifPresent(b::trimEmptyCollections);
+ bool(a.trimEmptyMaps()).ifPresent(b::trimEmptyMaps);
+ bool(a.trimStrings()).ifPresent(b::trimStrings);
+
string(a.uriContext()).map(UriContext::of).ifPresent(b::uriContext);
+
string(a.uriRelativity()).map(UriRelativity::valueOf).ifPresent(b::uriRelativity);
+
string(a.uriResolution()).map(UriResolution::valueOf).ifPresent(b::uriResolution);
+
bool(a.detectRecursions()).ifPresent(b::detectRecursions);
+
bool(a.ignoreRecursions()).ifPresent(b::ignoreRecursions);
+ integer(a.initialDepth(),
"initialDepth").ifPresent(b::initialDepth);
+ integer(a.maxDepth(),
"maxDepth").ifPresent(b::maxDepth);
}
}
@@ -107,11 +107,11 @@ public class SerializerConfigAnnotation {
public void apply(AnnotationInfo<SerializerConfig> ai,
WriterSerializer.Builder b) {
SerializerConfig a = ai.inner();
- charset(a.fileCharset()).ifPresent(x ->
b.fileCharset(x));
- integer(a.maxIndent(), "maxIndent").ifPresent(x ->
b.maxIndent(x));
- character(a.quoteChar(), "quoteChar").ifPresent(x ->
b.quoteChar(x));
- charset(a.streamCharset()).ifPresent(x ->
b.streamCharset(x));
- bool(a.useWhitespace()).ifPresent(x ->
b.useWhitespace(x));
+ charset(a.fileCharset()).ifPresent(b::fileCharset);
+ integer(a.maxIndent(),
"maxIndent").ifPresent(b::maxIndent);
+ character(a.quoteChar(),
"quoteChar").ifPresent(b::quoteChar);
+ charset(a.streamCharset()).ifPresent(b::streamCharset);
+ bool(a.useWhitespace()).ifPresent(b::useWhitespace);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
index 017b455291..51c2cc8f05 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/soap/annotation/SoapXmlConfigAnnotation.java
@@ -45,7 +45,7 @@ public class SoapXmlConfigAnnotation {
public void apply(AnnotationInfo<SoapXmlConfig> ai,
SoapXmlSerializer.Builder b) {
SoapXmlConfig a = ai.inner();
- string(a.soapAction()).ifPresent(x -> b.soapAction(x));
+ string(a.soapAction()).ifPresent(b::soapAction);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
index 0faeabd6d8..31018b67ca 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/swap/BuilderSwap.java
@@ -99,7 +99,7 @@ public class BuilderSwap<T,B> {
ConstructorInfo builderConstructor;
var pci = info(objectClass);
-
bc.getAnnotationProvider().find(org.apache.juneau.commons.annotation.Builder.class,
pci).stream().map(x ->
x.inner().value()).filter(ClassUtils::isNotVoid).forEach(x ->
builderClass.set(x));
+
bc.getAnnotationProvider().find(org.apache.juneau.commons.annotation.Builder.class,
pci).stream().map(x ->
x.inner().value()).filter(ClassUtils::isNotVoid).forEach(builderClass::set);
builderCreateMethod = getBuilderCreateMethod(pci);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
index 15597b91a7..a84201f0ce 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/uon/annotation/UonConfigAnnotation.java
@@ -48,8 +48,8 @@ public class UonConfigAnnotation {
public void apply(AnnotationInfo<UonConfig> ai,
UonParser.Builder b) {
var a = ai.inner();
- bool(a.decoding()).ifPresent(x -> b.decoding(x));
- bool(a.validateEnd()).ifPresent(x -> b.validateEnd(x));
+ bool(a.decoding()).ifPresent(b::decoding);
+ bool(a.validateEnd()).ifPresent(b::validateEnd);
}
}
@@ -71,9 +71,9 @@ public class UonConfigAnnotation {
public void apply(AnnotationInfo<UonConfig> ai,
UonSerializer.Builder b) {
var a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesUon(x));
- bool(a.encoding()).ifPresent(x -> b.encoding(x));
-
string(a.paramFormat()).map(ParamFormat::valueOf).ifPresent(x ->
b.paramFormat(x));
+ bool(a.addBeanTypes()).ifPresent(b::addBeanTypesUon);
+ bool(a.encoding()).ifPresent(b::encoding);
+
string(a.paramFormat()).map(ParamFormat::valueOf).ifPresent(b::paramFormat);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
index c816a828ef..abeb6027d4 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/annotation/UrlEncodingConfigAnnotation.java
@@ -48,7 +48,7 @@ public class UrlEncodingConfigAnnotation {
public void apply(AnnotationInfo<UrlEncodingConfig> ai,
UrlEncodingParser.Builder b) {
UrlEncodingConfig a = ai.inner();
- bool(a.expandedParams()).ifPresent(x ->
b.expandedParams(x));
+ bool(a.expandedParams()).ifPresent(b::expandedParams);
}
}
@@ -70,7 +70,7 @@ public class UrlEncodingConfigAnnotation {
public void apply(AnnotationInfo<UrlEncodingConfig> ai,
UrlEncodingSerializer.Builder b) {
UrlEncodingConfig a = ai.inner();
- bool(a.expandedParams()).ifPresent(x ->
b.expandedParams(x));
+ bool(a.expandedParams()).ifPresent(b::expandedParams);
}
}
}
\ No newline at end of file
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index 8c1947bdf3..5422aa1cce 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -49,8 +49,8 @@ public class XmlClassMeta extends ExtendedClassMeta {
List<Xml> xmls = list();
List<XmlSchema> schemas = list();
if (nn(cm)) {
- cm.forEachAnnotation(Xml.class, x -> true, x ->
xmls.add(x));
- cm.forEachAnnotation(XmlSchema.class, x -> true, x ->
schemas.add(x));
+ cm.forEachAnnotation(Xml.class, x -> true, xmls::add);
+ cm.forEachAnnotation(XmlSchema.class, x -> true,
schemas::add);
}
this.namespace = XmlUtils.findNamespace(xmls, schemas);
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
index 68e879b040..b2725affd0 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/annotation/XmlConfigAnnotation.java
@@ -48,11 +48,11 @@ public class XmlConfigAnnotation {
public void apply(AnnotationInfo<XmlConfig> ai,
XmlParser.Builder b) {
XmlConfig a = ai.inner();
- type(a.eventAllocator()).ifPresent(x ->
b.eventAllocator(x));
- bool(a.preserveRootElement()).ifPresent(x ->
b.preserveRootElement(x));
- type(a.reporter()).ifPresent(x -> b.reporter(x));
- type(a.resolver()).ifPresent(x -> b.resolver(x));
- bool(a.validating()).ifPresent(x -> b.validating(x));
+ type(a.eventAllocator()).ifPresent(b::eventAllocator);
+
bool(a.preserveRootElement()).ifPresent(b::preserveRootElement);
+ type(a.reporter()).ifPresent(b::reporter);
+ type(a.resolver()).ifPresent(b::resolver);
+ bool(a.validating()).ifPresent(b::validating);
}
}
@@ -74,12 +74,12 @@ public class XmlConfigAnnotation {
public void apply(AnnotationInfo<XmlConfig> ai,
XmlSerializer.Builder b) {
XmlConfig a = ai.inner();
- bool(a.addBeanTypes()).ifPresent(x ->
b.addBeanTypesXml(x));
- bool(a.addNamespaceUrisToRoot()).ifPresent(x ->
b.addNamespaceUrisToRoot(x));
- bool(a.disableAutoDetectNamespaces()).ifPresent(x ->
b.disableAutoDetectNamespaces(x));
-
string(a.defaultNamespace()).map(Namespace::create).ifPresent(x ->
b.defaultNamespace(x));
- bool(a.enableNamespaces()).ifPresent(x ->
b.enableNamespaces(x));
-
strings(a.namespaces()).map(Namespace::createArray).ifPresent(x ->
b.namespaces(x));
+ bool(a.addBeanTypes()).ifPresent(b::addBeanTypesXml);
+
bool(a.addNamespaceUrisToRoot()).ifPresent(b::addNamespaceUrisToRoot);
+
bool(a.disableAutoDetectNamespaces()).ifPresent(b::disableAutoDetectNamespaces);
+
string(a.defaultNamespace()).map(Namespace::create).ifPresent(b::defaultNamespace);
+
bool(a.enableNamespaces()).ifPresent(b::enableNamespaces);
+
strings(a.namespaces()).map(Namespace::createArray).ifPresent(b::namespaces);
}
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
index 937b3f4f67..358aadbdd8 100644
---
a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
+++
b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestRequest.java
@@ -2548,7 +2548,7 @@ public class RestRequest extends BeanSession implements
HttpUriRequest, Configur
if (HttpHeaders.canCast(value)) {
l.add(HttpHeaders.cast(value));
} else if (value instanceof HeaderList value2) {
- value2.forEach(x -> l.add(x));
+ value2.forEach(l::add);
} else if (value instanceof Collection<?> value3) {
value3.forEach(x -> l.add(HttpHeaders.cast(x)));
} else if (isArray(value)) {
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
index 12e829a906..7bab79a099 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java
@@ -3844,7 +3844,7 @@ public class RestContext extends Context {
beanStore
.getBean(BeanContext.Builder.class)
.map(BeanContext.Builder::copy)
- .ifPresent(x -> v.set(x));
+ .ifPresent(v::set);
// @formatter:on
// Replace with bean from bean store.
@@ -3903,12 +3903,12 @@ public class RestContext extends Context {
var creator = BeanCreator.of(CallLogger.class,
beanStore).type(BasicCallLogger.class);
// Specify the bean type if its set as a default.
- defaultClasses().get(CallLogger.class).ifPresent(x ->
creator.type(x));
+
defaultClasses().get(CallLogger.class).ifPresent(creator::type);
- beanStore.getBean(CallLogger.class).ifPresent(x ->
creator.impl(x));
+
beanStore.getBean(CallLogger.class).ifPresent(creator::impl);
// Replace with bean from: @RestInject public [static]
CallLogger xxx(<args>)
- new BeanCreateMethodFinder<>(CallLogger.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(x ->
creator.impl(x));
+ new BeanCreateMethodFinder<>(CallLogger.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(creator::impl);
return creator;
}
@@ -3952,10 +3952,10 @@ public class RestContext extends Context {
}
// Replace with bean from bean store.
- beanStore.getBean(Config.class).ifPresent(x ->
v.set(x));
+ beanStore.getBean(Config.class).ifPresent(v::set);
// Replace with bean from: @RestInject public [static]
Config xxx(<args>)
- new BeanCreateMethodFinder<>(Config.class,
resource.get(), beanStore).addBean(Config.class,
v.get()).find(Builder::isRestInjectMethod).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(Config.class,
resource.get(), beanStore).addBean(Config.class,
v.get()).find(Builder::isRestInjectMethod).run(v::set);
return v.get();
}
@@ -3974,12 +3974,12 @@ public class RestContext extends Context {
var creator = BeanCreator.of(DebugEnablement.class,
beanStore).type(BasicDebugEnablement.class);
// Specify the bean type if its set as a default.
- defaultClasses().get(DebugEnablement.class).ifPresent(x
-> creator.type(x));
+
defaultClasses().get(DebugEnablement.class).ifPresent(creator::type);
- beanStore.getBean(DebugEnablement.class).ifPresent(x ->
creator.impl(x));
+
beanStore.getBean(DebugEnablement.class).ifPresent(creator::impl);
// Replace with bean from: @RestInject public [static]
DebugEnablement xxx(<args>)
- new BeanCreateMethodFinder<>(DebugEnablement.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(x ->
creator.impl(x));
+ new BeanCreateMethodFinder<>(DebugEnablement.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(creator::impl);
return creator;
}
@@ -3998,10 +3998,10 @@ public class RestContext extends Context {
// Default value.
var v = Value.of(NamedAttributeMap.create());
- beanStore.getBean(NamedAttributeMap.class,
"defaultRequestAttributes").ifPresent(x -> v.set(x));
+ beanStore.getBean(NamedAttributeMap.class,
"defaultRequestAttributes").ifPresent(v::set);
// Replace with bean from:
@RestInject(name="defaultRequestAttributes") public [static] NamedAttributeMap
xxx(<args>)
- new BeanCreateMethodFinder<>(NamedAttributeMap.class,
resource.get(), beanStore).addBean(NamedAttributeMap.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultRequestAttributes")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(NamedAttributeMap.class,
resource.get(), beanStore).addBean(NamedAttributeMap.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultRequestAttributes")).run(v::set);
return v.get();
}
@@ -4021,10 +4021,10 @@ public class RestContext extends Context {
var v = Value.of(HeaderList.create());
// Replace with bean from bean store.
- beanStore.getBean(HeaderList.class,
"defaultRequestHeaders").ifPresent(x -> v.set(x));
+ beanStore.getBean(HeaderList.class,
"defaultRequestHeaders").ifPresent(v::set);
// Replace with bean from:
@RestInject(name="defaultRequestHeaders") public [static] HeaderList xxx(<args>)
- new BeanCreateMethodFinder<>(HeaderList.class,
resource.get(), beanStore).addBean(HeaderList.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultRequestHeaders")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(HeaderList.class,
resource.get(), beanStore).addBean(HeaderList.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultRequestHeaders")).run(v::set);
return v.get();
}
@@ -4044,10 +4044,10 @@ public class RestContext extends Context {
var v = Value.of(HeaderList.create());
// Replace with bean from bean store.
- beanStore.getBean(HeaderList.class,
"defaultResponseHeaders").ifPresent(x -> v.set(x));
+ beanStore.getBean(HeaderList.class,
"defaultResponseHeaders").ifPresent(v::set);
// Replace with bean from:
@RestInject(name="defaultResponseHeaders") public [static] HeaderList
xxx(<args>)
- new BeanCreateMethodFinder<>(HeaderList.class,
resource.get(), beanStore).addBean(HeaderList.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultResponseHeaders")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(HeaderList.class,
resource.get(), beanStore).addBean(HeaderList.class, v.get()).find(x ->
isRestInjectMethod(x, "defaultResponseHeaders")).run(v::set);
return v.get();
}
@@ -4067,7 +4067,7 @@ public class RestContext extends Context {
var v =
Value.of(MethodList.of(getAnnotatedMethods(resource,
RestDestroy.class).toList()));
// Replace with bean from:
@RestInject(name="destroyMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "destroyMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "destroyMethods")).run(v::set);
return v.get();
}
@@ -4119,7 +4119,7 @@ public class RestContext extends Context {
Value<MethodList> v =
Value.of(MethodList.of(getAnnotatedMethods(resource,
RestEndCall.class).toList()));
// Replace with bean from:
@RestInject(name="endCallMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "endCallMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "endCallMethods")).run(v::set);
return v.get();
}
@@ -4143,7 +4143,7 @@ public class RestContext extends Context {
var v = Value.of(JsonSchemaGenerator.create());
// Replace with builder from bean store.
-
beanStore.getBean(JsonSchemaGenerator.Builder.class).map(JsonSchemaGenerator.Builder::copy).ifPresent(x
-> v.set(x));
+
beanStore.getBean(JsonSchemaGenerator.Builder.class).map(JsonSchemaGenerator.Builder::copy).ifPresent(v::set);
// Replace with bean from bean store.
beanStore.getBean(JsonSchemaGenerator.class).ifPresent(x -> v.get().impl(x));
@@ -4176,10 +4176,10 @@ public class RestContext extends Context {
Value<Logger> v =
Value.of(Logger.getLogger(cn(resourceClass)));
// Replace with bean from bean store.
- beanStore.getBean(Logger.class).ifPresent(x ->
v.set(x));
+ beanStore.getBean(Logger.class).ifPresent(v::set);
// Replace with bean from: @RestInject public [static]
Logger xxx(<args>)
- new BeanCreateMethodFinder<>(Logger.class,
resource.get(), beanStore).addBean(Logger.class,
v.get()).find(Builder::isRestInjectMethod).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(Logger.class,
resource.get(), beanStore).addBean(Logger.class,
v.get()).find(Builder::isRestInjectMethod).run(v::set);
return v.get();
}
@@ -4291,7 +4291,7 @@ public class RestContext extends Context {
Value<HttpPartParser.Creator> v =
Value.of(HttpPartParser.creator().type(OpenApiParser.class));
// Replace with builder from bean store.
-
beanStore.getBean(HttpPartParser.Creator.class).map(HttpPartParser.Creator::copy).ifPresent(x
-> v.set(x));
+
beanStore.getBean(HttpPartParser.Creator.class).map(HttpPartParser.Creator::copy).ifPresent(v::set);
// Replace with bean from bean store.
beanStore.getBean(HttpPartParser.class).ifPresent(x ->
v.get().impl(x));
@@ -4327,7 +4327,7 @@ public class RestContext extends Context {
Value<HttpPartSerializer.Creator> v =
Value.of(HttpPartSerializer.creator().type(OpenApiSerializer.class));
// Replace with builder from bean store.
-
beanStore.getBean(HttpPartSerializer.Creator.class).map(Creator::copy).ifPresent(x
-> v.set(x));
+
beanStore.getBean(HttpPartSerializer.Creator.class).map(Creator::copy).ifPresent(v::set);
// Replace with bean from bean store.
beanStore.getBean(HttpPartSerializer.class).ifPresent(x
-> v.get().impl(x));
@@ -4359,7 +4359,7 @@ public class RestContext extends Context {
Value<MethodList> v =
Value.of(MethodList.of(getAnnotatedMethods(resource,
RestPostCall.class).toList()));
// Replace with bean from:
@RestInject(name="postCallMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postCallMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postCallMethods")).run(v::set);
return v.get();
}
@@ -4387,7 +4387,7 @@ public class RestContext extends Context {
.toList()));
// Replace with bean from:
@RestInject(name="postInitChildFirstMethods") public [static] MethodList
xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postInitChildFirstMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postInitChildFirstMethods")).run(v::set);
return v.get();
}
@@ -4415,7 +4415,7 @@ public class RestContext extends Context {
.toList()));
// Replace with bean from:
@RestInject(name="postInitMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postInitMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "postInitMethods")).run(v::set);
return v.get();
}
@@ -4435,7 +4435,7 @@ public class RestContext extends Context {
Value<MethodList> v =
Value.of(MethodList.of(getAnnotatedMethods(resource,
RestPreCall.class).toList()));
// Replace with bean from:
@RestInject(name="preCallMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "preCallMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "preCallMethods")).run(v::set);
return v.get();
}
@@ -4730,7 +4730,7 @@ public class RestContext extends Context {
Value<MethodList> v =
Value.of(MethodList.of(getAnnotatedMethods(resource,
RestStartCall.class).toList()));
// Replace with bean from:
@RestInject(name="startCallMethods") public [static] MethodList xxx(<args>)
- new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "startCallMethods")).run(x -> v.set(x));
+ new BeanCreateMethodFinder<>(MethodList.class,
resource.get(), beanStore).addBean(MethodList.class, v.get()).find(x ->
isRestInjectMethod(x, "startCallMethods")).run(v::set);
return v.get();
}
@@ -4753,12 +4753,12 @@ public class RestContext extends Context {
var creator = BeanCreator.of(StaticFiles.class,
beanStore).type(BasicStaticFiles.class);
// Specify the bean type if its set as a default.
- defaultClasses().get(StaticFiles.class).ifPresent(x ->
creator.type(x));
+
defaultClasses().get(StaticFiles.class).ifPresent(creator::type);
- beanStore.getBean(StaticFiles.class).ifPresent(x ->
creator.impl(x));
+
beanStore.getBean(StaticFiles.class).ifPresent(creator::impl);
// Replace with bean from: @RestInject public [static]
StaticFiles xxx(<args>)
- new BeanCreateMethodFinder<>(StaticFiles.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(x ->
creator.impl(x));
+ new BeanCreateMethodFinder<>(StaticFiles.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(creator::impl);
return creator;
}
@@ -4802,12 +4802,12 @@ public class RestContext extends Context {
var creator = BeanCreator.of(SwaggerProvider.class,
beanStore).type(BasicSwaggerProvider.class);
// Specify the bean type if its set as a default.
- defaultClasses().get(SwaggerProvider.class).ifPresent(x
-> creator.type(x));
+
defaultClasses().get(SwaggerProvider.class).ifPresent(creator::type);
- beanStore.getBean(SwaggerProvider.class).ifPresent(x ->
creator.impl(x));
+
beanStore.getBean(SwaggerProvider.class).ifPresent(creator::impl);
// Replace with bean from: @RestInject public [static]
SwaggerProvider xxx(<args>)
- new BeanCreateMethodFinder<>(SwaggerProvider.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(x ->
creator.impl(x));
+ new BeanCreateMethodFinder<>(SwaggerProvider.class,
resource.get(), beanStore).find(Builder::isRestInjectMethod).run(creator::impl);
return creator;
}
@@ -5879,7 +5879,7 @@ public class RestContext extends Context {
return v == null ? false : super.contains(v);
}
};
- StringUtils.split(value, x -> s.add(x));
+ StringUtils.split(value, s::add);
return u(s);
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
index 7ff56b6eb0..95f3fc678f 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestOpContext.java
@@ -1556,7 +1556,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var bs =
BasicBeanStore.of(beanStore).addBean(NamedAttributeMap.class, v.get());
new BeanCreateMethodFinder<>(NamedAttributeMap.class,
resource, bs)
.find(x -> matches(x,
"defaultRequestAttributes"))
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
@@ -1582,7 +1582,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var bs =
BasicBeanStore.of(beanStore).addBean(PartList.class, v.get());
new BeanCreateMethodFinder<>(PartList.class, resource,
bs)
.find(x -> matches(x, "defaultRequestFormData"))
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
@@ -1608,7 +1608,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var bs =
BasicBeanStore.of(beanStore).addBean(HeaderList.class, v.get());
new BeanCreateMethodFinder<>(HeaderList.class,
resource, bs)
.find(x -> matches(x, "defaultRequestHeaders"))
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
@@ -1634,7 +1634,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var bs =
BasicBeanStore.of(beanStore).addBean(PartList.class, v.get());
new BeanCreateMethodFinder<>(PartList.class, resource,
bs)
.find(x -> matches(x,
"defaultRequestQueryData"))
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
@@ -1660,7 +1660,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
var bs =
BasicBeanStore.of(beanStore).addBean(HeaderList.class, v.get());
new BeanCreateMethodFinder<>(HeaderList.class,
resource, bs)
.find(x -> matches(x, "defaultResponseHeaders"))
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
@@ -1738,7 +1738,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
// @formatter:off
new BeanCreateMethodFinder<>(RestGuardList.class,
resource.get(), beanStore)
.addBean(RestGuardList.Builder.class, v.get())
- .find(m -> this.matches(m))
+ .find(this::matches)
.run(x -> v.get().impl(x));
// @formatter:on
@@ -2018,7 +2018,7 @@ public class RestOpContext extends Context implements
Comparable<RestOpContext>
new BeanCreateMethodFinder<>(UrlPathMatcherList.class,
resource().get(), beanStore())
.addBean(UrlPathMatcherList.class, v.get())
.find(this::matches)
- .run(x -> v.set(x));
+ .run(v::set);
// @formatter:on
return v.get();
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
index facdcf00bf..d374cf7210 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestAnnotation.java
@@ -668,34 +668,34 @@ public class RestAnnotation {
classes(a.parsers()).ifPresent(x -> b.parsers().add(x));
type(a.partSerializer()).ifPresent(x ->
b.partSerializer().type(x));
type(a.partParser()).ifPresent(x ->
b.partParser().type(x));
- stream(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
- stream(a.consumes()).map(MediaType::of).forEach(x ->
b.consumes(x));
-
stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x
-> b.defaultRequestAttributes(x));
-
stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x ->
b.defaultRequestHeaders(x));
-
stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x ->
b.defaultResponseHeaders(x));
-
string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x ->
b.defaultRequestHeaders(x));
-
string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x ->
b.defaultRequestHeaders(x));
+
stream(a.produces()).map(MediaType::of).forEach(b::produces);
+
stream(a.consumes()).map(MediaType::of).forEach(b::consumes);
+
stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(b::defaultRequestAttributes);
+
stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(b::defaultRequestHeaders);
+
stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(b::defaultResponseHeaders);
+
string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(b::defaultRequestHeaders);
+
string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(b::defaultRequestHeaders);
b.responseProcessors().add(a.responseProcessors());
b.children((java.lang.Object[])a.children());
b.restOpArgs(a.restOpArgs());
classes(a.encoders()).ifPresent(x ->
b.encoders().add(x));
- string(a.uriContext()).ifPresent(x -> b.uriContext(x));
- string(a.uriAuthority()).ifPresent(x ->
b.uriAuthority(x));
-
string(a.uriRelativity()).map(UriRelativity::valueOf).ifPresent(x ->
b.uriRelativity(x));
-
string(a.uriResolution()).map(UriResolution::valueOf).ifPresent(x ->
b.uriResolution(x));
+ string(a.uriContext()).ifPresent(b::uriContext);
+ string(a.uriAuthority()).ifPresent(b::uriAuthority);
+
string(a.uriRelativity()).map(UriRelativity::valueOf).ifPresent(b::uriRelativity);
+
string(a.uriResolution()).map(UriResolution::valueOf).ifPresent(b::uriResolution);
b.messages().location(string(a.messages()).orElse(null));
type(a.staticFiles()).ifPresent(x ->
b.staticFiles().type(x));
- string(a.path()).ifPresent(x -> b.path(x));
- string(a.clientVersionHeader()).ifPresent(x ->
b.clientVersionHeader(x));
+ string(a.path()).ifPresent(b::path);
+
string(a.clientVersionHeader()).ifPresent(b::clientVersionHeader);
type(a.callLogger()).ifPresent(x ->
b.callLogger().type(x));
- type(a.swaggerProvider()).ifPresent(x ->
b.swaggerProvider(x));
- type(a.restChildrenClass()).ifPresent(x ->
b.restChildrenClass(x));
+ type(a.swaggerProvider()).ifPresent(b::swaggerProvider);
+
type(a.restChildrenClass()).ifPresent(b::restChildrenClass);
type(a.debugEnablement()).ifPresent(x ->
b.debugEnablement().type(x));
-
string(a.disableContentParam()).map(Boolean::parseBoolean).ifPresent(x ->
b.disableContentParam(x));
- string(a.allowedHeaderParams()).ifPresent(x ->
b.allowedHeaderParams(x));
- string(a.allowedMethodHeaders()).ifPresent(x ->
b.allowedMethodHeaders(x));
- string(a.allowedMethodParams()).ifPresent(x ->
b.allowedMethodParams(x));
- bool(a.renderResponseStackTraces()).ifPresent(x ->
b.renderResponseStackTraces(x));
+
string(a.disableContentParam()).map(Boolean::parseBoolean).ifPresent(b::disableContentParam);
+
string(a.allowedHeaderParams()).ifPresent(b::allowedHeaderParams);
+
string(a.allowedMethodHeaders()).ifPresent(b::allowedMethodHeaders);
+
string(a.allowedMethodParams()).ifPresent(b::allowedMethodParams);
+
bool(a.renderResponseStackTraces()).ifPresent(b::renderResponseStackTraces);
}
}
@@ -717,14 +717,14 @@ public class RestAnnotation {
public void apply(AnnotationInfo<Rest> ai,
RestOpContext.Builder b) {
Rest a = ai.inner();
- stream(a.produces()).map(MediaType::of).forEach(x ->
b.produces(x));
- stream(a.consumes()).map(MediaType::of).forEach(x ->
b.consumes(x));
+
stream(a.produces()).map(MediaType::of).forEach(b::produces);
+
stream(a.consumes()).map(MediaType::of).forEach(b::consumes);
b.converters().append(a.converters());
b.guards().append(a.guards());
-
string(a.defaultCharset()).map(Charset::forName).ifPresent(x ->
b.defaultCharset(x));
- string(a.maxInput()).ifPresent(x -> b.maxInput(x));
- cdl(a.rolesDeclared()).forEach(x -> b.rolesDeclared(x));
- string(a.roleGuard()).ifPresent(x -> b.roleGuard(x));
+
string(a.defaultCharset()).map(Charset::forName).ifPresent(b::defaultCharset);
+ string(a.maxInput()).ifPresent(b::maxInput);
+ cdl(a.rolesDeclared()).forEach(b::rolesDeclared);
+ string(a.roleGuard()).ifPresent(b::roleGuard);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
index 07d2501eae..6ac587664e 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPostAnnotation.java
@@ -453,10 +453,10 @@ public class RestPostAnnotation {
string(a.defaultCharset()).map(Charset::forName).ifPresent(b::defaultCharset);
string(a.maxInput()).ifPresent(b::maxInput);
stream(a.path()).forEach(b::path);
- string(a.value()).ifPresent(x -> b.path(x));
+ string(a.value()).ifPresent(b::path);
cdl(a.rolesDeclared()).forEach(b::rolesDeclared);
string(a.roleGuard()).ifPresent(b::roleGuard);
-
string(a.debug()).map(Enablement::fromString).ifPresent(x -> b.debug(x));
+
string(a.debug()).map(Enablement::fromString).ifPresent(b::debug);
}
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
index 282e37babc..b09ae9f827 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/FormDataArg.java
@@ -192,7 +192,7 @@ public class FormDataArg implements RestOpArg {
if (multi) {
Collection c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
- rh.getAll(name).stream().map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(x ->
c.add(x));
+ rh.getAll(name).stream().map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(c::add);
return cm.isArray() ? toArray(c,
cm.getElementType().inner()) : c;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
index 7d35e50550..505885e235 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HeaderArg.java
@@ -238,7 +238,7 @@ public class HeaderArg implements RestOpArg {
if (multi) {
var c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
- rh.stream(name).map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(x ->
c.add(x));
+ rh.stream(name).map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(c::add);
return cm.isArray() ? toArray(c,
cm.getElementType().inner()) : c;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
index 1f692d3608..f3a71e5d49 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/QueryArg.java
@@ -193,7 +193,7 @@ public class QueryArg implements RestOpArg {
if (multi) {
var c = cm.isArray() ? list() :
(Collection)(cm.canCreateNewInstance() ? cm.newInstance() : new JsonList());
- rh.getAll(name).stream().map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(x ->
c.add(x));
+ rh.getAll(name).stream().map(x ->
x.parser(ps).schema(schema).as(cm.getElementType()).orElse(null)).forEach(c::add);
return cm.isArray() ? toArray(c,
cm.getElementType().inner()) : c;
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
index 6752e43dac..fbc47ad8f9 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpSessionArgs.java
@@ -57,6 +57,6 @@ public class RestOpSessionArgs extends SimpleRestOperationArg
{
* @param function The function for finding the arg.
*/
protected <T> RestOpSessionArgs(ThrowingFunction<RestOpSession,T>
function) {
- super(session -> function.apply(session));
+ super(function::apply);
}
}
\ No newline at end of file
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleBasedRestGuard.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleBasedRestGuard.java
index 3f2d304abc..34afa218b3 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleBasedRestGuard.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RoleBasedRestGuard.java
@@ -72,7 +72,7 @@ public class RoleBasedRestGuard extends RestGuard {
@Override
public boolean isRequestAllowed(RestRequest req) {
- Set<String> userRoles = roles.stream().filter(x ->
req.isUserInRole(x)).collect(Collectors.toSet());
+ Set<String> userRoles =
roles.stream().filter(req::isUserInRole).collect(Collectors.toSet());
return roleMatcher.matches(userRoles);
}
}
\ No newline at end of file
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 aef3d57b7c..698b2ce3e7 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
@@ -377,7 +377,7 @@ public class RequestHeaders extends
ArrayList<RequestHeader> {
public RequestHeader getLast(String name) {
assertArgNotNull("name", name);
var v = Value.<RequestHeader>empty();
- stream(name).forEach(x -> v.set(x));
+ stream(name).forEach(v::set);
return v.orElseGet(() -> new RequestHeader(req, name,
null).parser(parser));
}
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 383097564e..41e1fb9873 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
@@ -377,7 +377,7 @@ public class RequestPathParams extends
ArrayList<RequestPathParam> {
public RequestPathParam getLast(String name) {
assertArgNotNull("name", name);
var v = Value.<RequestPathParam>empty();
- stream(name).forEach(x -> v.set(x));
+ stream(name).forEach(v::set);
return v.orElseGet(() -> new RequestPathParam(req, name,
null).parser(parser));
}
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 c0e751c84d..0de7adc958 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
@@ -411,7 +411,7 @@ public class RequestQueryParams extends
ArrayList<RequestQueryParam> {
public RequestQueryParam getLast(String name) {
assertArgNotNull("name", name);
var v = Value.<RequestQueryParam>empty();
- stream(name).forEach(x -> v.set(x));
+ stream(name).forEach(v::set);
return v.orElseGet(() -> new RequestQueryParam(req, name,
null).parser(parser));
}
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
index 3cb322427a..56680e342b 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/HttpResourceProcessor.java
@@ -47,7 +47,7 @@ public class HttpResourceProcessor implements
ResponseProcessor {
if (contentLength >= 0)
res.setHeader(contentLength(contentLength));
- r.getHeaders().forEach(x -> res.addHeader(x));
+ r.getHeaders().forEach(res::addHeader);
try (var os = res.getNegotiatedOutputStream()) {
r.writeTo(os);
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
index 3b496ab148..c9a2d32c11 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/RequestSwaggerVar.java
@@ -98,7 +98,7 @@ public class RequestSwaggerVar extends MultipartResolvingVar {
char c = charAt(key, 0);
if (c == 'c') {
if ("contact".equals(key))
- return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getContact()).map(o
-> s(o)).orElse(null);
+ return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getContact()).map(x
-> s(x)).orElse(null);
} else if (c == 'd') {
if ("description".equals(key))
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getDescription()).orElse(null);
@@ -107,7 +107,7 @@ public class RequestSwaggerVar extends
MultipartResolvingVar {
return
swagger.map(Swagger::getExternalDocs).map(ExternalDocumentation::toString).orElse(null);
} else if (c == 'l') {
if ("license".equals(key))
- return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getLicense()).map(o
-> s(o)).orElse(null);
+ return
swagger.map(Swagger::getInfo).map(x -> x == null ? null : x.getLicense()).map(x
-> s(x)).orElse(null);
} else if (c == 'o') {
if ("operationDescription".equals(key))
return
methodSwagger.map(Operation::getDescription).orElse(null);
@@ -118,7 +118,7 @@ public class RequestSwaggerVar extends
MultipartResolvingVar {
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getSiteName()).orElse(null);
} else if (c == 't') {
if ("tags".equals(key))
- return
swagger.map(Swagger::getTags).map(x -> s.toString(x)).orElse(null);
+ return
swagger.map(Swagger::getTags).map(s::toString).orElse(null);
if ("termsOfService".equals(key))
return
swagger.map(Swagger::getInfo).map(x -> x == null ? null :
x.getTermsOfService()).orElse(null);
if ("title".equals(key))
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
index 5999713ad3..d091984c92 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiList_Test.java
@@ -143,10 +143,10 @@ class MultiList_Test extends TestBase {
assertEmpty(ml);
var emptyMultiList = new MultiList<String>();
var iterator = emptyMultiList.iterator();
- assertThrows(NoSuchElementException.class, () ->
iterator.next());
+ assertThrows(NoSuchElementException.class, iterator::next);
var emptyMultiList2 = new MultiList<String>();
var iterator2 = emptyMultiList2.iterator();
- assertThrows(IllegalStateException.class, () ->
iterator2.remove());
+ assertThrows(IllegalStateException.class, iterator2::remove);
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
index ef692c967b..8c5ace52b0 100644
---
a/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
+++
b/juneau-utest/src/test/java/org/apache/juneau/commons/collections/MultiSet_Test.java
@@ -121,10 +121,10 @@ class MultiSet_Test extends TestBase {
assertThrows(IllegalArgumentException.class, ()->new
MultiSet<>((Collection<String>)null));
var emptyMultiSet = new MultiSet<String>();
var iterator = emptyMultiSet.iterator();
- assertThrows(NoSuchElementException.class, ()->iterator.next());
+ assertThrows(NoSuchElementException.class, iterator::next);
var emptyMultiSet2 = new MultiSet<String>();
var iterator2 = emptyMultiSet2.iterator();
- assertThrows(NoSuchElementException.class,
()->iterator2.remove());
+ assertThrows(NoSuchElementException.class, iterator2::remove);
}
@Test
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
index e08e091dc2..e5bb49f24f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/Config_Test.java
@@ -397,13 +397,13 @@ class Config_Test extends TestBase {
var c = init("a1=foo", "a2=2.3", "a3=[1]", "a4=false");
var a1Entry = c.get("a1");
- assertThrows(NumberFormatException.class, ()->a1Entry.asLong());
+ assertThrows(NumberFormatException.class, a1Entry::asLong);
var a2Entry = c.get("a2");
- assertThrows(NumberFormatException.class, ()->a2Entry.asLong());
+ assertThrows(NumberFormatException.class, a2Entry::asLong);
var a3Entry = c.get("a3");
- assertThrows(NumberFormatException.class, ()->a3Entry.asLong());
+ assertThrows(NumberFormatException.class, a3Entry::asLong);
var a4Entry = c.get("a4");
- assertThrows(NumberFormatException.class, ()->a4Entry.asLong());
+ assertThrows(NumberFormatException.class, a4Entry::asLong);
}
//====================================================================================================
