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 5dcc552938d1ebc41fb2783683deb2a0fdf83fea Author: Gary Gregory <[email protected]> AuthorDate: Fri Jun 23 23:03:13 2023 -0400 [juneau-utest] Use lambdas --- .../java/org/apache/juneau/config/ConfigTest.java | 33 ++++---- .../config/store/ConfigClasspathStoreTest.java | 22 ++---- .../juneau/config/store/ConfigFileStoreTest.java | 88 ++++++++-------------- .../juneau/config/store/ConfigMemoryStoreTest.java | 22 ++---- .../juneau/html/HtmlConfigAnnotation_Test.java | 11 +-- .../juneau/html/HtmlDocConfigAnnotation_Test.java | 27 +++---- .../org/apache/juneau/http/BasicPart_Test.java | 14 +--- .../org/apache/juneau/http/HttpHeaders_Test.java | 14 +--- .../org/apache/juneau/http/remote/Remote_Test.java | 25 ++---- .../juneau/json/JsonConfigAnnotationTest.java | 7 +- .../jsonschema/JsonSchemaConfigAnnotationTest.java | 23 +++--- .../msgpack/MsgPackConfigAnnotationTest.java | 7 +- .../juneau/parser/ParserConfigAnnotationTest.java | 17 ++--- .../org/apache/juneau/reflect/ClassInfoTest.java | 61 +++++++-------- .../org/apache/juneau/reflect/FieldInfoTest.java | 29 ++++--- .../rest/client/RestClient_FormData_Test.java | 13 ++-- .../rest/client/RestClient_Headers_Test.java | 9 +-- .../apache/juneau/rest/client/RestClient_Test.java | 24 +----- .../rest/test/client/ThirdPartyProxyTest.java | 76 ++++--------------- .../serializer/SerializerConfigAnnotationTest.java | 17 ++--- .../juneau/soap/SoapXmlConfigAnnotationTest.java | 7 +- .../apache/juneau/uon/UonConfigAnnotationTest.java | 7 +- .../UrlEncodingConfigAnnotationTest.java | 7 +- .../apache/juneau/xml/XmlConfigAnnotationTest.java | 29 ++++--- 24 files changed, 198 insertions(+), 391 deletions(-) diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java index f211d06f4..534b75e94 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java @@ -1256,25 +1256,20 @@ public class ConfigTest { final Set<String> changes = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); - cf.addListener( - new ConfigEventListener() { - @Override - public void onConfigChange(ConfigEvents events) { - for (ConfigEvent ce : events) { - String key = (ce.getSection().equals("") ? "" : (ce.getSection() + '/')) + ce.getKey(); - if (ce.getType() == ConfigEventType.REMOVE_ENTRY) { - changes.add("REMOVE_ENTRY("+key+")"); - } else if (ce.getType() == ConfigEventType.REMOVE_SECTION) { - changes.add("REMOVE_SECTION("+ce.getSection()+")"); - } else if (ce.getType() == ConfigEventType.SET_SECTION) { - changes.add("SET_SECTION("+ce.getSection()+")"); - } else { - changes.add(key + '=' + ce.getValue()); - } - } - } - } - ); + cf.addListener(events -> { + for (ConfigEvent ce : events) { + String key = (ce.getSection().equals("") ? "" : (ce.getSection() + '/')) + ce.getKey(); + if (ce.getType() == ConfigEventType.REMOVE_ENTRY) { + changes.add("REMOVE_ENTRY(" + key + ")"); + } else if (ce.getType() == ConfigEventType.REMOVE_SECTION) { + changes.add("REMOVE_SECTION(" + ce.getSection() + ")"); + } else if (ce.getType() == ConfigEventType.SET_SECTION) { + changes.add("SET_SECTION(" + ce.getSection() + ")"); + } else { + changes.add(key + '=' + ce.getValue()); + } + } + }); // No changes until save. changes.clear(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java index 409240d21..e908725c8 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigClasspathStoreTest.java @@ -70,20 +70,14 @@ public class ConfigClasspathStoreTest { ClasspathStore fs = ClasspathStore.create().build(); final CountDownLatch latch = new CountDownLatch(2); - fs.register("X.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); + fs.register("X.cfg", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("Y.cfg", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); fs.update("X.cfg", "xxx"); fs.update("Y.cfg", "yyy"); diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java index 66c1d1e22..a68851d6d 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigFileStoreTest.java @@ -145,34 +145,22 @@ public class ConfigFileStoreTest { FileStore fs = FileStore.create().directory(DIR).enableWatcher().watcherSensitivity(WatcherSensitivity.HIGH).build(); final CountDownLatch latch = new CountDownLatch(4); - fs.register("X.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("X", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); + fs.register("X.cfg", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("X", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("Y.cfg", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); + fs.register("Y", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); pipe(reader("zzz"), new File(DIR, "Z.ini")); pipe(reader("xxx"), new File(DIR, "X.cfg")); pipe(reader("yyy"), new File(DIR, "Y.cfg")); @@ -185,34 +173,22 @@ public class ConfigFileStoreTest { FileStore fs = FileStore.create().directory(DIR).build(); final CountDownLatch latch = new CountDownLatch(4); - fs.register("X.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("X", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y.cfg", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); + fs.register("X.cfg", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("X", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("Y.cfg", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); + fs.register("Y", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); fs.update("X.cfg", "xxx"); fs.update("Y.cfg", "yyy"); diff --git a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java index 3a574ff25..b30d64c43 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/config/store/ConfigMemoryStoreTest.java @@ -53,20 +53,14 @@ public class ConfigMemoryStoreTest { MemoryStore fs = MemoryStore.create().build(); final CountDownLatch latch = new CountDownLatch(2); - fs.register("X", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("xxx".equals(contents)) - latch.countDown(); - } - }); - fs.register("Y", new ConfigStoreListener() { - @Override - public void onChange(String contents) { - if ("yyy".equals(contents)) - latch.countDown(); - } - }); + fs.register("X", contents -> { + if ("xxx".equals(contents)) + latch.countDown(); + }); + fs.register("Y", contents -> { + if ("yyy".equals(contents)) + latch.countDown(); + }); fs.update("X", "xxx"); fs.update("Y", "yyy"); diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java index 9a9c166ab..b042e5c5f 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlConfigAnnotation_Test.java @@ -15,6 +15,7 @@ package org.apache.juneau.html; import static org.junit.Assert.*; import static org.junit.runners.MethodSorters.*; +import java.util.Objects; import java.util.function.*; import org.apache.juneau.*; @@ -33,14 +34,8 @@ public class HtmlConfigAnnotation_Test { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> Objects.toString(t, null); + static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java index 9d48ae751..dcc47d87d 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/html/HtmlDocConfigAnnotation_Test.java @@ -36,21 +36,18 @@ public class HtmlDocConfigAnnotation_Test { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t.getClass().isArray()) - return apply(ArrayUtils.toList(t, Object.class)); - if (t instanceof Collection) - return ((Collection<?>)t) - .stream() - .map(TO_STRING) - .collect(Collectors.joining(",")); - if (t instanceof HtmlDocTemplate) - return ((HtmlDocTemplate)t).getClass().getSimpleName(); - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t.getClass().isArray()) + return HtmlDocConfigAnnotation_Test.TO_STRING.apply(ArrayUtils.toList(t, Object.class)); + if (t instanceof Collection) + return ((Collection<?>)t) + .stream() + .map(HtmlDocConfigAnnotation_Test.TO_STRING) + .collect(Collectors.joining(",")); + if (t instanceof HtmlDocTemplate) + return ((HtmlDocTemplate)t).getClass().getSimpleName(); + return t.toString(); + }; static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java index 4b992cd7e..895d7224f 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/BasicPart_Test.java @@ -68,18 +68,8 @@ public class BasicPart_Test { SerializedHeader x4 = serializedHeader("X4","4"); Map.Entry<String,Object> x5 = map("X5",(Object)"5").entrySet().iterator().next(); org.apache.http.message.BasicNameValuePair x6 = new org.apache.http.message.BasicNameValuePair("X6","6"); - NameValuePairable x7 = new NameValuePairable() { - @Override - public NameValuePair asNameValuePair() { - return part("X7","7"); - } - }; - Headerable x8 = new Headerable() { - @Override - public Header asHeader() { - return header("X8","8"); - } - }; + NameValuePairable x7 = () -> part("X7","7"); + Headerable x8 = () -> header("X8","8"); assertObject(BasicPart.cast(x1)).isType(NameValuePair.class).asJson().is("'X1=1'"); assertObject(BasicPart.cast(x2)).isType(NameValuePair.class).asJson().is("'X2=2'"); diff --git a/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java b/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java index bba48414a..b690cd4cc 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/http/HttpHeaders_Test.java @@ -35,18 +35,8 @@ public class HttpHeaders_Test { SerializedHeader x4 = serializedHeader("X4","4"); Map.Entry<String,Object> x5 = map("X5",(Object)"5").entrySet().iterator().next(); org.apache.http.message.BasicNameValuePair x6 = new org.apache.http.message.BasicNameValuePair("X6","6"); - NameValuePairable x7 = new NameValuePairable() { - @Override - public NameValuePair asNameValuePair() { - return part("X7","7"); - } - }; - Headerable x8 = new Headerable() { - @Override - public Header asHeader() { - return header("X8","8"); - } - }; + NameValuePairable x7 = () -> part("X7","7"); + Headerable x8 = () -> header("X8","8"); SerializedPart x9 = serializedPart("X9",()->"9"); assertObject(HttpHeaders.cast(x1)).isType(Header.class).asJson().is("'X1: 1'"); 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 6b969fc67..b73d99ef8 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 @@ -460,12 +460,7 @@ public class Remote_Test { public static class E implements BasicJson5Config { @RestOp(method=HttpMethod.RRPC) public E1 proxy() { - return new E1() { - @Override - public String echo(String body) { - return body; - } - }; + return body -> body; } } @@ -506,12 +501,9 @@ public class Remote_Test { public static class E5 implements BasicJson5Config { @RestOp(method=HttpMethod.RRPC) public E5b proxy() { - return new E5b() { - @Override - public String echo(String body) throws E5a { - throw new E5a("foobar"); - } - }; + return body -> { + throw new E5a("foobar"); + }; } } @@ -536,12 +528,9 @@ public class Remote_Test { public static class E6 implements BasicJson5Config { @RestOp(method=HttpMethod.RRPC) public E5b proxy() { - return new E5b() { - @Override - public String echo(String body) throws E5a { - throw new AssertionError("foobar"); - } - }; + return body -> { + throw new AssertionError("foobar"); + }; } } 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 e12930d03..1419c90ed 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,12 +33,7 @@ public class JsonConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> t.toString(); static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java index fd6cba31a..be1f2c9e8 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/jsonschema/JsonSchemaConfigAnnotationTest.java @@ -35,19 +35,16 @@ public class JsonSchemaConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t instanceof Collection) - return ((Collection<?>)t) - .stream() - .map(TO_STRING) - .collect(Collectors.joining(",")); - if (t instanceof BeanDefMapper) - return ((BeanDefMapper)t).getClass().getSimpleName(); - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t instanceof Collection) + return ((Collection<?>)t) + .stream() + .map(JsonSchemaConfigAnnotationTest.TO_STRING) + .collect(Collectors.joining(",")); + if (t instanceof BeanDefMapper) + return ((BeanDefMapper)t).getClass().getSimpleName(); + return t.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 4fff29351..f3d468d7b 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,12 +33,7 @@ public class MsgPackConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> t.toString(); static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java index 7fb048e6c..01ed927d5 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/parser/ParserConfigAnnotationTest.java @@ -36,16 +36,13 @@ public class ParserConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - if (t instanceof AA) - return "AA"; - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t == null) + return null; + if (t instanceof AA) + return "AA"; + return t.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 82f9cd041..76fcb12fd 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 @@ -90,38 +90,35 @@ public class ClassInfoTest { } } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - if (t instanceof Class) - return ((Class<?>)t).getSimpleName(); - if (t instanceof Package) - return ((Package)t).getName(); - if (t instanceof ClassInfo) - return ((ClassInfo)t).getSimpleName(); - if (t instanceof MethodInfo) - return ((MethodInfo)t).getDeclaringClass().getSimpleName() + '.' + ((MethodInfo)t).getShortName(); - if (t instanceof ConstructorInfo) - return ((ConstructorInfo)t).getShortName(); - if (t instanceof FieldInfo) - return ((FieldInfo)t).getDeclaringClass().getSimpleName() + '.' + ((FieldInfo)t).getName(); - if (t instanceof A) - return "@A(" + ((A)t).value() + ")"; - if (t instanceof PA) - return "@PA(" + ((PA)t).value() + ")"; - if (t instanceof AConfig) - return "@AConfig(" + ((AConfig)t).value() + ")"; - if (t instanceof AnnotationInfo) - return apply(((AnnotationInfo<?>)t).inner()); - if (t instanceof AnnotationList) { - AnnotationList al = (AnnotationList)t; - return al.toString(); - } - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t == null) + return null; + if (t instanceof Class) + return ((Class<?>)t).getSimpleName(); + if (t instanceof Package) + return ((Package)t).getName(); + if (t instanceof ClassInfo) + return ((ClassInfo)t).getSimpleName(); + if (t instanceof MethodInfo) + return ((MethodInfo)t).getDeclaringClass().getSimpleName() + '.' + ((MethodInfo)t).getShortName(); + if (t instanceof ConstructorInfo) + return ((ConstructorInfo)t).getShortName(); + if (t instanceof FieldInfo) + return ((FieldInfo)t).getDeclaringClass().getSimpleName() + '.' + ((FieldInfo)t).getName(); + if (t instanceof A) + return "@A(" + ((A)t).value() + ")"; + if (t instanceof PA) + return "@PA(" + ((PA)t).value() + ")"; + if (t instanceof AConfig) + return "@AConfig(" + ((AConfig)t).value() + ")"; + if (t instanceof AnnotationInfo) + return ClassInfoTest.TO_STRING.apply(((AnnotationInfo<?>)t).inner()); + if (t instanceof AnnotationList) { + AnnotationList al = (AnnotationList)t; + return al.toString(); + } + return t.toString(); + }; //----------------------------------------------------------------------------------------------------------------- // Initialization diff --git a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java index 8be01ccf0..708346705 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/reflect/FieldInfoTest.java @@ -49,22 +49,19 @@ public class FieldInfoTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - if (t instanceof A) - return "@A(" + ((A)t).value() + ")"; - if (t instanceof ClassInfo) - return ((ClassInfo)t).getSimpleName(); - if (t instanceof FieldInfo) - return ((FieldInfo)t).getName(); - if (t instanceof Field) - return ((Field)t).getName(); - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t == null) + return null; + if (t instanceof A) + return "@A(" + ((A)t).value() + ")"; + if (t instanceof ClassInfo) + return ((ClassInfo)t).getSimpleName(); + if (t instanceof FieldInfo) + return ((FieldInfo)t).getName(); + if (t instanceof Field) + return ((Field)t).getName(); + return t.toString(); + }; private static FieldInfo off(Class<?> c, String name) { try { diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java index 390be2071..e39109a6a 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_FormData_Test.java @@ -146,14 +146,11 @@ public class RestClient_FormData_Test { public static class A12 implements HttpPartSerializer { @Override - public HttpPartSerializerSession getPartSession() { - return new HttpPartSerializerSession() { - @Override - public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException { - throw new SerializeException("bad"); - } - }; - } + public HttpPartSerializerSession getPartSession() { + return (type, schema, value) -> { + throw new SerializeException("bad"); + }; + } } @Test 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 fe81036fc..247ca66b5 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 @@ -128,12 +128,9 @@ public class RestClient_Headers_Test { public static class A12 implements HttpPartSerializer { @Override public HttpPartSerializerSession getPartSession() { - return new HttpPartSerializerSession() { - @Override - public String serialize(HttpPartType type, HttpPartSchema schema, Object value) throws SerializeException, SchemaValidationException { - throw new SerializeException("bad"); - } - }; + return (type, schema, value) -> { + throw new SerializeException("bad"); + }; } } diff --git a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java index 978046a31..1db594fdb 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java +++ b/juneau-utest/src/test/java/org/apache/juneau/rest/client/RestClient_Test.java @@ -169,26 +169,10 @@ public class RestClient_Test { @Test public void c01_httpClient_interceptors() throws Exception { - HttpRequestInterceptor x1 = new HttpRequestInterceptor() { - @Override public void process(HttpRequest request, HttpContext context) throws HttpException,IOException { - request.setHeader("A1","1"); - } - }; - HttpResponseInterceptor x2 = new HttpResponseInterceptor() { - @Override public void process(HttpResponse response, HttpContext context) throws HttpException,IOException { - response.setHeader("B1","1"); - } - }; - HttpRequestInterceptor x3 = new HttpRequestInterceptor() { - @Override public void process(HttpRequest request, HttpContext context) throws HttpException,IOException { - request.setHeader("A2","2"); - } - }; - HttpResponseInterceptor x4 = new HttpResponseInterceptor() { - @Override public void process(HttpResponse response, HttpContext context) throws HttpException,IOException { - response.setHeader("B2","2"); - } - }; + HttpRequestInterceptor x1 = (request, context) -> request.setHeader("A1","1"); + HttpResponseInterceptor x2 = (response, context) -> response.setHeader("B1","1"); + HttpRequestInterceptor x3 = (request, context) -> request.setHeader("A2","2"); + HttpResponseInterceptor x4 = (response, context) -> response.setHeader("B2","2"); client().addInterceptorFirst(x1).addInterceptorLast(x2).addInterceptorFirst(x3).addInterceptorLast(x4) .build().get("/echo").run().assertContent().isContains("A1: 1","A2: 2").assertHeader("B1").is("1").assertHeader("B2").is("2"); 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 4ced630d8..10fc96a40 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 @@ -1147,31 +1147,16 @@ public class ThirdPartyProxyTest { } @Test - public void ga06_reqBeanPath6() throws Exception { - String r = proxy.reqBeanPath6( - new ReqBeanPath6() { - @Override - public Map<String,Object> getX() { - return map("a",1,"b","foo"); - } - - } - ); - assertEquals("OK", r); - } + public void ga06_reqBeanPath6() throws Exception { + String r = proxy.reqBeanPath6(() -> map("a", 1, "b", "foo")); + assertEquals("OK", r); + } @Test - public void ga07_reqBeanPath7() throws Exception { - String r = proxy.reqBeanPath7( - new ReqBeanPath7() { - @Override - public ABean getX() { - return ABean.get(); - } - } - ); - assertEquals("OK", r); - } + public void ga07_reqBeanPath7() throws Exception { + String r = proxy.reqBeanPath7(() -> ABean.get()); + assertEquals("OK", r); + } //----------------------------------------------------------------------------------------------------------------- // @Request tests - Query @@ -1230,13 +1215,7 @@ public class ThirdPartyProxyTest { @Test public void gb06_reqBeanQuery6() throws Exception { String r = proxy.reqBeanQuery6( - new ReqBeanQuery6() { - @Override - public Map<String,Object> getX() { - return map("a",1,"b","foo"); - } - - } + () -> map("a",1,"b","foo") ); assertEquals("OK", r); } @@ -1244,12 +1223,7 @@ public class ThirdPartyProxyTest { @Test public void gb07_reqBeanQuery7() throws Exception { String r = proxy.reqBeanQuery7( - new ReqBeanQuery7() { - @Override - public ABean getX() { - return ABean.get(); - } - } + () -> ABean.get() ); assertEquals("OK", r); } @@ -1311,13 +1285,7 @@ public class ThirdPartyProxyTest { @Test public void gd06_reqBeanFormData6() throws Exception { String r = proxy.reqBeanFormData6( - new ReqBeanFormData6() { - @Override - public Map<String,Object> getX() { - return map("a",1,"b","foo"); - } - - } + () -> map("a",1,"b","foo") ); assertEquals("OK", r); } @@ -1325,12 +1293,7 @@ public class ThirdPartyProxyTest { @Test public void gd07_reqBeanFormData7() throws Exception { String r = proxy.reqBeanFormData7( - new ReqBeanFormData7() { - @Override - public ABean getX() { - return ABean.get(); - } - } + () -> ABean.get() ); assertEquals("OK", r); } @@ -1392,13 +1355,7 @@ public class ThirdPartyProxyTest { @Test public void gf06_reqBeanHeader6() throws Exception { String r = proxy.reqBeanHeader6( - new ReqBeanHeader6() { - @Override - public Map<String,Object> getX() { - return map("a",1,"b","foo"); - } - - } + () -> map("a",1,"b","foo") ); assertEquals("OK", r); } @@ -1406,12 +1363,7 @@ public class ThirdPartyProxyTest { @Test public void gf07_reqBeanHeader7() throws Exception { String r = proxy.reqBeanHeader7( - new ReqBeanHeader7() { - @Override - public ABean getX() { - return ABean.get(); - } - } + () -> ABean.get() ); assertEquals("OK", r); } diff --git a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java index d4b37c0c2..839936657 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/serializer/SerializerConfigAnnotationTest.java @@ -35,16 +35,13 @@ public class SerializerConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - if (t instanceof AA) - return "AA"; - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t == null) + return null; + if (t instanceof AA) + return "AA"; + return t.toString(); + }; static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); 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 f454b81f7..adef8fd2d 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,12 +33,7 @@ public class SoapXmlConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> t.toString(); static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); 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 5e621925a..e5abf8229 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,12 +33,7 @@ public class UonConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> t.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 42cc19878..cd608b7f1 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,12 +33,7 @@ public class UrlEncodingConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> t.toString(); static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession(); diff --git a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java index 2360a1eb6..17588f1d9 100644 --- a/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java +++ b/juneau-utest/src/test/java/org/apache/juneau/xml/XmlConfigAnnotationTest.java @@ -38,22 +38,19 @@ public class XmlConfigAnnotationTest { assertEquals(expected, TO_STRING.apply(o)); } - private static final Function<Object,String> TO_STRING = new Function<>() { - @Override - public String apply(Object t) { - if (t == null) - return null; - if (t.getClass().isArray()) - return apply(ArrayUtils.toList(t, Object.class)); - if (t instanceof AA) - return "AA"; - if (t instanceof AB) - return "AB"; - if (t instanceof AC) - return "AC"; - return t.toString(); - } - }; + private static final Function<Object,String> TO_STRING = t -> { + if (t == null) + return null; + if (t.getClass().isArray()) + return XmlConfigAnnotationTest.TO_STRING.apply(ArrayUtils.toList(t, Object.class)); + if (t instanceof AA) + return "AA"; + if (t instanceof AB) + return "AB"; + if (t instanceof AC) + return "AC"; + return t.toString(); + }; static VarResolverSession sr = VarResolver.create().vars(XVar.class).build().createSession();
