[1/2] cxf git commit: Making it easier to check if a given JAXRS operation is async
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: ae4f03a912b45e5e0cc6f09bf528d82885e8
Parents: eafa719
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Aug 11 13:45:08 2015 +0100
Committer: Sergey Beryozkin sberyoz...@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 ListParameter parameters;
-private boolean oneway;
+private boolean oneway;
+private boolean async;
private SetString nameBindings = new LinkedHashSetString();
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 ListParameter getParameters() {
return parameters;
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
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 sberyoz...@talend.com Authored: Tue Aug 11 13:45:57 2015 +0100 Committer: Sergey Beryozkin sberyoz...@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(-) --
cxf git commit: Making it easier to check if a given JAXRS operation is async
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 134a8c876 - 7523f6f9e
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/7523f6f9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7523f6f9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7523f6f9
Branch: refs/heads/3.0.x-fixes
Commit: 7523f6f9ec2ce87bb838c5ca6a2f897ef65edf9c
Parents: 134a8c8
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Aug 11 13:45:08 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Aug 11 13:48:34 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/7523f6f9/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 ListParameter parameters;
-private boolean oneway;
+private boolean oneway;
+private boolean async;
private SetString nameBindings = new LinkedHashSetString();
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 ListParameter getParameters() {
return parameters;
cxf git commit: Fixing MGF test
Repository: cxf
Updated Branches:
refs/heads/master eafa719cd - 0642440cd
Fixing MGF test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0642440c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0642440c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0642440c
Branch: refs/heads/master
Commit: 0642440cd3114db0ca86ca99987617d98634697f
Parents: eafa719
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Aug 11 11:59:00 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Aug 11 11:59:00 2015 +0100
--
.../org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0642440c/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
index a9af663..9e64b4c 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
@@ -80,7 +80,7 @@ public class MGF256AlgorithmSuiteLoader implements
AlgorithmSuiteLoader {
SPConstants.SHA1,
http://www.w3.org/2009/xmlenc11#aes256-gcm;,
SPConstants.KW_AES256,
-SPConstants.KW_RSA_OAEP,
+WSConstants.KEYTRANSPORT_RSAOEP_XENC11,
SPConstants.P_SHA1_L256,
SPConstants.P_SHA1_L192,
256, 192, 256, 256, 1024, 4096
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 9c572f6b5 - 134a8c876 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/134a8c87 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/134a8c87 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/134a8c87 Branch: refs/heads/3.0.x-fixes Commit: 134a8c87631ce63650865a10e7f0431d866ba3a5 Parents: 9c572f6 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Aug 11 12:02:01 2015 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Aug 11 12:02:01 2015 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/134a8c87/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 99e1129..d48bc2d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -10,6 +10,7 @@ B 03d63bca6fd9497ddeba1a0657929150d02827d2 B 04960b3a04731e3e0f030c17ac25f154defb5568 B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5 B 05a7ad32b06dc800d31cffbb39df5be16f847849 +B 0642440cd3114db0ca86ca99987617d98634697f B 07c6322a52c12077567a48c9a87e832ea9362886 B 08d98fbb13440de2da3b19915d8dfe21531cb284 B 09c7f359ed84a1df2cab07387b3ad135846df0db
cxf git commit: Making it simpler to enable auto-closing for JAX-RS 2.0 clients
Repository: cxf
Updated Branches:
refs/heads/master dbc4de183 - fea260561
Making it simpler to enable auto-closing for JAX-RS 2.0 clients
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fea26056
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fea26056
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fea26056
Branch: refs/heads/master
Commit: fea26056139ac2b4ab991681a35c5c8a20366aba
Parents: dbc4de1
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Aug 11 15:58:41 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Aug 11 15:58:41 2015 +0100
--
.../apache/cxf/jaxrs/client/spec/ClientImpl.java | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/fea26056/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index b15d730..52e900f 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -39,7 +39,6 @@ import javax.ws.rs.core.Link;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriBuilder;
-import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.ClientProviderFactory;
@@ -54,6 +53,7 @@ public class ClientImpl implements Client {
private static final String HTTP_PROXY_SERVER_PROP =
http.proxy.server.uri;
private static final String HTTP_PROXY_SERVER_PORT_PROP =
http.proxy.server.port;
private static final String HTTP_AUTOREDIRECT_PROP = http.autoredirect;
+private static final String HTTP_RESPONSE_AUTOCLOSE_PROP =
http.response.stream.auto.close;
private ConfigurableClient configImpl;
private TLSConfiguration secConfig;
@@ -273,6 +273,12 @@ public class ClientImpl implements Client {
clientCfg.getRequestContext().put(Client.class.getName(),
ClientImpl.this);
clientCfg.getRequestContext().put(Configuration.class.getName(),
getConfiguration());
+
+// Response auto-close
+Boolean responseAutoClose =
getBooleanValue(configProps.get(HTTP_RESPONSE_AUTOCLOSE_PROP));
+if (responseAutoClose != null) {
+
clientCfg.getResponseContext().put(response.stream.auto.close,
responseAutoClose);
+}
// TLS
TLSClientParameters tlsParams = secConfig.getTlsClientParams();
if (tlsParams.getSSLSocketFactory() != null
@@ -305,9 +311,9 @@ public class ClientImpl implements Client {
if (proxyServerPortValue != null) {
clientCfg.getHttpConduit().getClient().setProxyServerPort(proxyServerPortValue);
}
-Object autoRedirectValue = configProps.get(HTTP_AUTOREDIRECT_PROP);
-if (PropertyUtils.isTrue(autoRedirectValue)) {
-clientCfg.getHttpConduit().getClient().setAutoRedirect(true);
+Boolean autoRedirectValue =
getBooleanValue(configProps.get(HTTP_AUTOREDIRECT_PROP));
+if (autoRedirectValue != null) {
+
clientCfg.getHttpConduit().getClient().setAutoRedirect(autoRedirectValue);
}
}
@@ -386,7 +392,7 @@ public class ClientImpl implements Client {
checkNull(name, value);
return newWebTarget(getUriBuilder().resolveTemplate(name, value,
encodeSlash));
}
-
+
@Override
public WebTarget resolveTemplateFromEncoded(String name, Object value)
{
checkNull(name, value);
@@ -514,4 +520,7 @@ public class ClientImpl implements Client {
private static Integer getIntValue(Object o) {
return o instanceof Integer ? (Integer)o : o instanceof String ?
Integer.valueOf(o.toString()) : null;
}
+private static Boolean getBooleanValue(Object o) {
+return o instanceof Boolean ? (Boolean)o : o instanceof Boolean ?
Boolean.valueOf(o.toString()) : null;
+}
}
cxf git commit: Making it simpler to enable auto-closing for JAX-RS 2.0 clients
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 7523f6f9e - 961362dec
Making it simpler to enable auto-closing for JAX-RS 2.0 clients
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/961362de
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/961362de
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/961362de
Branch: refs/heads/3.0.x-fixes
Commit: 961362decec21acc5ca37cc86734d141f4839b6c
Parents: 7523f6f
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Aug 11 15:58:41 2015 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Aug 11 17:28:05 2015 +0100
--
.../apache/cxf/jaxrs/client/spec/ClientImpl.java | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/961362de/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
index b15d730..52e900f 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java
@@ -39,7 +39,6 @@ import javax.ws.rs.core.Link;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriBuilder;
-import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.ClientProviderFactory;
@@ -54,6 +53,7 @@ public class ClientImpl implements Client {
private static final String HTTP_PROXY_SERVER_PROP =
http.proxy.server.uri;
private static final String HTTP_PROXY_SERVER_PORT_PROP =
http.proxy.server.port;
private static final String HTTP_AUTOREDIRECT_PROP = http.autoredirect;
+private static final String HTTP_RESPONSE_AUTOCLOSE_PROP =
http.response.stream.auto.close;
private ConfigurableClient configImpl;
private TLSConfiguration secConfig;
@@ -273,6 +273,12 @@ public class ClientImpl implements Client {
clientCfg.getRequestContext().put(Client.class.getName(),
ClientImpl.this);
clientCfg.getRequestContext().put(Configuration.class.getName(),
getConfiguration());
+
+// Response auto-close
+Boolean responseAutoClose =
getBooleanValue(configProps.get(HTTP_RESPONSE_AUTOCLOSE_PROP));
+if (responseAutoClose != null) {
+
clientCfg.getResponseContext().put(response.stream.auto.close,
responseAutoClose);
+}
// TLS
TLSClientParameters tlsParams = secConfig.getTlsClientParams();
if (tlsParams.getSSLSocketFactory() != null
@@ -305,9 +311,9 @@ public class ClientImpl implements Client {
if (proxyServerPortValue != null) {
clientCfg.getHttpConduit().getClient().setProxyServerPort(proxyServerPortValue);
}
-Object autoRedirectValue = configProps.get(HTTP_AUTOREDIRECT_PROP);
-if (PropertyUtils.isTrue(autoRedirectValue)) {
-clientCfg.getHttpConduit().getClient().setAutoRedirect(true);
+Boolean autoRedirectValue =
getBooleanValue(configProps.get(HTTP_AUTOREDIRECT_PROP));
+if (autoRedirectValue != null) {
+
clientCfg.getHttpConduit().getClient().setAutoRedirect(autoRedirectValue);
}
}
@@ -386,7 +392,7 @@ public class ClientImpl implements Client {
checkNull(name, value);
return newWebTarget(getUriBuilder().resolveTemplate(name, value,
encodeSlash));
}
-
+
@Override
public WebTarget resolveTemplateFromEncoded(String name, Object value)
{
checkNull(name, value);
@@ -514,4 +520,7 @@ public class ClientImpl implements Client {
private static Integer getIntValue(Object o) {
return o instanceof Integer ? (Integer)o : o instanceof String ?
Integer.valueOf(o.toString()) : null;
}
+private static Boolean getBooleanValue(Object o) {
+return o instanceof Boolean ? (Boolean)o : o instanceof Boolean ?
Boolean.valueOf(o.toString()) : null;
+}
}
cxf git commit: CXF-6360: Integration with Apache HTrace. Fixing asynchronous invocation flow by detaching span in request filter (work in progress)
Repository: cxf
Updated Branches:
refs/heads/master fea260561 - dc6fe383b
CXF-6360: Integration with Apache HTrace. Fixing asynchronous invocation flow
by detaching span in request filter (work in progress)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dc6fe383
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dc6fe383
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dc6fe383
Branch: refs/heads/master
Commit: dc6fe383b095c6823e5de707b1c091556c9c378a
Parents: fea2605
Author: reta drr...@gmail.com
Authored: Tue Aug 11 19:23:23 2015 -0400
Committer: reta drr...@gmail.com
Committed: Tue Aug 11 19:23:23 2015 -0400
--
.../java/demo/jaxrs/tracing/server/Catalog.java | 14 --
.../tracing/htrace/AbstractHTraceProvider.java | 53 +---
.../cxf/systest/jaxrs/tracing/BookStore.java| 26 ++
.../jaxrs/tracing/htrace/HTraceTracingTest.java | 24 +
4 files changed, 106 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/dc6fe383/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 1761bb8..d761d1a 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -22,12 +22,12 @@ package demo.jaxrs.tracing.server;
import java.io.IOException;
import java.util.UUID;
+import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import javax.json.Json;
-import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
@@ -37,6 +37,8 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
+import javax.ws.rs.container.AsyncResponse;
+import javax.ws.rs.container.Suspended;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -97,8 +99,14 @@ public class Catalog {
@GET
@Produces(MediaType.APPLICATION_JSON)
-public JsonArray getBooks() throws IOException {
-return store.scan();
+public void getBooks(@Suspended final AsyncResponse response) throws
IOException {
+executor.submit(new CallableVoid() {
+@Override
+public Void call() throws Exception {
+response.resume(store.scan());
+return null;
+}
+});
}
@GET
http://git-wip-us.apache.org/repos/asf/cxf/blob/dc6fe383/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
--
diff --git
a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
index dd9f3ed..fba817b 100644
---
a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
+++
b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
@@ -18,11 +18,16 @@
*/
package org.apache.cxf.tracing.htrace;
+import java.lang.annotation.Annotation;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.container.Suspended;
+import javax.ws.rs.core.Context;
+
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.tracing.AbstractTracingProvider;
@@ -38,6 +43,7 @@ public abstract class AbstractHTraceProvider extends
AbstractTracingProvider {
protected static final String TRACE_SPAN =
org.apache.cxf.tracing.htrace.span;
private final Sampler ? sampler;
+@Context private ResourceInfo resourceInfo;
public AbstractHTraceProvider(final Sampler ? sampler) {
this.sampler = sampler;
@@ -54,15 +60,24 @@ public abstract class AbstractHTraceProvider extends
AbstractTracingProvider {
final long spanId = getFirstValueOrDefault(requestHeaders,
getSpanIdHeader(),
