This is an automated email from the ASF dual-hosted git repository.
johndament pushed a commit to branch mp-client
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/mp-client by this push:
new 67195b1 [CXF-7579] Mark the default mapper and json provider as
non-custom.
67195b1 is described below
commit 67195b1fa770fe224443896cdb69fa1a51a07391
Author: John D. Ament <[email protected]>
AuthorDate: Tue Dec 19 15:03:50 2017 -0500
[CXF-7579] Mark the default mapper and json provider as non-custom.
---
.../cxf/microprofile/client/JsonPProvider.java | 26 ----------------------
.../client/MicroProfileClientFactoryBean.java | 25 +++++++++++----------
2 files changed, 13 insertions(+), 38 deletions(-)
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
deleted file mode 100644
index 09bd122..0000000
---
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/JsonPProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * 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 e9a1767..eee6b74 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
@@ -18,16 +18,6 @@
*/
package org.apache.cxf.microprofile.client;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.ClientResponseFilter;
-import javax.ws.rs.core.Configuration;
-
import org.apache.cxf.common.util.ClassHelper;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxrs.client.AbstractClient;
@@ -37,9 +27,20 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.model.ClassResourceInfo;
import org.apache.cxf.jaxrs.model.FilterProviderInfo;
import org.apache.cxf.jaxrs.model.ProviderInfo;
+import org.apache.cxf.jaxrs.provider.jsrjsonp.JsrJsonpProvider;
import org.apache.cxf.microprofile.client.proxy.MicroProfileClientProxyImpl;
import org.eclipse.microprofile.rest.client.RestClientBuilder;
+import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.core.Configuration;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
public class MicroProfileClientFactoryBean extends JAXRSClientFactoryBean {
private final Comparator<ProviderInfo<?>> comparator;
private final List<Object> registeredProviders;
@@ -58,9 +59,9 @@ public class MicroProfileClientFactoryBean extends
JAXRSClientFactoryBean {
registeredProviders = new ArrayList<>();
registeredProviders.addAll(processProviders());
if (!configuration.isDefaultExceptionMapperDisabled()) {
- registeredProviders.add(new DefaultResponseExceptionMapper());
+ registeredProviders.add(new ProviderInfo<>(new
DefaultResponseExceptionMapper(),getBus(),false));
}
- registeredProviders.add(new JsonPProvider());
+ registeredProviders.add(new ProviderInfo<>(new
JsrJsonpProvider(),getBus(),false));
super.setProviders(registeredProviders);
}
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
