You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2018/10/13 01:33:55 UTC
[cxf] branch 3.2.x-fixes updated: CXF-7870: JAXRSUtils referenced
in AbstractBraveClientProvider
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new 0842d58 CXF-7870: JAXRSUtils referenced in AbstractBraveClientProvider
0842d58 is described below
commit 0842d58fef8b1398c2f072df3e1ad75947e3e963
Author: reta <dr...@gmail.com>
AuthorDate: Fri Oct 12 20:59:00 2018 -0400
CXF-7870: JAXRSUtils referenced in AbstractBraveClientProvider
---
.../org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java | 4 ++--
.../org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java | 4 ++--
.../cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index 3fcb29e..4c4c5e2 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -31,7 +31,7 @@ import brave.http.HttpClientHandler;
import brave.http.HttpTracing;
import brave.propagation.Propagation.Setter;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.tracing.AbstractTracingProvider;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory;
import org.apache.cxf.tracing.brave.internal.HttpAdapterFactory.Request;
@@ -81,7 +81,7 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
}
private boolean isAsyncInvocation() {
- return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
+ return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
protected void stopTraceSpan(final TraceScopeHolder<TraceScope> holder, final int responseStatus) {
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
index 88dd10b..3543ed1 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.tracing.AbstractTracingProvider;
import org.apache.htrace.core.Span;
import org.apache.htrace.core.TraceScope;
@@ -69,7 +69,7 @@ public abstract class AbstractHTraceClientProvider extends AbstractTracingProvid
}
private boolean isAsyncInvocation() {
- return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
+ return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
protected void stopTraceSpan(final TraceScopeHolder<TraceScope> holder) {
diff --git a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java
index 5dc94f8..0f8945e 100644
--- a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java
+++ b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/AbstractOpenTracingClientProvider.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.tracing.AbstractTracingProvider;
import org.apache.cxf.tracing.opentracing.internal.TextMapInjectAdapter;
@@ -74,7 +74,7 @@ public abstract class AbstractOpenTracingClientProvider extends AbstractTracingP
}
private boolean isAsyncInvocation() {
- return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
+ return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
protected void stopTraceSpan(final TraceScopeHolder<TraceScope> holder, final int responseStatus) {