This is an automated email from the ASF dual-hosted git repository. johndament pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0f018bc0a8cbea00de07f2fe72caffd80cd87bf0 Author: John D. Ament <[email protected]> AuthorDate: Sat Dec 16 16:55:24 2017 -0500 [CXF-7579] Add the default Json provider to each client. --- rt/rs/microprofile-client/pom.xml | 15 ++++++++----- .../cxf/microprofile/client/JsonPProvider.java | 26 ++++++++++++++++++++++ .../client/MicroProfileClientFactoryBean.java | 1 + systests/microprofile/client/weld/pom.xml | 15 +++++++++++-- 4 files changed, 50 insertions(+), 7 deletions(-) diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index 402a528..fa7644a 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -100,6 +100,16 @@ <version>1.0-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>javax.json</groupId> + <artifactId>javax.json-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>org.eclipse.microprofile.rest.client</groupId> <artifactId>microprofile-rest-client-tck</artifactId> <version>1.0-SNAPSHOT</version> @@ -160,11 +170,6 @@ <version>2.1</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> </dependencies> <profiles> <profile> diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/JsonPProvider.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/JsonPProvider.java new file mode 100644 index 0000000..09bd122 --- /dev/null +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/JsonPProvider.java @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cxf.microprofile.client; + +import javax.annotation.Priority; +import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider; + +@Priority(Integer.MAX_VALUE) +public class JsonPProvider extends JsrJsonpProvider { +} diff --git a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBean.java b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBean.java index 58cdfb3..6855740 100644 --- a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBean.java +++ b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/MicroProfileClientFactoryBean.java @@ -58,6 +58,7 @@ public class MicroProfileClientFactoryBean extends JAXRSClientFactoryBean { if (!configuration.isDefaultExceptionMapperDisabled()) { registeredProviders.add(new DefaultResponseExceptionMapper()); } + registeredProviders.add(new JsonPProvider()); super.setProviders(registeredProviders); } diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml index dff4f0d..990d344 100644 --- a/systests/microprofile/client/weld/pom.xml +++ b/systests/microprofile/client/weld/pom.xml @@ -69,9 +69,15 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-core</artifactId> + <version>1.1.3</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>javax.json</groupId> <artifactId>javax.json-api</artifactId> - <version>1.0</version> + <version>1.1</version> <scope>test</scope> </dependency> <dependency> @@ -92,6 +98,12 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.johnzon</groupId> + <artifactId>johnzon-jsonb</artifactId> + <version>1.1.3</version> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> @@ -121,7 +133,6 @@ </dependenciesToScan> <excludes> <exclude>org.eclipse.microprofile.rest.client.tck.CustomHttpMethodTest</exclude> - <exclude>org.eclipse.microprofile.rest.client.tck.InvokeWithJsonPProviderTest</exclude> <exclude>org.eclipse.microprofile.rest.client.tck.InvalidInterfaceTest</exclude> </excludes> </configuration> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
