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:45 UTC
[juneau] 09/29: [juneau-rest-server] Use lambdas
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 0c37f204d35e5738c6f0281ee4a1f77be8f77542
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 22:53:11 2023 -0400
[juneau-rest-server] Use lambdas
---
.../java/org/apache/juneau/rest/RestRequest.java | 47 ++++++++++------------
.../apache/juneau/rest/arg/ResponseBeanArg.java | 21 +++++-----
.../apache/juneau/rest/arg/ResponseCodeArg.java | 7 +---
.../apache/juneau/rest/arg/ResponseHeaderArg.java | 21 +++++-----
4 files changed, 40 insertions(+), 56 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
index 2467183e1..a714cfcdb 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -21,7 +21,6 @@ import static java.util.Optional.*;
import java.io.*;
import java.lang.reflect.*;
-import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.*;
import java.nio.charset.*;
@@ -1523,31 +1522,27 @@ public final class RestRequest extends HttpServletRequestWrapper {
return (T)Proxy.newProxyInstance(
c.getClassLoader(),
new Class[] { c },
- new InvocationHandler() {
- @Override /* InvocationHandler */
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
- RequestBeanPropertyMeta pm = rbm.getProperty(method.getName());
- if (pm != null) {
- HttpPartParserSession pp = pm.getParser(getPartParserSession());
- HttpPartSchema schema = pm.getSchema();
- String name = pm.getPartName();
- ClassMeta<?> type = bs.getClassMeta(method.getGenericReturnType());
- HttpPartType pt = pm.getPartType();
- if (pt == HttpPartType.BODY)
- return getContent().setSchema(schema).as(type);
- if (pt == QUERY)
- return getQueryParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == FORMDATA)
- return getFormParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == HEADER)
- return getHeaderParam(name).parser(pp).schema(schema).as(type).orElse(null);
- if (pt == PATH)
- return getPathParam(name).parser(pp).schema(schema).as(type).orElse(null);
- }
- return null;
- }
-
- });
+ (InvocationHandler) (proxy, method, args) -> {
+ RequestBeanPropertyMeta pm = rbm.getProperty(method.getName());
+ if (pm != null) {
+ HttpPartParserSession pp = pm.getParser(getPartParserSession());
+ HttpPartSchema schema = pm.getSchema();
+ String name = pm.getPartName();
+ ClassMeta<?> type = bs.getClassMeta(method.getGenericReturnType());
+ HttpPartType pt = pm.getPartType();
+ if (pt == HttpPartType.BODY)
+ return getContent().setSchema(schema).as(type);
+ if (pt == QUERY)
+ return getQueryParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == FORMDATA)
+ return getFormParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == HEADER)
+ return getHeaderParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ if (pt == PATH)
+ return getPathParam(name).parser(pp).schema(schema).as(type).orElse(null);
+ }
+ return null;
+ });
} catch (Exception e) {
throw asRuntimeException(e);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
index d840450fe..a321949ef 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseBeanArg.java
@@ -71,18 +71,15 @@ public class ResponseBeanArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- RestRequest req = opSession.getRequest();
- RestResponse res = opSession.getResponse();
- ResponseBeanMeta meta = req.getOpContext().getResponseBeanMeta(o);
- if (meta == null)
- meta = ResponseBeanArg.this.meta;
- res.setResponseBeanMeta(meta);
- res.setContent(o);
- }
- });
+ v.listener(o -> {
+ RestRequest req = opSession.getRequest();
+ RestResponse res = opSession.getResponse();
+ ResponseBeanMeta meta = req.getOpContext().getResponseBeanMeta(o);
+ if (meta == null)
+ meta = ResponseBeanArg.this.meta;
+ res.setResponseBeanMeta(meta);
+ res.setContent(o);
+ });
return v;
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
index 6ddfafbca..03a924632 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseCodeArg.java
@@ -59,12 +59,7 @@ public class ResponseCodeArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- opSession.getResponse().setStatus(Integer.parseInt(o.toString()));
- }
- });
+ v.listener(o -> opSession.getResponse().setStatus(Integer.parseInt(o.toString())));
return v;
}
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
index 3f50da126..5d99654a1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/ResponseHeaderArg.java
@@ -81,18 +81,15 @@ public class ResponseHeaderArg implements RestOpArg {
@Override /* RestOpArg */
public Object resolve(final RestOpSession opSession) throws Exception {
Value<Object> v = new Value();
- v.listener(new ValueListener() {
- @Override
- public void onSet(Object o) {
- RestRequest req = opSession.getRequest();
- RestResponse res = opSession.getResponse();
- ResponsePartMeta rpm = req.getOpContext().getResponseHeaderMeta(o);
- if (rpm == null)
- rpm = ResponseHeaderArg.this.meta;
- HttpPartSerializerSession pss = rpm.getSerializer() == null ? req.getPartSerializerSession() : rpm.getSerializer().getPartSession();
- res.setHeader(new SerializedHeader(name, o, pss, rpm.getSchema(), false));
- }
- });
+ v.listener(o -> {
+ RestRequest req = opSession.getRequest();
+ RestResponse res = opSession.getResponse();
+ ResponsePartMeta rpm = req.getOpContext().getResponseHeaderMeta(o);
+ if (rpm == null)
+ rpm = ResponseHeaderArg.this.meta;
+ HttpPartSerializerSession pss = rpm.getSerializer() == null ? req.getPartSerializerSession() : rpm.getSerializer().getPartSession();
+ res.setHeader(new SerializedHeader(name, o, pss, rpm.getSchema(), false));
+ });
return v;
}
}