This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 999a5e3acedd2dd36aaf454253b3f945cae1c0b5 Author: Andriy Redko <[email protected]> AuthorDate: Mon Jul 14 17:28:28 2025 -0400 CXF-9114: ClientRequestContext#getConfiguration always return null in the MicroProfile RestClient (#2507) (cherry picked from commit f509273ea75c411f91cdced2daef55e67057ded9) (cherry picked from commit 60f9197faa9c5a1fc49fba59df412be9f1cf5948) # Conflicts: # rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/mock/InvokedMethodClientRequestFilter.java --- .../cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java | 1 + .../microprofile/client/mock/InvokedMethodClientRequestFilter.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java index 672efbe2f0..20936bebdf 100644 --- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java @@ -140,6 +140,7 @@ public class MicroProfileClientProxyImpl extends ClientProxyImpl { private void init(ExecutorService executorService, Configuration configuration) { cfg.getRequestContext().put(EXECUTOR_SERVICE_PROPERTY, executorService); cfg.getRequestContext().putAll(configuration.getProperties()); + cfg.getRequestContext().put(Configuration.class.getName(), configuration); List<Interceptor<? extends Message>>inboundChain = cfg.getInInterceptors(); inboundChain.add(new MPAsyncInvocationInterceptorPostAsyncImpl()); diff --git a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/mock/InvokedMethodClientRequestFilter.java b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/mock/InvokedMethodClientRequestFilter.java index 21abc70d88..1e8d2ac25c 100644 --- a/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/mock/InvokedMethodClientRequestFilter.java +++ b/rt/rs/microprofile-client/src/test/java/org/apache/cxf/microprofile/client/mock/InvokedMethodClientRequestFilter.java @@ -25,6 +25,7 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.client.ClientRequestContext; import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.core.Configuration; import javax.ws.rs.core.Response; public class InvokedMethodClientRequestFilter implements ClientRequestFilter { @@ -32,6 +33,11 @@ public class InvokedMethodClientRequestFilter implements ClientRequestFilter { @Override public void filter(ClientRequestContext ctx) throws IOException { try { + final Configuration configuration = ctx.getConfiguration(); + if (configuration == null) { + throw new NullPointerException("Configuration is null"); + } + Method m = (Method) ctx.getProperty("org.eclipse.microprofile.rest.client.invokedMethod"); Path path = m.getAnnotation(Path.class);
