Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 8e8703d67 -> 6fb43da4f
Adding renamed resources Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6fb43da4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6fb43da4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6fb43da4 Branch: refs/heads/3.1.x-fixes Commit: 6fb43da4f6c1578aeffe0a8a24dc27b597aec2c6 Parents: 8e8703d Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Fri Jul 8 11:55:14 2016 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Fri Jul 8 11:56:11 2016 +0100 ---------------------------------------------------------------------- .../spring/JaxRsProxyClientConfiguration.java | 71 ++++++++++++++++++++ .../spring/JaxRsWebClientConfiguration.java | 64 ++++++++++++++++++ 2 files changed, 135 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6fb43da4/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java new file mode 100644 index 0000000..26a83bb --- /dev/null +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsProxyClientConfiguration.java @@ -0,0 +1,71 @@ +/** + * 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.jaxrs.client.spring; + +import java.lang.annotation.Annotation; +import java.util.Collection; +import java.util.Map; + +import javax.ws.rs.Path; +import javax.ws.rs.ext.Provider; + +import org.apache.cxf.common.util.ClasspathScanner; +import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.jaxrs.client.Client; +import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; +import org.apache.cxf.service.factory.ServiceConstructionException; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; + +public class JaxRsProxyClientConfiguration extends AbstractJaxRsClientConfiguration { + @Value("${cxf.jaxrs.client.classes-scan-packages:''}") + private String scanPackages; + + @Bean + protected Client jaxRsProxyClient() { + return super.createClient(); + } + + protected Class<?> getServiceClass() { + return null; + } + + protected void setJaxrsResources(JAXRSClientFactoryBean factory) { + Class<?> serviceClass = getServiceClass(); + if (serviceClass != null) { + factory.setServiceClass(serviceClass); + } else if (!StringUtils.isEmpty(scanPackages)) { + try { + final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes = + serviceClass == null ? ClasspathScanner.findClasses(scanPackages, Path.class, Provider.class) + : ClasspathScanner.findClasses(scanPackages, Provider.class); + if (serviceClass == null) { + factory.setServiceClass( + JAXRSClientFactoryBeanDefinitionParser.getServiceClass(classes.get(Path.class))); + } + factory.setProviders( + JAXRSClientFactoryBeanDefinitionParser.getProviders(context, classes.get(Provider.class))); + } catch (Exception ex) { + throw new ServiceConstructionException(ex); + } + } + } + + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/6fb43da4/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsWebClientConfiguration.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsWebClientConfiguration.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsWebClientConfiguration.java new file mode 100644 index 0000000..acc0824 --- /dev/null +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JaxRsWebClientConfiguration.java @@ -0,0 +1,64 @@ +/** + * 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.jaxrs.client.spring; + +import java.lang.annotation.Annotation; +import java.util.Collection; +import java.util.Map; + +import javax.ws.rs.ext.Provider; + +import org.apache.cxf.common.util.ClasspathScanner; +import org.apache.cxf.common.util.StringUtils; +import org.apache.cxf.jaxrs.client.Client; +import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; +import org.apache.cxf.jaxrs.client.WebClient; +import org.apache.cxf.service.factory.ServiceConstructionException; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; + +public class JaxRsWebClientConfiguration extends AbstractJaxRsClientConfiguration { + + @Value("${cxf.jaxrs.client.classes-scan-packages:''}") + private String scanPackages; + + @Bean + protected Client jaxRsWebClient() { + return super.createClient(); + } + + @Override + protected void setJaxrsResources(JAXRSClientFactoryBean factory) { + factory.setServiceClass(WebClient.class); + + if (!StringUtils.isEmpty(scanPackages)) { + try { + final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes = + ClasspathScanner.findClasses(scanPackages, Provider.class); + + factory.setProviders( + JAXRSClientFactoryBeanDefinitionParser.getProviders(context, classes.get(Provider.class))); + } catch (Exception ex) { + throw new ServiceConstructionException(ex); + } + } + } + + +}
