Repository: cxf
Updated Branches:
refs/heads/master 0642440cd -> dbc4de183
Making it easier to check if a given JAXRS operation is async
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae4f03a9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae4f03a9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae4f03a9
Branch: refs/heads/master
Commit: ae4f03a912b45e5e0cc6f09b4444f528d82885e8
Parents: eafa719
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Tue Aug 11 13:45:08 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Tue Aug 11 13:45:08 2015 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/model/OperationResourceInfo.java | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae4f03a9/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
index 9889084..181243b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/OperationResourceInfo.java
@@ -30,6 +30,7 @@ import javax.ws.rs.Consumes;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.Encoded;
import javax.ws.rs.Produces;
+import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.Oneway;
@@ -48,7 +49,8 @@ public class OperationResourceInfo {
private boolean encoded;
private String defaultParamValue;
private List<Parameter> parameters;
- private boolean oneway;
+ private boolean oneway;
+ private boolean async;
private Set<String> nameBindings = new LinkedHashSet<String>();
private Class<?>[] actualInParamTypes;
private Type[] actualInGenericParamTypes;
@@ -70,6 +72,7 @@ public class OperationResourceInfo {
this.defaultParamValue = ori.defaultParamValue;
this.parameters = ori.parameters;
this.oneway = ori.oneway;
+ this.async = ori.async;
this.classResourceInfo = cri;
this.nameBindings = ori.nameBindings;
initActualMethodProperties();
@@ -87,6 +90,7 @@ public class OperationResourceInfo {
checkEncoded();
checkDefaultParameterValue();
checkOneway();
+ checkSuspended();
initActualMethodProperties();
}
@@ -154,10 +158,23 @@ public class OperationResourceInfo {
oneway = AnnotationUtils.getAnnotation(annotatedMethod.getAnnotations(), Oneway.class) != null;
}
}
+ private void checkSuspended() {
+ if (annotatedMethod != null) {
+ for (Annotation[] anns : annotatedMethod.getParameterAnnotations()) {
+ if (AnnotationUtils.getAnnotation(anns, Suspended.class) != null) {
+ async = true;
+ break;
+ }
+ }
+ }
+ }
public boolean isOneway() {
return oneway;
}
+ public boolean isAsync() {
+ return async;
+ }
public List<Parameter> getParameters() {
return parameters;
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dbc4de18 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dbc4de18 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dbc4de18 Branch: refs/heads/master Commit: dbc4de1836f14aee5d30c39fd5b625e7634508c7 Parents: ae4f03a 0642440 Author: Sergey Beryozkin <sb...@talend.com> Authored: Tue Aug 11 13:45:57 2015 +0100 Committer: Sergey Beryozkin <sb...@talend.com> Committed: Tue Aug 11 13:45:57 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------