You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/06/24 03:48:52 UTC
[juneau] 16/29: Remove unused imports
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 62d651301c435e422cc1b67f26fb8cb57a22e183
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:22:07 2023 -0400
Remove unused imports
---
.../juneau/assertions/AssertionPredicate.java | 3 +-
.../juneau/assertions/FluentArrayAssertion.java | 2 +-
.../assertions/FluentCollectionAssertion.java | 4 +--
.../assertions/FluentPrimitiveArrayAssertion.java | 16 ++++-----
.../assertions/FluentStringListAssertion.java | 2 +-
.../apache/juneau/common/internal/StringUtils.java | 4 +--
.../apache/juneau/config/internal/ConfigMap.java | 4 +--
.../apache/juneau/dto/jsonschema/JsonSchema.java | 4 +--
.../java/org/apache/juneau/AnnotationApplier.java | 7 ++--
.../java/org/apache/juneau/AnnotationProvider.java | 10 +++---
.../src/main/java/org/apache/juneau/BeanMap.java | 4 +--
.../main/java/org/apache/juneau/BeanRegistry.java | 4 +--
.../src/main/java/org/apache/juneau/ClassMeta.java | 8 ++---
.../src/main/java/org/apache/juneau/Context.java | 2 +-
.../org/apache/juneau/collections/JsonList.java | 2 +-
.../org/apache/juneau/collections/JsonMap.java | 4 +--
.../java/org/apache/juneau/cp/BasicFileFinder.java | 4 +--
.../java/org/apache/juneau/cp/BeanCreator.java | 4 +--
.../main/java/org/apache/juneau/cp/BeanStore.java | 4 +--
.../main/java/org/apache/juneau/cp/FileFinder.java | 4 +--
.../apache/juneau/csv/CsvSerializerSession.java | 4 +--
.../org/apache/juneau/encoders/EncoderSet.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../org/apache/juneau/httppart/HttpPartSchema.java | 4 +--
.../org/apache/juneau/internal/ClassUtils.java | 2 +-
.../java/org/apache/juneau/internal/SystemEnv.java | 4 +--
.../java/org/apache/juneau/parser/ParserSet.java | 8 ++---
.../apache/juneau/serializer/SerializerSet.java | 8 ++---
.../juneau/urlencoding/UrlEncodingClassMeta.java | 2 +-
.../apache/juneau/xml/XmlSerializerSession.java | 6 ++--
.../microservice/jetty/JettyMicroservice.java | 4 +--
.../apache/juneau/rest/client/ResponseContent.java | 4 +--
.../org/apache/juneau/rest/client/RestClient.java | 34 +++++++++---------
.../org/apache/juneau/rest/client/RestRequest.java | 6 ++--
.../org/apache/juneau/http/header/HeaderList.java | 8 ++---
.../java/org/apache/juneau/http/part/PartList.java | 8 ++---
.../juneau/rest/mock/MockServletRequest.java | 4 +--
.../java/org/apache/juneau/rest/RestContext.java | 11 +++---
.../java/org/apache/juneau/rest/RestOpContext.java | 40 +++++++++++-----------
.../juneau/rest/annotation/RestAnnotation.java | 12 +++----
.../rest/annotation/RestDeleteAnnotation.java | 15 ++++----
.../juneau/rest/annotation/RestGetAnnotation.java | 15 ++++----
.../juneau/rest/annotation/RestOpAnnotation.java | 19 +++++-----
.../rest/annotation/RestOptionsAnnotation.java | 15 ++++----
.../rest/annotation/RestPatchAnnotation.java | 19 +++++-----
.../juneau/rest/annotation/RestPostAnnotation.java | 19 +++++-----
.../juneau/rest/annotation/RestPutAnnotation.java | 19 +++++-----
.../org/apache/juneau/rest/arg/HasFormDataArg.java | 2 +-
.../org/apache/juneau/rest/arg/HasQueryArg.java | 2 +-
.../juneau/rest/arg/HttpServletRequestArgs.java | 8 ++---
.../juneau/rest/arg/HttpServletResponseArgs.java | 2 +-
.../apache/juneau/rest/arg/HttpSessionArgs.java | 2 +-
.../juneau/rest/arg/InputStreamParserArg.java | 2 +-
.../java/org/apache/juneau/rest/arg/ParserArg.java | 2 +-
.../apache/juneau/rest/arg/ReaderParserArg.java | 2 +-
.../apache/juneau/rest/arg/RestContextArgs.java | 26 +++++++-------
.../apache/juneau/rest/arg/RestOpContextArgs.java | 8 ++---
.../apache/juneau/rest/arg/RestOpSessionArgs.java | 4 +--
.../apache/juneau/rest/arg/RestRequestArgs.java | 36 +++++++++----------
.../apache/juneau/rest/arg/RestResponseArgs.java | 8 ++---
.../apache/juneau/rest/arg/RestSessionArgs.java | 6 ++--
.../juneau/rest/converter/RestConverterList.java | 2 +-
.../apache/juneau/rest/guard/RestGuardList.java | 2 +-
.../juneau/rest/httppart/RequestFormParams.java | 6 ++--
.../juneau/rest/httppart/RequestHeaders.java | 4 +--
.../juneau/rest/httppart/RequestPathParams.java | 4 +--
.../juneau/rest/httppart/RequestQueryParams.java | 4 +--
.../juneau/rest/matcher/RestMatcherList.java | 4 +--
.../org/apache/juneau/rest/stats/ThrownStore.java | 6 ++--
.../juneau/rest/swagger/SwaggerProvider.java | 8 ++---
.../juneau/testutils/MockStreamSerializer.java | 2 +-
.../juneau/testutils/MockWriterSerializer.java | 2 +-
.../java/org/apache/juneau/BeanContextTest.java | 2 +-
.../java/org/apache/juneau/BeanMapErrorsTest.java | 9 ++---
.../juneau/BeanTraversePropertiesComboTest.java | 5 +--
.../test/java/org/apache/juneau/BenchmarkTest.java | 2 +-
.../juneau/SerializerPropertiesComboTest.java | 21 ++++++------
.../java/org/apache/juneau/cp/BeanStore_Test.java | 4 +--
.../juneau/http/SerializedHttpEntity_Test.java | 5 +--
.../org/apache/juneau/http/remote/Remote_Test.java | 3 +-
.../juneau/json/JsonConfigAnnotationTest.java | 2 +-
.../msgpack/MsgPackConfigAnnotationTest.java | 2 +-
.../org/apache/juneau/reflect/ClassInfoTest.java | 2 +-
.../apache/juneau/reflect/ConstructorInfoTest.java | 2 +-
.../apache/juneau/reflect/ExecutableInfoTest.java | 18 +++++-----
.../Rest_DefaultRequestAttributes_Test.java | 2 +-
.../rest/client/RestClient_BasicCalls_Test.java | 3 +-
.../juneau/rest/client/RestClient_Body_Test.java | 2 +-
.../client/RestClient_Config_BeanContext_Test.java | 3 +-
.../client/RestClient_Config_OpenApi_Test.java | 3 +-
.../client/RestClient_Config_RestClient_Test.java | 4 +--
.../rest/client/RestClient_Headers_Test.java | 3 +-
.../client/RestClient_Response_Headers_Test.java | 3 +-
.../rest/test/client/ThirdPartyProxyTest.java | 8 ++---
.../juneau/soap/SoapXmlConfigAnnotationTest.java | 2 +-
.../apache/juneau/transforms/ObjectSwapTest.java | 3 +-
.../apache/juneau/uon/UonConfigAnnotationTest.java | 2 +-
.../UrlEncodingConfigAnnotationTest.java | 2 +-
98 files changed, 334 insertions(+), 327 deletions(-)
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
index 8a1aa0e40..399dbb7dc 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/AssertionPredicate.java
@@ -17,6 +17,7 @@ import static org.apache.juneau.common.internal.StringUtils.*;
import java.text.*;
import java.util.function.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.cp.*;
/**
@@ -62,7 +63,7 @@ public class AssertionPredicate<T> implements Predicate<T> {
/**
* Argument placeholder for tested value.
*/
- public static final Function<Object,String> VALUE = x -> stringifyDeep(x);
+ public static final Function<Object,String> VALUE = StringUtils::stringifyDeep;
private static final Messages MESSAGES = Messages.of(AssertionPredicate.class, "Messages");
private static final String
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
index b194b0ac6..023999fb7 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentArrayAssertion.java
@@ -191,7 +191,7 @@ public class FluentArrayAssertion<E,R> extends FluentObjectAssertion<E[],R> {
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : stream(value()).map(x -> stringify(x)).collect(Collectors.toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : stream(value()).map(StringUtils::stringify).collect(Collectors.toList()), returns());
}
/**
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index db290ce62..fb776768e 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.assertions;
-import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
@@ -20,6 +19,7 @@ import java.util.*;
import java.util.function.*;
import java.util.stream.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.cp.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.serializer.*;
@@ -172,7 +172,7 @@ public class FluentCollectionAssertion<E,R> extends FluentObjectAssertion<Collec
* @return A new fluent string assertion.
*/
public FluentStringListAssertion<R> asStrings() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(x -> stringify(x)).collect(Collectors.toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(StringUtils::stringify).collect(Collectors.toList()), returns());
}
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index c15578a1c..77a4d43fa 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -115,14 +115,14 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends FluentObjectAssertion<
private static final Map<Class<?>,Function<Object,String>> STRINGIFIERS = new HashMap<>();
static {
- STRINGIFIERS.put(boolean.class, (x) -> Arrays.toString((boolean[])x));
- STRINGIFIERS.put(byte.class, (x) -> Arrays.toString((byte[])x));
- STRINGIFIERS.put(char.class, (x) -> Arrays.toString((char[])x));
- STRINGIFIERS.put(double.class, (x) -> Arrays.toString((double[])x));
- STRINGIFIERS.put(float.class, (x) -> Arrays.toString((float[])x));
- STRINGIFIERS.put(int.class, (x) -> Arrays.toString((int[])x));
- STRINGIFIERS.put(long.class, (x) -> Arrays.toString((long[])x));
- STRINGIFIERS.put(short.class, (x) -> Arrays.toString((short[])x));
+ STRINGIFIERS.put(boolean.class, x -> Arrays.toString((boolean[])x));
+ STRINGIFIERS.put(byte.class, x -> Arrays.toString((byte[])x));
+ STRINGIFIERS.put(char.class, x -> Arrays.toString((char[])x));
+ STRINGIFIERS.put(double.class, x -> Arrays.toString((double[])x));
+ STRINGIFIERS.put(float.class, x -> Arrays.toString((float[])x));
+ STRINGIFIERS.put(int.class, x -> Arrays.toString((int[])x));
+ STRINGIFIERS.put(long.class, x -> Arrays.toString((long[])x));
+ STRINGIFIERS.put(short.class, x -> Arrays.toString((short[])x));
}
private static final Messages MESSAGES = Messages.of(FluentPrimitiveArrayAssertion.class, "Messages");
diff --git a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
index 028d55b79..b392c18b4 100644
--- a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
+++ b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringListAssertion.java
@@ -204,7 +204,7 @@ public class FluentStringListAssertion<R> extends FluentListAssertion<String,R>
* @return A new assertion.
*/
public FluentStringListAssertion<R> asTrimmed() {
- return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(x -> StringUtils.trim(x)).collect(toList()), returns());
+ return new FluentStringListAssertion<>(this, valueIsNull() ? null : value().stream().map(StringUtils::trim).collect(toList()), returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 23b1d743c..d31e425cf 100644
--- a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++ b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -41,7 +41,7 @@ public final class StringUtils {
/**
* Predicate check to filter out null and empty strings.
*/
- public static final Predicate<String> NOT_EMPTY = x -> isNotEmpty(x);
+ public static final Predicate<String> NOT_EMPTY = StringUtils::isNotEmpty;
private static final AsciiSet numberChars = AsciiSet.create("-xX.+-#pP0123456789abcdefABCDEF");
private static final AsciiSet firstNumberChars =AsciiSet.create("+-.#0123456789");
@@ -2273,7 +2273,7 @@ public final class StringUtils {
if (o instanceof Method)
return Method.class.cast(o).getName();
if (o.getClass().isArray())
- return arrayAsList(o).stream().map(x -> convertToReadable(x)).collect(Collectors.joining(", ", "[", "]"));
+ return arrayAsList(o).stream().map(StringUtils::convertToReadable).collect(Collectors.joining(", ", "[", "]"));
return o.toString();
}
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index e11ee8df3..781aeeae4 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -80,7 +80,7 @@ public class ConfigMap implements ConfigStoreListener {
entries.clear();
oentries.clear();
- imports.forEach(x -> x.unregisterAll());
+ imports.forEach(Import::unregisterAll);
imports.clear();
Map<String,ConfigMap> imports = map();
@@ -904,7 +904,7 @@ public class ConfigMap implements ConfigStoreListener {
}
synchronized Import register(Collection<ConfigEventListener> listeners) {
- listeners.forEach(x -> register(x));
+ listeners.forEach(this::register);
return this;
}
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
index f515a0c80..a626e17e1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/JsonSchema.java
@@ -1375,12 +1375,12 @@ public class JsonSchema {
private void setMasterOn(Collection<JsonSchema> ss) {
if (ss != null)
- ss.forEach(x -> setMasterOn(x));
+ ss.forEach(this::setMasterOn);
}
private void setMasterOn(JsonSchemaArray ss) {
if (ss != null)
- ss.forEach(x -> setMasterOn(x));
+ ss.forEach(this::setMasterOn);
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
index 5d2b1cc1b..2f1ca17c2 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationApplier.java
@@ -22,6 +22,7 @@ import java.util.*;
import java.util.stream.*;
import org.apache.juneau.annotation.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.reflect.*;
import org.apache.juneau.svl.*;
@@ -169,7 +170,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return The array wrapped in an {@link Optional}.
*/
protected Optional<String[]> strings(String[] in) {
- return optional(in.length == 0 ? null : Arrays.stream(in).map(x -> vr.resolve(x)).filter(x -> isNotEmpty(x)).toArray(String[]::new));
+ return optional(in.length == 0 ? null : Arrays.stream(in).map(x -> vr.resolve(x)).filter(StringUtils::isNotEmpty).toArray(String[]::new));
}
/**
@@ -179,7 +180,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> stream(String[] in) {
- return Arrays.stream(in).map(x -> vr.resolve(x)).filter(x -> isNotEmpty(x));
+ return Arrays.stream(in).map(x -> vr.resolve(x)).filter(StringUtils::isNotEmpty);
}
/**
@@ -189,7 +190,7 @@ public abstract class AnnotationApplier<A extends Annotation, B> {
* @return An array with resolved strings.
*/
protected Stream<String> cdl(String in) {
- return Arrays.stream(split(vr.resolve(in))).filter(x -> isNotEmpty(x));
+ return Arrays.stream(split(vr.resolve(in))).filter(StringUtils::isNotEmpty);
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
index 6139ff184..0ab895670 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/AnnotationProvider.java
@@ -39,11 +39,11 @@ public interface AnnotationProvider {
@SuppressWarnings("unchecked")
public static final AnnotationProvider DEFAULT = new AnnotationProvider() {
- private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getDeclaredAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Method,Class<? extends Annotation>,Annotation[]> methodAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Field,Class<? extends Annotation>,Annotation[]> fieldAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
- private final TwoKeyConcurrentCache<Constructor<?>,Class<? extends Annotation>,Annotation[]> constructorAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, (k1,k2) -> k1.getAnnotationsByType(k2));
+ private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> classAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Class<?>,Class<? extends Annotation>,Annotation[]> declaredClassAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Class::getDeclaredAnnotationsByType);
+ private final TwoKeyConcurrentCache<Method,Class<? extends Annotation>,Annotation[]> methodAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Method::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Field,Class<? extends Annotation>,Annotation[]> fieldAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Field::getAnnotationsByType);
+ private final TwoKeyConcurrentCache<Constructor<?>,Class<? extends Annotation>,Annotation[]> constructorAnnotationCache = new TwoKeyConcurrentCache<>(DISABLE_ANNOTATION_CACHING, Constructor::getAnnotationsByType);
@Override /* MetaProvider */
public <A extends Annotation> void forEachAnnotation(Class<A> type, Class<?> onClass, Predicate<A> filter, Consumer<A> action) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index 37eeeecd6..168f7bd83 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -498,7 +498,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
// Normal bean.
if (meta.dynaProperty == null) {
- forEachProperty(x -> x.canRead(), bpm -> {
+ forEachProperty(BeanPropertyMeta::canRead, bpm -> {
try {
Object val = bpm.get(this, null);
if (valueFilter.test(val))
@@ -526,7 +526,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
}
});
- forEachProperty(x -> x.isDyna(), bpm -> {
+ forEachProperty(BeanPropertyMeta::isDyna, bpm -> {
try {
// TODO - This is kind of inefficient.
Map<String,Object> dynaMap = bpm.getDynaMap(bean);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index c334d823a..0eb4c9fbe 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -55,9 +55,9 @@ public class BeanRegistry {
this.beanContext = beanContext;
this.map = new ConcurrentHashMap<>();
this.reverseMap = new ConcurrentHashMap<>();
- beanContext.getBeanDictionary().forEach(c -> addClass(c));
+ beanContext.getBeanDictionary().forEach(this::addClass);
if (parent != null)
- parent.map.forEach((k,v) -> addToMap(k, v));
+ parent.map.forEach(this::addToMap);
for (Class<?> c : classes)
addClass(c);
isEmpty = map.isEmpty();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 1068d6d39..109f897c6 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -447,7 +447,7 @@ public final class ClassMeta<T> implements Type {
&& x.hasReturnType(c)
&& x.hasParamTypes(String.class)
&& ArrayUtils.contains(x.getName(), fromStringMethodNames))
- ).map(x -> x.inner())
+ ).map(MethodInfo::inner)
.orElse(null);
// Find example() method if present.
@@ -457,7 +457,7 @@ public final class ClassMeta<T> implements Type {
&& x.isNotDeprecated()
&& x.hasName("example")
&& x.hasFuzzyParamTypes(BeanSession.class))
- ).map(x -> x.inner())
+ ).map(MethodInfo::inner)
.orElse(null);
ci.forEachAllField(x -> x.hasAnnotation(bc, ParentProperty.class), x -> {
@@ -521,7 +521,7 @@ public final class ClassMeta<T> implements Type {
primitiveDefault = ci.getPrimitiveDefault();
ci.forEachPublicMethod(
- x -> x.isNotDeprecated(),
+ MethodInfo::isNotDeprecated,
x -> publicMethods.put(x.getSignature(), x.inner())
);
@@ -549,7 +549,7 @@ public final class ClassMeta<T> implements Type {
if (innerClass != Object.class) {
ClassInfo x = implClass == null ? ci : ClassInfo.of(implClass);
- noArgConstructor = x.getPublicConstructor(y -> y.hasNoParams());
+ noArgConstructor = x.getPublicConstructor(ConstructorInfo::hasNoParams);
}
try {
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 c72d90569..8ab5a7790 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
@@ -842,7 +842,7 @@ public abstract class Context implements AnnotationProvider {
protected Context(Builder builder) {
init(builder);
debug = builder.debug;
- annotations = optional(builder.annotations).orElseGet(()->emptyList());
+ annotations = optional(builder.annotations).orElseGet(CollectionUtils::emptyList);
ReflectionMap.Builder<Annotation> rmb = ReflectionMap.create(Annotation.class);
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
index 077cf55fd..373e5556c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonList.java
@@ -1023,7 +1023,7 @@ public class JsonList extends LinkedList<Object> {
UnmodifiableJsonList(JsonList contents) {
super();
if (contents != null)
- this.forEach(x -> super.add(x));
+ this.forEach(super::add);
}
@Override /* List */
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
index 438b9ec38..3f556d7d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/collections/JsonMap.java
@@ -1258,7 +1258,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
* @param keys The list of keys to remove.
*/
public void removeAll(Collection<String> keys) {
- keys.forEach(x -> remove(x));
+ keys.forEach(this::remove);
}
/**
@@ -1783,7 +1783,7 @@ public class JsonMap extends LinkedHashMap<String,Object> {
UnmodifiableJsonMap(JsonMap contents) {
super();
if (contents != null)
- contents.forEach((k,v) -> super.put(k, v));
+ contents.forEach(super::put);
}
@Override
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
index efeb1a651..35a7d6afa 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BasicFileFinder.java
@@ -72,8 +72,8 @@ public class BasicFileFinder implements FileFinder {
this.cachingLimit = builder.cachingLimit;
this.include = builder.include;
this.exclude = builder.exclude;
- this.includePatterns = alist(include).stream().map(x->x.pattern()).toArray(String[]::new);
- this.excludePatterns = alist(exclude).stream().map(x->x.pattern()).toArray(String[]::new);
+ this.includePatterns = alist(include).stream().map(Pattern::pattern).toArray(String[]::new);
+ this.excludePatterns = alist(exclude).stream().map(Pattern::pattern).toArray(String[]::new);
this.hashCode = HashCode.of(getClass(), roots, cachingLimit, includePatterns, excludePatterns);
}
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 af115ad0b..5a944c836 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
@@ -330,7 +330,7 @@ public class BeanCreator<T> {
// Look for protected constructor.
if (! constructorMatch.isPresent()) {
- type.forEachDeclaredConstructor(x -> x.isProtected(), x -> {
+ type.forEachDeclaredConstructor(ConstructorInfo::isProtected, x -> {
found.setIfEmpty("PROTECTED_CONSTRUCTOR");
if (hasAllParams(x))
constructorMatch.add(x);
@@ -367,7 +367,7 @@ public class BeanCreator<T> {
} 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 "));
} else {
- msg = "Protected constructor found but could not find prerequisites: " + type.getDeclaredConstructors().stream().filter(x -> x.isProtected()).map(x -> getMissingParams(x)).sorted().collect(joining(" or "));
+ msg = "Protected constructor found but could not find prerequisites: " + type.getDeclaredConstructors().stream().filter(ConstructorInfo::isProtected).map(x -> getMissingParams(x)).sorted().collect(joining(" or "));
}
throw new ExecutableException("Could not instantiate class {0}: {1}.", type.getName(), msg);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
index 96e477468..8b6c3a8b8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/BeanStore.java
@@ -701,9 +701,9 @@ public class BeanStore {
Predicate<Boolean> nf = ObjectUtils::isTrue;
return filteredMap()
.append("identity", ObjectUtils.identity(this))
- .append("entries", entries.stream().map(x -> x.properties()).collect(toList()))
+ .append("entries", entries.stream().map(BeanStoreEntry::properties).collect(toList()))
.append("outer", ObjectUtils.identity(outer.orElse(null)))
- .append("parent", parent.map(x->x.properties()).orElse(null))
+ .append("parent", parent.map(BeanStore::properties).orElse(null))
.appendIf(nf, "readOnly", readOnly)
.appendIf(nf, "threadSafe", threadSafe)
;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
index 5a24be3a9..d16f270bd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/cp/FileFinder.java
@@ -212,7 +212,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder include(String...patterns) {
- this.include = alist(patterns).stream().map(x->Pattern.compile(x)).toArray(Pattern[]::new);
+ this.include = alist(patterns).stream().map(Pattern::compile).toArray(Pattern[]::new);
return this;
}
@@ -226,7 +226,7 @@ public interface FileFinder {
*/
@FluentSetter
public Builder exclude(String...patterns) {
- this.exclude = alist(patterns).stream().map(x->Pattern.compile(x)).toArray(Pattern[]::new);
+ this.exclude = alist(patterns).stream().map(Pattern::compile).toArray(Pattern[]::new);
return this;
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
index ec05ced78..fa3468d10 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/csv/CsvSerializerSession.java
@@ -231,7 +231,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
if (entryType.isBean()) {
BeanMeta<?> bm = entryType.getBeanMeta();
Flag addComma = Flag.create();
- bm.forEachProperty(x -> x.canRead(), x -> {
+ bm.forEachProperty(BeanPropertyMeta::canRead, x -> {
addComma.ifSet(() -> w.w(',')).set();
w.writeEntry(x.getName());
});
@@ -239,7 +239,7 @@ public final class CsvSerializerSession extends WriterSerializerSession {
l.forEach(x -> {
Flag addComma2 = Flag.create();
BeanMap<?> bean = toBeanMap(x);
- bm.forEachProperty(y -> y.canRead(), y -> {
+ bm.forEachProperty(BeanPropertyMeta::canRead, y -> {
addComma2.ifSet(() -> w.w(',')).set();
w.writeEntry(y.get(bean, y.getName()));
});
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
index 790aa3d8c..3c30b5d41 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/encoders/EncoderSet.java
@@ -283,7 +283,7 @@ public final class EncoderSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(Builder::toString).collect(joining(",","[","]"));
}
private static String toString(Object o) {
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 4366f8e03..f6a2846de 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
@@ -1666,7 +1666,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
templateBean = newInstance(template);
widgetMap = new HtmlWidgetMap();
- widgets.stream().map(x -> newInstance(x)).forEach(x -> widgetMap.append(x));
+ widgets.stream().map(this::newInstance).forEach(x -> widgetMap.append(x));
widgetArray = array(widgetMap.values(), HtmlWidget.class);
}
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 7b1808c45..18e29eb69 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
@@ -665,7 +665,7 @@ public class HttpPartSchema {
Builder apply(Class<? extends Annotation> c, ParamInfo mpi) {
apply(c, mpi.getParameterType().innerType());
- mpi.forEachDeclaredAnnotation(c, x -> true, x -> apply(x));
+ mpi.forEachDeclaredAnnotation(c, x -> true, this::apply);
return this;
}
@@ -687,7 +687,7 @@ public class HttpPartSchema {
Builder apply(Class<? extends Annotation> c, java.lang.reflect.Type t) {
if (t instanceof Class<?>) {
- ClassInfo.of((Class<?>)t).forEachAnnotation(c, x -> true, x -> apply(x));
+ ClassInfo.of((Class<?>)t).forEachAnnotation(c, x -> true, this::apply);
} else if (Value.isType(t)) {
apply(c, Value.getParameterType(t));
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
index ed8a6e5fd..6bdcf31b0 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/ClassUtils.java
@@ -29,7 +29,7 @@ public final class ClassUtils {
/**
* Predicate check to filter out void classes.
*/
- public static final Predicate<Class<?>> NOT_VOID = x -> isNotVoid(x);
+ public static final Predicate<Class<?>> NOT_VOID = ClassUtils::isNotVoid;
/**
* Returns the class types for the specified arguments.
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
index fd787ef7c..b70713d9e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/SystemEnv.java
@@ -78,8 +78,8 @@ public class SystemEnv {
private static final Map<Class<?>,Function<String,?>> ENV_FUNCTIONS = new IdentityHashMap<>();
static {
- ENV_FUNCTIONS.put(Boolean.class, x -> Boolean.valueOf(x));
- ENV_FUNCTIONS.put(Charset.class, x -> Charset.forName(x));
+ ENV_FUNCTIONS.put(Boolean.class, Boolean::valueOf);
+ ENV_FUNCTIONS.put(Charset.class, Charset::forName);
}
private static final ConcurrentHashMap<String,String> PROPERTY_TO_ENV = new ConcurrentHashMap<>();
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 dc1a7a90c..9a8a9bb34 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
@@ -174,7 +174,7 @@ public final class ParserSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null : copyFrom.bcBuilder.copy();
entries = list();
- copyFrom.entries.stream().map(x -> copyBuilder(x)).forEach(x -> entries.add(x));
+ copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
private Object copyBuilder(Object o) {
@@ -316,7 +316,7 @@ public final class ParserSet {
if (o instanceof Class) {
// Check for no-arg constructor.
- ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(ConstructorInfo::hasNoParams);
if (ci != null)
return ci.invoke();
@@ -461,7 +461,7 @@ public final class ParserSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(this::toString).collect(joining(",","[","]"));
}
private String toString(Object o) {
@@ -492,7 +492,7 @@ public final class ParserSet {
*/
public ParserSet(Builder builder) {
- this.entries = builder.entries.stream().map(x -> build(x)).toArray(Parser[]::new);
+ this.entries = builder.entries.stream().map(this::build).toArray(Parser[]::new);
List<MediaType> lmt = list();
List<Parser> l = list();
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 466b48c0f..77a1fb73c 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
@@ -173,7 +173,7 @@ public final class SerializerSet {
super(copyFrom);
bcBuilder = copyFrom.bcBuilder == null ? null : copyFrom.bcBuilder.copy();
entries = list();
- copyFrom.entries.stream().map(x -> copyBuilder(x)).forEach(x -> entries.add(x));
+ copyFrom.entries.stream().map(this::copyBuilder).forEach(x -> entries.add(x));
}
private Object copyBuilder(Object o) {
@@ -312,7 +312,7 @@ public final class SerializerSet {
if (o instanceof Class) {
// Check for no-arg constructor.
- ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo ci = ClassInfo.of((Class<?>)o).getPublicConstructor(ConstructorInfo::hasNoParams);
if (ci != null)
return ci.invoke();
@@ -461,7 +461,7 @@ public final class SerializerSet {
@Override /* Object */
public String toString() {
- return entries.stream().map(x -> toString(x)).collect(joining(",","[","]"));
+ return entries.stream().map(this::toString).collect(joining(",","[","]"));
}
private String toString(Object o) {
@@ -496,7 +496,7 @@ public final class SerializerSet {
*/
protected SerializerSet(Builder builder) {
- this.entries = builder.entries.stream().map(x -> build(x)).toArray(Serializer[]::new);
+ this.entries = builder.entries.stream().map(this::build).toArray(Serializer[]::new);
this.entriesList = ulist(entries);
List<MediaRange> lmtr = list();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
index 3f2c637ca..added73fc 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/urlencoding/UrlEncodingClassMeta.java
@@ -36,7 +36,7 @@ public class UrlEncodingClassMeta extends ExtendedClassMeta {
super(cm);
Value<Boolean> expandedParams = Value.empty();
- cm.forEachAnnotation(UrlEncoding.class, x -> x.expandedParams(), x -> expandedParams.set(true));
+ cm.forEachAnnotation(UrlEncoding.class, UrlEncoding::expandedParams, x -> expandedParams.set(true));
this.expandedParams = expandedParams.orElse(false);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 74868b448..589844509 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -345,7 +345,7 @@ public class XmlSerializerSession extends WriterSerializerSession {
}
if (innerType.isBean()) {
- innerType.getBeanMeta().forEachProperty(x -> x.canRead(), x -> {
+ innerType.getBeanMeta().forEachProperty(BeanPropertyMeta::canRead, x -> {
ns.set(getXmlBeanPropertyMeta(x).getNamespace());
if (ns.isPresent() && ns.get().uri != null)
addNamespace(ns.get());
@@ -353,13 +353,13 @@ public class XmlSerializerSession extends WriterSerializerSession {
} else if (innerType.isMap()) {
((Map<?,?>)o).forEach((k,v) -> findNsfMappings(v));
} else if (innerType.isCollection()) {
- ((Collection<?>)o).forEach(x -> findNsfMappings(x));
+ ((Collection<?>)o).forEach(this::findNsfMappings);
}
} else if (aType.isMap()) {
((Map<?,?>)o).forEach((k,v) -> findNsfMappings(v));
} else if (aType.isCollection()) {
- ((Collection<?>)o).forEach(x -> findNsfMappings(x));
+ ((Collection<?>)o).forEach(this::findNsfMappings);
} else if (aType.isArray() && ! aType.getElementType().isPrimitive()) {
for (Object o2 : ((Object[])o))
findNsfMappings(o2);
diff --git a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 3dcbee605..ca54dca9a 100644
--- a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++ b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -720,11 +720,11 @@ public class JettyMicroservice extends Microservice {
}
});
- cf.get("Jetty/servletAttributes").asMap().orElse(EMPTY_MAP).forEach((k,v) -> addServletAttribute(k, v));
+ cf.get("Jetty/servletAttributes").asMap().orElse(EMPTY_MAP).forEach(this::addServletAttribute);
builder.servlets.forEach((k,v) -> addServlet(v, k));
- builder.servletAttributes.forEach((k,v) -> addServletAttribute(k, v));
+ builder.servletAttributes.forEach(this::addServletAttribute);
if (System.getProperty("juneau.serverPort") == null)
System.setProperty("juneau.serverPort", String.valueOf(availablePort));
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
index 641e07f96..b0068faed 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/ResponseContent.java
@@ -711,7 +711,7 @@ public class ResponseContent implements HttpEntity {
// Some HTTP responses have no body, so try to create these beans if they've got no-arg constructors.
if (t == null && ! type.is(String.class)) {
- ConstructorInfo c = type.getInfo().getPublicConstructor(x -> x.hasNoParams());
+ ConstructorInfo c = type.getInfo().getPublicConstructor(ConstructorInfo::hasNoParams);
if (c != null) {
try {
return c.<T>invoke();
@@ -874,7 +874,7 @@ public class ResponseContent implements HttpEntity {
* {@link Future Futures}.
*/
public Future<String> asStringFuture() throws RestCallException {
- return client.getExecutorService().submit(() -> asString());
+ return client.getExecutorService().submit(this::asString);
}
/**
diff --git a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
index 0c243bf2d..7770574e2 100644
--- a/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
+++ b/juneau-rest/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClient.java
@@ -2636,7 +2636,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
@FluentSetter
public Builder debug() {
super.debug();
- serializers().forEach(x -> x.debug());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::debug);
return headers(Debug.TRUE);
}
@@ -4068,7 +4068,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder detectRecursions() {
- serializers().forEach(x -> x.detectRecursions());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::detectRecursions);
return this;
}
@@ -4121,7 +4121,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder ignoreRecursions() {
- serializers().forEach(x -> x.ignoreRecursions());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::ignoreRecursions);
return this;
}
@@ -4261,7 +4261,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder addBeanTypes() {
- serializers().forEach(x -> x.addBeanTypes());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::addBeanTypes);
return this;
}
@@ -4315,7 +4315,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder addRootType() {
- serializers().forEach(x -> x.addRootType());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::addRootType);
return this;
}
@@ -4357,7 +4357,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder keepNullProperties() {
- serializers().forEach(x -> x.keepNullProperties());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::keepNullProperties);
return this;
}
@@ -4396,7 +4396,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sortCollections() {
- serializers().forEach(x -> x.sortCollections());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::sortCollections);
return this;
}
@@ -4435,7 +4435,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sortMaps() {
- serializers().forEach(x -> x.sortMaps());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::sortMaps);
return this;
}
@@ -4481,7 +4481,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimEmptyCollections() {
- serializers().forEach(x -> x.trimEmptyCollections());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimEmptyCollections);
return this;
}
@@ -4526,7 +4526,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimEmptyMaps() {
- serializers().forEach(x -> x.trimEmptyMaps());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimEmptyMaps);
return this;
}
@@ -4562,7 +4562,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimStringsOnWrite() {
- serializers().forEach(x -> x.trimStrings());
+ serializers().forEach(org.apache.juneau.serializer.Serializer.Builder::trimStrings);
return this;
}
@@ -4814,7 +4814,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder sq() {
- serializers().forEachWS(x -> x.sq());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::sq);
return this;
}
@@ -4851,7 +4851,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder useWhitespace() {
- serializers().forEachWS(x -> x.useWhitespace());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::useWhitespace);
return this;
}
@@ -4889,7 +4889,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder ws() {
- serializers().forEachWS(x -> x.ws());
+ serializers().forEachWS(org.apache.juneau.serializer.WriterSerializer.Builder::ws);
return this;
}
@@ -5006,7 +5006,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder strict() {
- parsers().forEach(x -> x.strict());
+ parsers().forEach(org.apache.juneau.parser.Parser.Builder::strict);
return this;
}
@@ -5044,7 +5044,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder trimStringsOnRead() {
- parsers().forEach(x -> x.trimStrings());
+ parsers().forEach(org.apache.juneau.parser.Parser.Builder::trimStrings);
return this;
}
@@ -5270,7 +5270,7 @@ public class RestClient extends BeanContextable implements HttpClient, Closeable
*/
@FluentSetter
public Builder paramFormatPlain() {
- serializers().forEach(UonSerializer.Builder.class, x -> x.paramFormatPlain());
+ serializers().forEach(UonSerializer.Builder.class, org.apache.juneau.uon.UonSerializer.Builder::paramFormatPlain);
return this;
}
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 db263db99..bb11a3648 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
@@ -1975,7 +1975,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
c = ci.getPublicConstructor(x -> x.hasParamTypes(String.class,Throwable.class));
if (c != null)
throw c.<Throwable>invoke(message != null ? message : response.getContent().asString(), null);
- c = ci.getPublicConstructor(x -> x.hasNoParams());
+ c = ci.getPublicConstructor(ConstructorInfo::hasNoParams);
if (c != null)
throw c.<Throwable>invoke();
}
@@ -2026,7 +2026,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
* @throws RestCallException If the executor service was not defined.
*/
public Future<RestResponse> runFuture() throws RestCallException {
- return client.getExecutorService().submit(() -> run());
+ return client.getExecutorService().submit(this::run);
}
/**
@@ -2078,7 +2078,7 @@ public class RestRequest extends BeanSession implements HttpUriRequest, Configur
*/
public Future<RestResponse> completeFuture() throws RestCallException {
return client.getExecutorService().submit(
- () -> complete()
+ this::complete
);
}
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
index 75830269c..2a215f22e 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/header/HeaderList.java
@@ -175,7 +175,7 @@ public class HeaderList extends ControlledArrayList<Header> {
*/
public HeaderList setDefault(List<Header> headers) {
if (headers != null)
- headers.stream().filter(x -> x != null && ! contains(x.getName())).forEach(x -> set(x));
+ headers.stream().filter(x -> x != null && ! contains(x.getName())).forEach(this::set);
return this;
}
@@ -350,7 +350,7 @@ public class HeaderList extends ControlledArrayList<Header> {
@FluentSetter
public HeaderList append(List<Header> values) {
if (values != null)
- values.forEach(x -> append(x));
+ values.forEach(this::append);
return this;
}
@@ -459,7 +459,7 @@ public class HeaderList extends ControlledArrayList<Header> {
@FluentSetter
public HeaderList remove(List<Header> values) {
if (values != null)
- values.forEach(x -> remove(x));
+ values.forEach(this::remove);
return this;
}
@@ -833,7 +833,7 @@ public class HeaderList extends ControlledArrayList<Header> {
* @return An array containing all values. Never <jk>null</jk>.
*/
public String[] getValues(String name) {
- return stream().filter(x -> eq(x.getName(), name)).map(x -> x.getValue()).toArray(String[]::new);
+ return stream().filter(x -> eq(x.getName(), name)).map(Header::getValue).toArray(String[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
index 11094c64f..ae0429e16 100644
--- a/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
+++ b/juneau-rest/juneau-rest-common/src/main/java/org/apache/juneau/http/part/PartList.java
@@ -161,7 +161,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
*/
public PartList setDefault(List<NameValuePair> parts) {
if (parts != null)
- parts.stream().filter(x -> x != null && ! contains(x.getName())).forEach(x -> set(x));
+ parts.stream().filter(x -> x != null && ! contains(x.getName())).forEach(this::set);
return this;
}
@@ -335,7 +335,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
@FluentSetter
public PartList append(List<NameValuePair> values) {
if (values != null)
- values.forEach(x -> append(x));
+ values.forEach(this::append);
return this;
}
@@ -444,7 +444,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
@FluentSetter
public PartList remove(List<NameValuePair> values) {
if (values != null)
- values.forEach(x -> remove(x));
+ values.forEach(this::remove);
return this;
}
@@ -807,7 +807,7 @@ public class PartList extends ControlledArrayList<NameValuePair> {
* @return An array containing all values. Never <jk>null</jk>.
*/
public String[] getValues(String name) {
- return stream().filter(x -> eq(x.getName(), name)).map(x -> x.getValue()).toArray(String[]::new);
+ return stream().filter(x -> eq(x.getName(), name)).map(NameValuePair::getValue).toArray(String[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
index e9e5715e4..50893e5a1 100644
--- a/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
+++ b/juneau-rest/juneau-rest-mock/src/main/java/org/apache/juneau/rest/mock/MockServletRequest.java
@@ -980,8 +980,8 @@ public class MockServletRequest implements HttpServletRequest {
if (req instanceof MockRestRequest) {
MockRestRequest mreq = (MockRestRequest)req;
- mreq.getAttributeMap().forEach((k,v) -> attribute(k, v));
- mreq.getRequestDispatcherMap().forEach((k,v) -> requestDispatcher(k, v));
+ mreq.getAttributeMap().forEach(this::attribute);
+ mreq.getRequestDispatcherMap().forEach(this::requestDispatcher);
if (mreq.getCharacterEncoding() != null)
characterEncoding(mreq.getCharacterEncoding());
if (mreq.getProtocol() != null)
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 77e297746..b41c6782e 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
@@ -51,6 +51,7 @@ import org.apache.juneau.encoders.*;
import org.apache.juneau.html.*;
import org.apache.juneau.html.annotation.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.httppart.HttpPartSerializer.Creator;
import org.apache.juneau.internal.*;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.oapi.*;
@@ -2246,7 +2247,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(BeanContext.Builder.class)
- .map(x -> x.copy())
+ .map(BeanContext.Builder::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2360,7 +2361,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(HttpPartSerializer.Creator.class)
- .map(x -> x.copy())
+ .map(Creator::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2490,7 +2491,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(HttpPartParser.Creator.class)
- .map(x -> x.copy())
+ .map(HttpPartParser.Creator::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -2618,7 +2619,7 @@ public class RestContext extends Context {
// Replace with builder from bean store.
beanStore
.getBean(JsonSchemaGenerator.Builder.class)
- .map(x -> x.copy())
+ .map(JsonSchemaGenerator.Builder::copy)
.ifPresent(x -> v.set(x));
// Replace with bean from bean store.
@@ -3471,7 +3472,7 @@ public class RestContext extends Context {
// Default value.
Value<MethodList> v = Value.of(
- getAnnotatedMethods(resource, RestPostInit.class, x -> x.childFirst())
+ getAnnotatedMethods(resource, RestPostInit.class, RestPostInit::childFirst)
);
// Replace with bean from: @RestInject(name="postInitChildFirstMethods") public [static] MethodList xxx(<args>)
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 c0ad67513..65943134c 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
@@ -44,9 +44,9 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.http.remote.*;
import org.apache.juneau.httppart.*;
+import org.apache.juneau.httppart.HttpPartSerializer.Creator;
import org.apache.juneau.httppart.bean.*;
import org.apache.juneau.internal.*;
-import org.apache.juneau.internal.HttpUtils;
import org.apache.juneau.jsonschema.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.parser.ParseException;
@@ -330,14 +330,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(BeanContext.Builder.class, v.get())
.createMethodFinder(BeanContext.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<BeanContext> getBeanContext() {
- return optional(beanContext).map(x -> x.build());
+ return optional(beanContext).map(BeanContext.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -413,14 +413,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(EncoderSet.Builder.class, v.get())
.createMethodFinder(EncoderSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<EncoderSet> getEncoders() {
- return optional(encoders).map(x -> x.build());
+ return optional(encoders).map(EncoderSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -496,14 +496,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(SerializerSet.Builder.class, v.get())
.createMethodFinder(SerializerSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<SerializerSet> getSerializers() {
- return optional(serializers).map(x -> x.build());
+ return optional(serializers).map(SerializerSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -579,14 +579,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(ParserSet.Builder.class, v.get())
.createMethodFinder(ParserSet.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<ParserSet> getParsers() {
- return optional(parsers).map(x -> x.build());
+ return optional(parsers).map(ParserSet.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -661,14 +661,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(HttpPartSerializer.Creator.class, v.get())
.createMethodFinder(HttpPartSerializer.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<HttpPartSerializer> getPartSerializer() {
- return optional(partSerializer).map(x -> x.create());
+ return optional(partSerializer).map(Creator::create);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -743,14 +743,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(HttpPartParser.Creator.class, v.get())
.createMethodFinder(HttpPartParser.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<HttpPartParser> getPartParser() {
- return optional(partParser).map(x -> x.create());
+ return optional(partParser).map(org.apache.juneau.httppart.HttpPartParser.Creator::create);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -825,14 +825,14 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
.of(beanStore, resource)
.addBean(JsonSchemaGenerator.Builder.class, v.get())
.createMethodFinder(JsonSchemaGenerator.class, resource)
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
}
Optional<JsonSchemaGenerator> getJsonSchemaGenerator() {
- return optional(jsonSchemaGenerator).map(x -> x.build());
+ return optional(jsonSchemaGenerator).map(JsonSchemaGenerator.Builder::build);
}
//-----------------------------------------------------------------------------------------------------------------
@@ -984,7 +984,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestConverterList.class)
.addBean(RestConverterList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1092,7 +1092,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestGuardList.class)
.addBean(RestGuardList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1100,7 +1100,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
RestGuardList getGuards() {
RestGuardList.Builder b = guards();
- Set<String> roleGuard = optional(this.roleGuard).orElseGet(()->set());
+ Set<String> roleGuard = optional(this.roleGuard).orElseGet(CollectionUtils::set);
for (String rg : roleGuard) {
try {
@@ -1241,7 +1241,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(RestMatcherList.class)
.addBean(RestMatcherList.Builder.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.get().impl(x));
return v.get();
@@ -1308,7 +1308,7 @@ public class RestOpContext extends Context implements Comparable<RestOpContext>
beanStore
.createMethodFinder(UrlPathMatcherList.class, resource().get())
.addBean(UrlPathMatcherList.class, v.get())
- .find(x -> matches(x))
+ .find(this::matches)
.run(x -> v.set(x));
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 2699b2efe..0f3a8f471 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
@@ -12,7 +12,6 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
import java.lang.annotation.*;
import java.nio.charset.*;
@@ -21,6 +20,7 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.cp.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
import org.apache.juneau.httppart.*;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
@@ -1013,11 +1013,11 @@ public class RestAnnotation {
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(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders(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));
b.responseProcessors().add(a.responseProcessors());
b.children((Object[])a.children());
b.restOpArgs(a.restOpArgs());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
index c6dc53127..065afa293 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestDeleteAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.guard.*;
@@ -458,11 +457,11 @@ public class RestDeleteAnnotation {
b.httpMethod("delete");
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.guards().append(a.guards());
b.matchers().append(a.matchers());
string(a.clientVersion()).ifPresent(x -> b.clientVersion(x));
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
index 05c142e67..101d77d85 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestGetAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -517,11 +516,11 @@ public class RestGetAnnotation {
classes(a.serializers()).ifPresent(x -> b.serializers().set(x));
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
index 9a6a5e172..7ede73063 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOpAnnotation.java
@@ -12,10 +12,7 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import java.util.function.*;
@@ -24,6 +21,8 @@ import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.common.internal.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -628,13 +627,13 @@ public class RestOpAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(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.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
index 0af1993f7..e6659a4d1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestOptionsAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -517,11 +516,11 @@ public class RestOptionsAnnotation {
classes(a.serializers()).ifPresent(x -> b.serializers().set(x));
classes(a.encoders()).ifPresent(x -> b.encoders().set(x));
stream(a.produces()).map(MediaType::of).forEach(x -> b.produces(x));
- stream(a.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
index a1649fc20..221b8382e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPatchAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPatchAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(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.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
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 56197e2e3..3e1e48115 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
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPostAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(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.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
index 51ccd334f..96301fa75 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/annotation/RestPutAnnotation.java
@@ -12,16 +12,15 @@
// ***************************************************************************************************************************
package org.apache.juneau.rest.annotation;
-import static org.apache.juneau.http.HttpHeaders.*;
import static org.apache.juneau.internal.ArrayUtils.*;
-import static org.apache.juneau.http.HttpParts.*;
-
import java.lang.annotation.*;
import java.nio.charset.*;
import org.apache.juneau.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.encoders.*;
+import org.apache.juneau.http.HttpHeaders;
+import org.apache.juneau.http.HttpParts;
import org.apache.juneau.reflect.*;
import org.apache.juneau.rest.*;
import org.apache.juneau.rest.converter.*;
@@ -606,13 +605,13 @@ public class RestPutAnnotation {
classes(a.encoders()).ifPresent(x -> b.encoders().set(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.defaultRequestHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultRequestHeaders().setDefault(x));
- stream(a.defaultResponseHeaders()).map(x -> stringHeader(x)).forEach(x -> b.defaultResponseHeaders().setDefault(x));
- stream(a.defaultRequestAttributes()).map(x -> BasicNamedAttribute.ofPair(x)).forEach(x -> b.defaultRequestAttributes().add(x));
- stream(a.defaultRequestQueryData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestQueryData().setDefault(x));
- stream(a.defaultRequestFormData()).map(x -> basicPart(x)).forEach(x -> b.defaultRequestFormData().setDefault(x));
- string(a.defaultAccept()).map(x -> accept(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
- string(a.defaultContentType()).map(x -> contentType(x)).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultRequestHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultRequestHeaders().setDefault(x));
+ stream(a.defaultResponseHeaders()).map(HttpHeaders::stringHeader).forEach(x -> b.defaultResponseHeaders().setDefault(x));
+ stream(a.defaultRequestAttributes()).map(BasicNamedAttribute::ofPair).forEach(x -> b.defaultRequestAttributes().add(x));
+ stream(a.defaultRequestQueryData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestQueryData().setDefault(x));
+ stream(a.defaultRequestFormData()).map(HttpParts::basicPart).forEach(x -> b.defaultRequestFormData().setDefault(x));
+ string(a.defaultAccept()).map(HttpHeaders::accept).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
+ string(a.defaultContentType()).map(HttpHeaders::contentType).ifPresent(x -> b.defaultRequestHeaders().setDefault(x));
b.converters().append(a.converters());
b.guards().append(a.guards());
b.matchers().append(a.matchers());
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
index c90863f1f..a1fda33f1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasFormDataArg.java
@@ -65,7 +65,7 @@ public class HasFormDataArg implements RestOpArg {
*/
protected HasFormDataArg(ParamInfo pi) {
Value<String> _name = Value.empty();
- pi.forEachAnnotation(HasFormData.class, x -> hasName(x), x -> _name.set(getName(x)));
+ pi.forEachAnnotation(HasFormData.class, HasFormDataArg::hasName, x -> _name.set(getName(x)));
this.name = _name.orElseThrow(() -> new ArgException(pi, "@HasFormData used without name or value"));
this.type = pi.getParameterType().innerType();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
index e4ef65020..dd3f6696b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HasQueryArg.java
@@ -66,7 +66,7 @@ public class HasQueryArg implements RestOpArg {
*/
protected HasQueryArg(ParamInfo pi) {
Value<String> _name = Value.empty();
- pi.forEachAnnotation(HasQuery.class, x -> hasName(x), x -> _name.set(getName(x)));
+ pi.forEachAnnotation(HasQuery.class, HasQueryArg::hasName, x -> _name.set(getName(x)));
this.name = _name.orElseThrow(() -> new ArgException(pi, "@HasQuery used without name or value"));
this.type = pi.getParameterType().innerType();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
index 3f4d9221e..22187e242 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletRequestArgs.java
@@ -46,15 +46,15 @@ public class HttpServletRequestArgs extends SimpleRestOperationArg {
*/
public static HttpServletRequestArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(AsyncContext.class))
- return new HttpServletRequestArgs(x->x.getAsyncContext());
+ return new HttpServletRequestArgs(HttpServletRequest::getAsyncContext);
if (paramInfo.isType(CookieList.class))
return new HttpServletRequestArgs(x->CookieList.of(x.getCookies()));
if (paramInfo.isType(DispatcherType.class))
- return new HttpServletRequestArgs(x->x.getDispatcherType());
+ return new HttpServletRequestArgs(HttpServletRequest::getDispatcherType);
if (paramInfo.isType(HttpServletRequest.class))
return new HttpServletRequestArgs(x->x);
if (paramInfo.isType(Principal.class))
- return new HttpServletRequestArgs(x->x.getUserPrincipal());
+ return new HttpServletRequestArgs(HttpServletRequest::getUserPrincipal);
return null;
}
@@ -65,6 +65,6 @@ public class HttpServletRequestArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpServletRequestArgs(ThrowingFunction<HttpServletRequest,T> function) {
- super((session)->function.apply(session.getRequest().getHttpServletRequest()));
+ super(session -> function.apply(session.getRequest().getHttpServletRequest()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
index e77a20016..02e8291d0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpServletResponseArgs.java
@@ -50,6 +50,6 @@ public class HttpServletResponseArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpServletResponseArgs(ThrowingFunction<HttpServletResponse,T> function) {
- super((session)->function.apply(session.getRestSession().getResponse()));
+ super(session -> function.apply(session.getRestSession().getResponse()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
index 04ac36a53..8dacbe3b0 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/HttpSessionArgs.java
@@ -50,6 +50,6 @@ public class HttpSessionArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> HttpSessionArgs(ThrowingFunction<HttpSession,T> function) {
- super((session)->function.apply(session.getRestSession().getRequest().getSession()));
+ super(session -> function.apply(session.getRestSession().getRequest().getSession()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
index d91cbedb7..e6411b098 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/InputStreamParserArg.java
@@ -53,6 +53,6 @@ public class InputStreamParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected InputStreamParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(InputStreamParser.class::isInstance).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(InputStreamParser.class::isInstance).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
index 80923272f..76eb516de 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ParserArg.java
@@ -53,6 +53,6 @@ public class ParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected ParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
index b0afb5668..c59275d20 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ReaderParserArg.java
@@ -53,6 +53,6 @@ public class ReaderParserArg extends SimpleRestOperationArg {
* Constructor.
*/
protected ReaderParserArg() {
- super((opSession)->opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(ReaderParser.class::isInstance).orElse(null));
+ super(opSession -> opSession.getRequest().getContent().getParserMatch().map(ParserMatch::getParser).filter(ReaderParser.class::isInstance).orElse(null));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
index 7863d2947..fa28ab0fc 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestContextArgs.java
@@ -61,31 +61,31 @@ public class RestContextArgs extends SimpleRestOperationArg {
*/
public static RestContextArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(BeanContext.class))
- return new RestContextArgs(x->x.getBeanContext());
+ return new RestContextArgs(RestContext::getBeanContext);
if (paramInfo.isType(Config.class))
- return new RestContextArgs(x->x.getConfig());
+ return new RestContextArgs(RestContext::getConfig);
if (paramInfo.isType(DebugEnablement.class))
- return new RestContextArgs(x->x.getDebugEnablement());
+ return new RestContextArgs(RestContext::getDebugEnablement);
if (paramInfo.isType(EncoderSet.class))
- return new RestContextArgs(x->x.getEncoders());
+ return new RestContextArgs(RestContext::getEncoders);
if (paramInfo.isType(Logger.class))
- return new RestContextArgs(x->x.getLogger());
+ return new RestContextArgs(RestContext::getLogger);
if (paramInfo.isType(MethodExecStore.class))
- return new RestContextArgs(x->x.getMethodExecStore());
+ return new RestContextArgs(RestContext::getMethodExecStore);
if (paramInfo.isType(RestChildren.class))
- return new RestContextArgs(x->x.getRestChildren());
+ return new RestContextArgs(RestContext::getRestChildren);
if (paramInfo.isType(RestContext.class))
return new RestContextArgs(x->x);
if (paramInfo.isType(RestContextStats.class))
- return new RestContextArgs(x->x.getStats());
+ return new RestContextArgs(RestContext::getStats);
if (paramInfo.isType(CallLogger.class))
- return new RestContextArgs(x->x.getCallLogger());
+ return new RestContextArgs(RestContext::getCallLogger);
if (paramInfo.isType(RestOperations.class))
- return new RestContextArgs(x->x.getRestOperations());
+ return new RestContextArgs(RestContext::getRestOperations);
if (paramInfo.isType(StaticFiles.class))
- return new RestContextArgs(x->x.getStaticFiles());
+ return new RestContextArgs(RestContext::getStaticFiles);
if (paramInfo.isType(ThrownStore.class))
- return new RestContextArgs(x->x.getThrownStore());
+ return new RestContextArgs(RestContext::getThrownStore);
return null;
}
@@ -96,6 +96,6 @@ public class RestContextArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestContextArgs(ThrowingFunction<RestContext,T> function) {
- super((session)->function.apply(session.getRestContext()));
+ super(session -> function.apply(session.getRestContext()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
index cd11bafee..904643ed3 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpContextArgs.java
@@ -44,13 +44,13 @@ public class RestOpContextArgs extends SimpleRestOperationArg {
*/
public static RestOpContextArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(JsonSchemaGenerator.class))
- return new RestOpContextArgs(x->x.getJsonSchemaGenerator());
+ return new RestOpContextArgs(RestOpContext::getJsonSchemaGenerator);
if (paramInfo.isType(ParserSet.class))
- return new RestOpContextArgs(x->x.getParsers());
+ return new RestOpContextArgs(RestOpContext::getParsers);
if (paramInfo.isType(RestOpContext.class))
return new RestOpContextArgs(x->x);
if (paramInfo.isType(SerializerSet.class))
- return new RestOpContextArgs(x->x.getSerializers());
+ return new RestOpContextArgs(RestOpContext::getSerializers);
return null;
}
@@ -61,6 +61,6 @@ public class RestOpContextArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestOpContextArgs(ThrowingFunction<RestOpContext,T> function) {
- super((session)->function.apply(session.getContext()));
+ super(session -> function.apply(session.getContext()));
}
}
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 c0127fb11..30ad702a0 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
@@ -40,7 +40,7 @@ public class RestOpSessionArgs extends SimpleRestOperationArg {
*/
public static RestOpSessionArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(BeanStore.class))
- return new RestOpSessionArgs(x->x.getBeanStore());
+ return new RestOpSessionArgs(RestOpSession::getBeanStore);
if (paramInfo.isType(RestOpSession.class))
return new RestOpSessionArgs(x->x);
return null;
@@ -53,6 +53,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(session -> function.apply(session));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
index ddd64aea2..ff852ea9b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestRequestArgs.java
@@ -70,45 +70,45 @@ public class RestRequestArgs extends SimpleRestOperationArg {
*/
public static RestRequestArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(HttpPartParserSession.class))
- return new RestRequestArgs(x->x.getPartParserSession());
+ return new RestRequestArgs(RestRequest::getPartParserSession);
if (paramInfo.isType(HttpPartSerializerSession.class))
- return new RestRequestArgs(x->x.getPartSerializerSession());
+ return new RestRequestArgs(RestRequest::getPartSerializerSession);
if (paramInfo.isType(InputStream.class))
- return new RestRequestArgs(x->x.getInputStream());
+ return new RestRequestArgs(RestRequest::getInputStream);
if (paramInfo.isType(Locale.class))
- return new RestRequestArgs(x->x.getLocale());
+ return new RestRequestArgs(RestRequest::getLocale);
if (paramInfo.isType(Messages.class))
- return new RestRequestArgs(x->x.getMessages());
+ return new RestRequestArgs(RestRequest::getMessages);
if (paramInfo.isType(Reader.class))
- return new RestRequestArgs(x->x.getReader());
+ return new RestRequestArgs(RestRequest::getReader);
if (paramInfo.isType(RequestAttributes.class))
- return new RestRequestArgs(x->x.getAttributes());
+ return new RestRequestArgs(RestRequest::getAttributes);
if (paramInfo.isType(RequestContent.class))
- return new RestRequestArgs(x->x.getContent());
+ return new RestRequestArgs(RestRequest::getContent);
if (paramInfo.isType(RequestFormParams.class))
- return new RestRequestArgs(x->x.getFormParams());
+ return new RestRequestArgs(RestRequest::getFormParams);
if (paramInfo.isType(RequestHeaders.class))
- return new RestRequestArgs(x->x.getHeaders());
+ return new RestRequestArgs(RestRequest::getHeaders);
if (paramInfo.isType(RequestPathParams.class))
- return new RestRequestArgs(x->x.getPathParams());
+ return new RestRequestArgs(RestRequest::getPathParams);
if (paramInfo.isType(RequestQueryParams.class))
- return new RestRequestArgs(x->x.getQueryParams());
+ return new RestRequestArgs(RestRequest::getQueryParams);
if (paramInfo.isType(ResourceBundle.class))
- return new RestRequestArgs(x->x.getMessages());
+ return new RestRequestArgs(RestRequest::getMessages);
if (paramInfo.isType(RestRequest.class))
return new RestRequestArgs(x->x);
if (paramInfo.isType(ServletInputStream.class))
- return new RestRequestArgs(x->x.getInputStream());
+ return new RestRequestArgs(RestRequest::getInputStream);
if (paramInfo.isType(Swagger.class))
return new RestRequestArgs(x->x.getSwagger().orElse(null));
if (paramInfo.isType(TimeZone.class))
return new RestRequestArgs(x->x.getTimeZone().orElse(null));
if (paramInfo.isType(UriContext.class))
- return new RestRequestArgs(x->x.getUriContext());
+ return new RestRequestArgs(RestRequest::getUriContext);
if (paramInfo.isType(UriResolver.class))
- return new RestRequestArgs(x->x.getUriResolver());
+ return new RestRequestArgs(RestRequest::getUriResolver);
if (paramInfo.isType(VarResolverSession.class))
- return new RestRequestArgs(x->x.getVarResolverSession());
+ return new RestRequestArgs(RestRequest::getVarResolverSession);
return null;
}
@@ -119,6 +119,6 @@ public class RestRequestArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestRequestArgs(ThrowingFunction<RestRequest,T> function) {
- super((session)->function.apply(session.getRequest()));
+ super(session -> function.apply(session.getRequest()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
index 1b9dd6ffd..cd7cbd78f 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestResponseArgs.java
@@ -44,13 +44,13 @@ public class RestResponseArgs extends SimpleRestOperationArg {
*/
public static RestResponseArgs create(ParamInfo paramInfo) {
if (paramInfo.isType(OutputStream.class))
- return new RestResponseArgs(x->x.getOutputStream());
+ return new RestResponseArgs(RestResponse::getOutputStream);
if (paramInfo.isType(RestResponse.class))
return new RestResponseArgs(x->x);
if (paramInfo.isType(ServletOutputStream.class))
- return new RestResponseArgs(x->x.getOutputStream());
+ return new RestResponseArgs(RestResponse::getOutputStream);
if (paramInfo.isType(Writer.class))
- return new RestResponseArgs(x->x.getWriter());
+ return new RestResponseArgs(RestResponse::getWriter);
return null;
}
@@ -61,6 +61,6 @@ public class RestResponseArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestResponseArgs(ThrowingFunction<RestResponse,T> function) {
- super((session)->function.apply(session.getResponse()));
+ super(session -> function.apply(session.getResponse()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
index 56c8cfb13..501d7eacd 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestSessionArgs.java
@@ -43,9 +43,9 @@ public class RestSessionArgs extends SimpleRestOperationArg {
if (paramInfo.isType(RestSession.class))
return new RestSessionArgs(x->x);
if (paramInfo.isType(UrlPath.class))
- return new RestSessionArgs(x->x.getUrlPath());
+ return new RestSessionArgs(RestSession::getUrlPath);
if (paramInfo.isType(UrlPathMatch.class))
- return new RestSessionArgs(x->x.getUrlPathMatch());
+ return new RestSessionArgs(RestSession::getUrlPathMatch);
return null;
}
@@ -56,6 +56,6 @@ public class RestSessionArgs extends SimpleRestOperationArg {
* @param function The function for finding the arg.
*/
protected <T> RestSessionArgs(ThrowingFunction<RestSession,T> function) {
- super((session)->function.apply(session.getRestSession()));
+ super(session -> function.apply(session.getRestSession()));
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
index 46ca147c2..07fca9fed 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverterList.java
@@ -132,7 +132,7 @@ public class RestConverterList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.toArray(RestConverter[]::new);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
index 1cdd6b69f..3473a0f58 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/guard/RestGuardList.java
@@ -132,7 +132,7 @@ public class RestGuardList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.toArray(RestGuard[]::new);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
index 43743fba2..ca7de3cda 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RequestFormParams.java
@@ -162,7 +162,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
add(new RequestFormParam(req, name, value));
}
} else if (c != null) {
- c.stream().forEach(x->add(x));
+ c.stream().forEach(this::add);
}
}
@@ -187,7 +187,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -447,7 +447,7 @@ public class RequestFormParams extends ArrayList<RequestFormParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestFormParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
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 d319469db..9fe1faa98 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
@@ -165,7 +165,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -405,7 +405,7 @@ public class RequestHeaders extends ArrayList<RequestHeader> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestHeader::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
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 fd5644175..9d2697a6a 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
@@ -159,7 +159,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -405,7 +405,7 @@ public class RequestPathParams extends ArrayList<RequestPathParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestPathParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
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 5a4ca7c04..fe1fa6a86 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
@@ -178,7 +178,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> {
parser = copyFrom.parser;
vs = copyFrom.vs;
for (String n : names)
- copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(x -> add(x));
+ copyFrom.stream().filter(x -> eq(x.getName(), n)).forEach(this::add);
}
/**
@@ -421,7 +421,7 @@ public class RequestQueryParams extends ArrayList<RequestQueryParam> {
* @return The list of all unique header names in this list.
*/
public List<String> getNames() {
- return stream().map(x -> x.getName()).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
+ return stream().map(RequestQueryParam::getName).map(x -> caseSensitive ? x : x.toLowerCase()).distinct().collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
index d6f22a50b..680697a87 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/matcher/RestMatcherList.java
@@ -134,10 +134,10 @@ public class RestMatcherList {
builder
.entries
.stream()
- .map(x -> x.run())
+ .map(BeanCreator::run)
.collect(toList());
optionalEntries = l.stream().filter(x -> ! x.required()).toArray(RestMatcher[]::new);
- requiredEntries = l.stream().filter(x -> x.required()).toArray(RestMatcher[]::new);
+ requiredEntries = l.stream().filter(RestMatcher::required).toArray(RestMatcher[]::new);
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
index 694181f4c..30b896b25 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/stats/ThrownStore.java
@@ -181,7 +181,7 @@ public class ThrownStore {
Set<String> s = null;
if (builder.ignoreClasses != null)
- s = builder.ignoreClasses.stream().map(x->x.getName()).collect(toSet());
+ s = builder.ignoreClasses.stream().map(Class::getName).collect(toSet());
if (s == null && parent.isPresent())
s = parent.get().ignoreClasses;
if (s == null)
@@ -230,7 +230,7 @@ public class ThrownStore {
* @return The list of all stack traces in this database, cloned and sorted by count descending.
*/
public List<ThrownStats> getStats() {
- return db.values().stream().map(x -> x.clone()).sorted(comparingInt(ThrownStats::getCount).reversed()).collect(toList());
+ return db.values().stream().map(ThrownStats::clone).sorted(comparingInt(ThrownStats::getCount).reversed()).collect(toList());
}
/**
@@ -271,7 +271,7 @@ public class ThrownStore {
* @return A modifiable list of strings.
*/
protected List<String> createStackTrace(Throwable t) {
- return alist(t.getStackTrace()).stream().filter(x -> include(x)).map(x -> normalize(x)).collect(toList());
+ return alist(t.getStackTrace()).stream().filter(this::include).map(this::normalize).collect(toList());
}
/**
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
index a88426196..c07fe9c56 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
@@ -106,7 +106,7 @@ public interface SwaggerProvider {
* @return The var resolver.
*/
public Optional<VarResolver> varResolver() {
- return optional(varResolver).map(x -> x.get());
+ return optional(varResolver).map(Supplier::get);
}
/**
@@ -115,7 +115,7 @@ public interface SwaggerProvider {
* @return The JSON schema generator.
*/
public Optional<JsonSchemaGenerator> jsonSchemaGenerator() {
- return optional(jsonSchemaGenerator).map(x -> x.get());
+ return optional(jsonSchemaGenerator).map(Supplier::get);
}
/**
@@ -124,7 +124,7 @@ public interface SwaggerProvider {
* @return The messages.
*/
public Optional<Messages> messages() {
- return optional(messages).map(x -> x.get());
+ return optional(messages).map(Supplier::get);
}
/**
@@ -133,7 +133,7 @@ public interface SwaggerProvider {
* @return The file finder.
*/
public Optional<FileFinder> fileFinder() {
- return optional(fileFinder).map(x -> x.get());
+ return optional(fileFinder).map(Supplier::get);
}
/**
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
index 2dd2ad139..32222c3c6 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockStreamSerializer.java
@@ -38,7 +38,7 @@ public class MockStreamSerializer extends OutputStreamSerializer {
public static class Builder extends OutputStreamSerializer.Builder {
MockStreamSerializerFunction function = (s,o) -> StringUtils.stringify(o).getBytes();
- Function<SerializerSession,Map<String,String>> headers = (s) -> Collections.emptyMap();
+ Function<SerializerSession,Map<String,String>> headers = s -> Collections.emptyMap();
public Builder function(MockStreamSerializerFunction function) {
this.function = function;
diff --git a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
index 4fc3ea199..cdc5cd7fc 100644
--- a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
+++ b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/MockWriterSerializer.java
@@ -69,7 +69,7 @@ public class MockWriterSerializer extends WriterSerializer implements HttpPartSe
public static class Builder extends WriterSerializer.Builder {
MockWriterSerializerFunction function = (s,o) -> StringUtils.stringify(o);
MockWriterSerializerPartFunction partFunction = (t,s,o) -> StringUtils.stringify(o);
- Function<WriterSerializerSession,Map<String,String>> headers = (s) -> Collections.emptyMap();
+ Function<WriterSerializerSession,Map<String,String>> headers = s -> Collections.emptyMap();
public Builder function(MockWriterSerializerFunction value) {
function = value;
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
index 418eb094f..67714b109 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanContextTest.java
@@ -45,7 +45,7 @@ public class BeanContextTest {
@Test
public void a02_lambdaExpressionsNotCached() throws ExecutableException {
BeanContext bc = BeanContext.DEFAULT;
- A2 fi = (x) -> System.out.println(x);
+ A2 fi = x -> System.out.println(x);
ClassMeta cm1 = bc.getClassMeta(fi.getClass()), cm2 = bc.getClassMeta(fi.getClass());
assertTrue(cm1 != cm2);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
index 76bf00b15..cff6d6d4b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanMapErrorsTest.java
@@ -15,6 +15,7 @@ package org.apache.juneau;
import static org.junit.Assert.*;
import static org.junit.runners.MethodSorters.*;
+import java.util.Map.Entry;
import java.util.stream.*;
import org.apache.juneau.annotation.*;
@@ -40,7 +41,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(p="f1")
@@ -68,7 +69,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(on="Dummy",p="dummy")
@@ -104,7 +105,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(p="f1")
@@ -125,7 +126,7 @@ public class BeanMapErrorsTest {
bm.put("f2", -2);
assertEquals(-2, bm.get("f2"));
assertFalse(bm.keySet().contains("f2"));
- assertFalse(bm.entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList()).contains("f2"));
+ assertFalse(bm.entrySet().stream().map(Entry::getKey).collect(Collectors.toList()).contains("f2"));
}
@Bean(on="Dummy",p="dummy")
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
index 92526b144..e244e4951 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BeanTraversePropertiesComboTest.java
@@ -14,6 +14,7 @@ package org.apache.juneau;
import java.util.*;
+import org.apache.juneau.BeanTraverseContext.Builder;
import org.junit.runner.*;
import org.junit.runners.*;
@@ -106,7 +107,7 @@ public class BeanTraversePropertiesComboTest extends ComboRoundTripTest {
.rdfXml("x")
.rdfXmlT("x")
.rdfXmlR("x")
- .apply(BeanTraverseContext.Builder.class, x -> x.detectRecursions())
+ .apply(BeanTraverseContext.Builder.class, Builder::detectRecursions)
.exceptionMsg("Recursion occurred")
},
{ /* 2 */
@@ -136,7 +137,7 @@ public class BeanTraversePropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(BeanTraverseContext.Builder.class, x -> x.ignoreRecursions())
+ .apply(BeanTraverseContext.Builder.class, Builder::ignoreRecursions)
},
{ /* 3 */
new ComboInput<>(
diff --git a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
index f78372552..5c1df0647 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/BenchmarkTest.java
@@ -94,7 +94,7 @@ public class BenchmarkTest {
int cap = 100000;
long startTime = 0;
List<Integer> arrayList = new ArrayList<>();
- arrayList.forEach(x -> Objects.hash(x));
+ arrayList.forEach(Objects::hash);
IntStream.of(null).forEach(null);
startTime = System.currentTimeMillis();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
index 287062b2d..229577324 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/SerializerPropertiesComboTest.java
@@ -19,6 +19,7 @@ import java.util.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.serializer.*;
+import org.apache.juneau.serializer.Serializer.Builder;
import org.apache.juneau.xml.*;
import org.junit.runner.*;
import org.junit.runners.*;
@@ -61,7 +62,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a rdf:parseType='Resource'>\n<jp:t>BwT</jp:t>\n<jp:f>1</jp:f>\n</jp:a>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a rdf:parseType='Resource'>\n <jp:_type>BwT</jp:_type>\n <jp:f>1</jp:f>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n")
.beanContext(x -> x.beanDictionary(T0.class))
- .apply(Serializer.Builder.class, x -> x.addBeanTypes())
+ .apply(Serializer.Builder.class, Builder::addBeanTypes)
},
{ /* 1 */
new ComboInput<>(
@@ -91,7 +92,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>BwT</jp:t>\n<jp:f>1</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>BwT</jp:_type>\n <jp:f>1</jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
.beanContext(x -> x.beanDictionary(T0.class))
- .apply(Serializer.Builder.class, x -> x.addRootType())
+ .apply(Serializer.Builder.class, Builder::addRootType)
},
{ /* 2 */
new ComboInput<>(
@@ -120,7 +121,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>a</rdf:li>\n <rdf:li>b</rdf:li>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortCollections())
+ .apply(Serializer.Builder.class, Builder::sortCollections)
},
{ /* 3 */
new ComboInput<>(
@@ -149,7 +150,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Seq>\n<rdf:li>a</rdf:li>\n<rdf:li>b</rdf:li>\n<rdf:li>c</rdf:li>\n</rdf:Seq>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Seq>\n <rdf:li>a</rdf:li>\n <rdf:li>b</rdf:li>\n <rdf:li>c</rdf:li>\n </rdf:Seq>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortCollections())
+ .apply(Serializer.Builder.class, Builder::sortCollections)
},
{ /* 4 */
new ComboInput<>(
@@ -178,7 +179,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n<jp:b>2</jp:b>\n<jp:c>3</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:a>1</jp:a>\n<jp:b>2</jp:b>\n<jp:c>3</jp:c>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:a>1</jp:a>\n <jp:b>2</jp:b>\n <jp:c>3</jp:c>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.sortMaps())
+ .apply(Serializer.Builder.class, Builder::sortMaps)
},
{ /* 5 */
new ComboInput<>(
@@ -207,7 +208,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimEmptyCollections())
+ .apply(Serializer.Builder.class, Builder::trimEmptyCollections)
},
{ /* 6 */
new ComboInput<>(
@@ -236,7 +237,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimEmptyMaps())
+ .apply(Serializer.Builder.class, Builder::trimEmptyMaps)
},
{ /* 7 */
new ComboInput<>(
@@ -265,7 +266,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f rdf:resource='http://www.w3.org/1999/02/22-rdf-syntax-ns#nil'/>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.keepNullProperties())
+ .apply(Serializer.Builder.class, Builder::keepNullProperties)
},
{ /* 8 */
new ComboInput<>(
@@ -294,7 +295,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:f>foo</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:f>foo</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:f>foo</jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(Serializer.Builder.class, x -> x.trimStrings())
+ .apply(Serializer.Builder.class, Builder::trimStrings)
},
{ /* 9 */
new ComboInput<>(
@@ -383,7 +384,7 @@ public class SerializerPropertiesComboTest extends ComboRoundTripTest {
.rdfXml("<rdf:RDF>\n<rdf:Description>\n<jp:_type>T11</jp:_type>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f>\n<rdf:Seq>\n<rdf:li>_x0020_foo_x0020_</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlT("<rdf:RDF>\n<rdf:Description>\n<jp:t>T11</jp:t>\n<jp:f>\n<rdf:Seq>\n<rdf:li rdf:parseType='Resource'>\n<jp:f>\n<rdf:Seq>\n<rdf:li>_x0020_foo_x0020_</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:li>\n</rdf:Seq>\n</jp:f>\n</rdf:Description>\n</rdf:RDF>\n")
.rdfXmlR("<rdf:RDF>\n <rdf:Description>\n <jp:_type>T11</jp:_type>\n <jp:f>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:f>\n <rdf:Seq>\n <rdf:li>_x0020_foo_x0020_</rdf:li>\n </rdf:Seq>\n </jp:f>\n </rdf:li>\n </rdf:Seq>\n </jp:f>\n </rdf:Description>\n</rdf:RDF>\n")
- .apply(XmlSerializer.Builder.class, x -> x.addNamespaceUrisToRoot())
+ .apply(XmlSerializer.Builder.class, org.apache.juneau.xml.XmlSerializer.Builder::addNamespaceUrisToRoot)
.apply(WriterSerializer.Builder.class, x -> x.quoteCharOverride('|'))
.apply(Serializer.Builder.class, x -> x.addBeanTypes().addRootType())
.skipTest(x -> x.startsWith("parse") || x.startsWith("verify"))
diff --git a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
index db8bca8c5..b9f168f9e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/cp/BeanStore_Test.java
@@ -638,8 +638,8 @@ public class BeanStore_Test {
assertObject(b3c.createMethodFinder(C.class).find(m).run()).isNull();
}
- b1p.clear().addSupplier(A1.class, ()->new A1());
- b2p.clear().addSupplier(A1.class, ()->new A1());
+ b1p.clear().addSupplier(A1.class, A1::new);
+ b2p.clear().addSupplier(A1.class, A1::new);
for (BeanStore b : array(b1c, b2c)) {
assertObject(b.createMethodFinder(C.class, x).find("createC1").run()).isNotNull();
assertObject(b.createMethodFinder(C.class, x).find("createC2").run()).isNotNull();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
index 7323515af..bab0a479f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/SerializedHttpEntity_Test.java
@@ -27,6 +27,7 @@ import org.apache.juneau.msgpack.*;
import org.apache.juneau.oapi.*;
import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.testutils.pojos.*;
@@ -41,7 +42,7 @@ public class SerializedHttpEntity_Test {
public static class A extends BasicRestObject {
@RestPost
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestPost
public Reader checkBody(org.apache.juneau.rest.RestRequest req) throws IOException {
@@ -52,7 +53,7 @@ public class SerializedHttpEntity_Test {
@Test
public void a01_basic() throws Exception {
serializedEntity(ABean.get(),JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
- serializedEntity(()->ABean.get(),JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
+ serializedEntity(ABean::get,JsonSerializer.DEFAULT).assertString().is("{\"a\":1,\"b\":\"foo\"}");
serializedEntity(ABean.get(),null).assertString().is("{a:1,b:'foo'}");
serializedEntity(null,JsonSerializer.DEFAULT).assertString().is("null");
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
index b73d99ef8..ee22dfe67 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/http/remote/Remote_Test.java
@@ -24,6 +24,7 @@ import org.apache.juneau.rest.annotation.*;
import org.apache.juneau.rest.client.*;
import org.apache.juneau.rest.client.remote.*;
import org.apache.juneau.rest.config.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.http.*;
@@ -548,7 +549,7 @@ public class Remote_Test {
public static class F extends BasicRestObject {
@RestGet
public String[] headers(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
index 1419c90ed..7d5d1dded 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/json/JsonConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class JsonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
index f3d468d7b..214f0c88c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/msgpack/MsgPackConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class MsgPackConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
index 82161c56d..0347fcc9a 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ClassInfoTest.java
@@ -475,7 +475,7 @@ public class ClassInfoTest {
@Test
public void getPublicNoArgConstructor() {
- check("E1()", e1.getPublicConstructor(x -> x.hasNoParams()));
+ check("E1()", e1.getPublicConstructor(ConstructorInfo::hasNoParams));
}
@Test
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
index 99af4b615..2fb65253d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ConstructorInfoTest.java
@@ -108,7 +108,7 @@ public class ConstructorInfoTest {
}
static ClassInfo b = ClassInfo.of(B.class);
static ConstructorInfo
- b_c1 = b.getPublicConstructor(x -> x.hasNoParams()),
+ b_c1 = b.getPublicConstructor(ConstructorInfo::hasNoParams),
b_c2 = b.getPublicConstructor(x -> x.hasParamTypes(String.class)),
b_c3 = b.getDeclaredConstructor(x -> x.hasParamTypes(int.class)),
b_c4 = b.getPublicConstructor(x -> x.hasParamTypes(String.class, String.class));
diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
index ff033fc1f..1271a6c7f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/ExecutableInfoTest.java
@@ -72,13 +72,13 @@ public class ExecutableInfoTest {
@Test
public void isConstructor() {
- assertTrue(a.getPublicConstructor(x -> x.hasNoParams()).isConstructor());
+ assertTrue(a.getPublicConstructor(ConstructorInfo::hasNoParams).isConstructor());
assertFalse(a.getPublicMethod(x -> x.hasName("foo")).isConstructor());
}
@Test
public void getDeclaringClass() {
- check("A", a.getPublicConstructor(x -> x.hasNoParams()).getDeclaringClass());
+ check("A", a.getPublicConstructor(ConstructorInfo::hasNoParams).getDeclaringClass());
check("A", a.getPublicMethod(x -> x.hasName("foo")).getDeclaringClass());
}
@@ -94,7 +94,7 @@ public class ExecutableInfoTest {
}
static ClassInfo b = ClassInfo.of(B.class);
static ExecutableInfo
- b_c1=b.getPublicConstructor(x -> x.hasNoParams()),
+ b_c1=b.getPublicConstructor(ConstructorInfo::hasNoParams),
b_c2=b.getPublicConstructor(x -> x.hasParamTypes(String.class)),
b_m1=b.getPublicMethod(x -> x.hasName("m") && x.hasNoParams()),
b_m2=b.getPublicMethod(x -> x.hasName("m") && x.hasParamTypes(String.class))
@@ -169,7 +169,7 @@ public class ExecutableInfoTest {
@Test
public void getParam_indexOutOfBounds_noCache() {
ClassInfo b = ClassInfo.of(B.class);
- assertThrown(()->b.getPublicConstructor(x -> x.hasNoParams()).getParam(0)).asMessage().is("Invalid index '0'. No parameters.");
+ assertThrown(()->b.getPublicConstructor(ConstructorInfo::hasNoParams).getParam(0)).asMessage().is("Invalid index '0'. No parameters.");
assertThrown(()->b.getPublicConstructor(x -> x.hasParamTypes(String.class)).getParam(-1)).asMessage().is("Invalid index '-1'. Parameter count: 1");
assertThrown(()->b.getPublicConstructor(x -> x.hasParamTypes(String.class)).getParam(1)).asMessage().is("Invalid index '1'. Parameter count: 1");
}
@@ -267,7 +267,7 @@ public class ExecutableInfoTest {
}
static ClassInfo c = ClassInfo.of(C.class);
static ConstructorInfo
- c_c1=c.getPublicConstructor(x -> x.hasNoParams()),
+ c_c1=c.getPublicConstructor(ConstructorInfo::hasNoParams),
c_c2=c.getPublicConstructor(x -> x.hasParamTypes(String.class)),
c_c3=c.getPublicConstructor(x -> x.hasParamTypes(int.class))
;
@@ -328,7 +328,7 @@ public class ExecutableInfoTest {
}
static ClassInfo d = ClassInfo.of(D.class);
static ExecutableInfo
- d_c=d.getPublicConstructor(x -> x.hasNoParams()),
+ d_c=d.getPublicConstructor(ConstructorInfo::hasNoParams),
d_m=d.getPublicMethod(x -> x.hasName("m"))
;
@@ -584,7 +584,7 @@ public class ExecutableInfoTest {
@Test
public void getFullName_constructor() {
- assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X()", x.getPublicConstructor(x -> x.hasNoParams()).getFullName());
+ assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X()", x.getPublicConstructor(ConstructorInfo::hasNoParams).getFullName());
assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X(java.lang.String)", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getFullName());
assertEquals("org.apache.juneau.reflect.ExecutableInfoTest$X(java.util.Map<java.lang.String,java.lang.Object>)", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getFullName());
}
@@ -598,7 +598,7 @@ public class ExecutableInfoTest {
@Test
public void getShortName_constructor() {
- assertEquals("X()", x.getPublicConstructor(x -> x.hasNoParams()).getShortName());
+ assertEquals("X()", x.getPublicConstructor(ConstructorInfo::hasNoParams).getShortName());
assertEquals("X(String)", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getShortName());
assertEquals("X(Map)", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getShortName());
}
@@ -612,7 +612,7 @@ public class ExecutableInfoTest {
@Test
public void getSimpleName_constructor() {
- assertEquals("X", x.getPublicConstructor(x -> x.hasNoParams()).getSimpleName());
+ assertEquals("X", x.getPublicConstructor(ConstructorInfo::hasNoParams).getSimpleName());
assertEquals("X", x.getPublicConstructor(x -> x.hasParamTypes(String.class)).getSimpleName());
assertEquals("X", x.getPublicConstructor(x -> x.hasParamTypes(Map.class)).getSimpleName());
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
index a5a2e36b2..5a73f0d2e 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/annotation/Rest_DefaultRequestAttributes_Test.java
@@ -151,7 +151,7 @@ public class Rest_DefaultRequestAttributes_Test {
public static class B1 extends MockWriterSerializer {
public B1(MockWriterSerializer.Builder b) {
- super(b.produces("test/s1").accept("text/s1,text/s2,text/s3").function((s,o) -> out(s)).headers(s->headers(s)));
+ super(b.produces("test/s1").accept("text/s1,text/s2,text/s3").function((s,o) -> out(s)).headers(B1::headers));
}
public static String out(SerializerSession s) {
JsonMap sp = s.getSessionProperties();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
index 6c5b0b92f..553ef287b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_BasicCalls_Test.java
@@ -32,6 +32,7 @@ import org.apache.juneau.http.annotation.*;
import org.apache.juneau.http.part.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.testutils.*;
@@ -88,7 +89,7 @@ public class RestClient_BasicCalls_Test {
}
@RestOp(path="/checkHeader")
public String[] postHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestOp(path="/",method="*")
public Reader echoMethod(@Method String method) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
index 68f617ada..39b78f7bb 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Body_Test.java
@@ -168,7 +168,7 @@ public class RestClient_Body_Test {
.assertHeader("X-Content-Type").is("application/json")
.assertContent().as(ABean.class).asJson().is("{a:1,b:'foo'}");
- SerializedEntity x3 = serializedEntity(()->ABean.get(),js,null);
+ SerializedEntity x3 = serializedEntity(ABean::get,js,null);
client().build().post("/",x3).run()
.assertHeader("X-Content-Length").isNull()
.assertHeader("X-Content-Encoding").isNull()
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
index 24710ba58..3710d8ca1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_BeanContext_Test.java
@@ -27,6 +27,7 @@ import org.apache.juneau.collections.*;
import org.apache.juneau.json.*;
import org.apache.juneau.parser.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.apache.juneau.swap.*;
@@ -43,7 +44,7 @@ public class RestClient_Config_BeanContext_Test {
}
@RestGet
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestGet
public Reader checkQuery(org.apache.juneau.rest.RestRequest req) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
index 5754ab5bd..66747805c 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_OpenApi_Test.java
@@ -22,6 +22,7 @@ import java.io.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.*;
@@ -37,7 +38,7 @@ public class RestClient_Config_OpenApi_Test {
}
@RestGet
public String[] checkHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
@RestGet
public Reader checkQuery(org.apache.juneau.rest.RestRequest req) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
index cb25fa276..404f1c85d 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Config_RestClient_Test.java
@@ -87,7 +87,7 @@ public class RestClient_Config_RestClient_Test {
}
@RestOp(path="/checkHeader")
public String[] getHeader(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
@@ -446,7 +446,7 @@ public class RestClient_Config_RestClient_Test {
public static class A12b extends MockReaderParser {
public A12b(Builder builder) {
- super(builder.partFunction((t,s,in,c)->in(t,s,in,c)));
+ super(builder.partFunction(A12b::in));
}
private static Object in(HttpPartType type, HttpPartSchema schema, String in, ClassMeta<?> c) {
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
index 1ffed1926..5c9d7b553 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Headers_Test.java
@@ -26,6 +26,7 @@ import org.apache.juneau.http.header.*;
import org.apache.juneau.httppart.*;
import org.apache.juneau.marshaller.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.logger.*;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
@@ -64,7 +65,7 @@ public class RestClient_Headers_Test {
public static class A extends BasicRestObject {
@RestGet
public String[] headers(org.apache.juneau.rest.RestRequest req) {
- return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(x -> x.getValue()).toArray(String[]::new);
+ return req.getHeaders().getAll(req.getHeaderParam("Check").orElse(null)).stream().map(RequestHeader::getValue).toArray(String[]::new);
}
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
index 1da02fe9b..ee8db9e22 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Response_Headers_Test.java
@@ -28,6 +28,7 @@ import org.apache.http.*;
import org.apache.juneau.*;
import org.apache.juneau.http.header.*;
import org.apache.juneau.rest.annotation.*;
+import org.apache.juneau.rest.httppart.RequestHeader;
import org.apache.juneau.rest.mock.*;
import org.apache.juneau.rest.servlet.*;
import org.junit.*;
@@ -40,7 +41,7 @@ public class RestClient_Response_Headers_Test {
@RestGet
public String echo(org.apache.juneau.rest.RestRequest req, org.apache.juneau.rest.RestResponse res) {
String c = req.getHeaderParam("Check").orElse(null);
- String[] h = req.getHeaders().getAll(c).stream().map(x -> x.getValue()).toArray(String[]::new);
+ String[] h = req.getHeaders().getAll(c).stream().map(RequestHeader::getValue).toArray(String[]::new);
if (h != null)
for (String hh : h)
res.addHeader(c, hh);
diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
index 10fc96a40..6da37590f 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/rest/test/client/ThirdPartyProxyTest.java
@@ -1154,7 +1154,7 @@ public class ThirdPartyProxyTest {
@Test
public void ga07_reqBeanPath7() throws Exception {
- String r = proxy.reqBeanPath7(() -> ABean.get());
+ String r = proxy.reqBeanPath7(ABean::get);
assertEquals("OK", r);
}
@@ -1223,7 +1223,7 @@ public class ThirdPartyProxyTest {
@Test
public void gb07_reqBeanQuery7() throws Exception {
String r = proxy.reqBeanQuery7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
@@ -1293,7 +1293,7 @@ public class ThirdPartyProxyTest {
@Test
public void gd07_reqBeanFormData7() throws Exception {
String r = proxy.reqBeanFormData7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
@@ -1363,7 +1363,7 @@ public class ThirdPartyProxyTest {
@Test
public void gf07_reqBeanHeader7() throws Exception {
String r = proxy.reqBeanHeader7(
- () -> ABean.get()
+ ABean::get
);
assertEquals("OK", r);
}
diff --git a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
index adef8fd2d..dc450f67b 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/soap/SoapXmlConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class SoapXmlConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java b/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
index 95fed673b..fe983eda1 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/transforms/ObjectSwapTest.java
@@ -19,6 +19,7 @@ import org.apache.juneau.*;
import org.apache.juneau.html.*;
import org.apache.juneau.json.*;
import org.apache.juneau.serializer.*;
+import org.apache.juneau.serializer.WriterSerializer.Builder;
import org.apache.juneau.swap.*;
import org.apache.juneau.xml.*;
import org.junit.*;
@@ -75,7 +76,7 @@ public class ObjectSwapTest {
SerializerSet s = SerializerSet.create()
.add(JsonSerializer.class, XmlSerializer.class, HtmlSerializer.class)
- .forEach(WriterSerializer.Builder.class, x -> x.sq())
+ .forEach(WriterSerializer.Builder.class, Builder::sq)
.forEach(Serializer.Builder.class, x -> x.swaps(MyJsonSwap.class, MyXmlSwap.class, MyOtherSwap.class))
.build();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
index e5abf8229..310757cc8 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/uon/UonConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class UonConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
diff --git a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
index cd608b7f1..1bfea83fd 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/urlencoding/UrlEncodingConfigAnnotationTest.java
@@ -33,7 +33,7 @@ public class UrlEncodingConfigAnnotationTest {
assertEquals(expected, TO_STRING.apply(o));
}
- private static final Function<Object,String> TO_STRING = t -> t.toString();
+ private static final Function<Object,String> TO_STRING = Object::toString;
static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();