You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/04/19 15:44:16 UTC
camel git commit: CAMEL-9882: factorize proxy factory and service
exporter definitions
Repository: camel
Updated Branches:
refs/heads/master ba1172adc -> 8a37e5e7d
CAMEL-9882: factorize proxy factory and service exporter definitions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8a37e5e7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8a37e5e7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8a37e5e7
Branch: refs/heads/master
Commit: 8a37e5e7d597b712bd5c13a725fa8327ef996680
Parents: ba1172a
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Tue Apr 19 15:43:46 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Tue Apr 19 15:43:46 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/cdi/XmlCdiBeanFactory.java | 8 +-
.../apache/camel/cdi/XmlProxyFactoryBean.java | 6 +-
.../camel/cdi/XmlServiceExporterBean.java | 6 +-
.../camel/cdi/xml/CamelContextFactoryBean.java | 16 ++--
.../camel/cdi/xml/ProxyFactoryDefinition.java | 87 --------------------
.../cdi/xml/ServiceExporterDefinition.java | 75 -----------------
.../core/xml/CamelProxyFactoryDefinition.java | 44 ++++++++++
.../xml/CamelServiceExporterDefinition.java | 37 ++++++++-
8 files changed, 99 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index 9caa6e5..51f2b68 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -42,11 +42,11 @@ import org.apache.camel.cdi.xml.CamelContextFactoryBean;
import org.apache.camel.cdi.xml.ErrorHandlerDefinition;
import org.apache.camel.cdi.xml.ErrorHandlerType;
import org.apache.camel.cdi.xml.ImportDefinition;
-import org.apache.camel.cdi.xml.ProxyFactoryDefinition;
import org.apache.camel.cdi.xml.RestContextDefinition;
import org.apache.camel.cdi.xml.RouteContextDefinition;
-import org.apache.camel.cdi.xml.ServiceExporterDefinition;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
+import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
+import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
@@ -259,7 +259,7 @@ final class XmlCdiBeanFactory {
+ "with qualifiers " + bean.getQualifiers());
}
- private SyntheticBean<?> proxyFactoryBean(Bean<?> context, ProxyFactoryDefinition proxy, URL url) {
+ private SyntheticBean<?> proxyFactoryBean(Bean<?> context, CamelProxyFactoryDefinition proxy, URL url) {
if (ObjectHelper.isEmpty(proxy.getServiceRef()) && ObjectHelper.isEmpty(proxy.getServiceUrl())) {
throw new CreationException(
format("Missing [%s] or [%s] attribute for imported bean [%s] from resource [%s]",
@@ -277,7 +277,7 @@ final class XmlCdiBeanFactory {
context, proxy);
}
- private SyntheticBean<?> serviceExporterBean(Bean<?> context, ServiceExporterDefinition exporter, URL url) {
+ private SyntheticBean<?> serviceExporterBean(Bean<?> context, CamelServiceExporterDefinition exporter, URL url) {
// TODO: replace with CreationException
Objects.requireNonNull(exporter.getServiceRef(),
() -> format("Missing [%s] attribute for imported bean [%s] from resource [%s]",
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
index d7540c4..bb93451 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java
@@ -28,8 +28,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.FailedToCreateProducerException;
import org.apache.camel.Producer;
-import org.apache.camel.cdi.xml.ProxyFactoryDefinition;
import org.apache.camel.component.bean.ProxyHelper;
+import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
@@ -43,9 +43,9 @@ final class XmlProxyFactoryBean<T> extends SyntheticBean<T> {
private final Bean<?> context;
- private final ProxyFactoryDefinition proxy;
+ private final CamelProxyFactoryDefinition proxy;
- XmlProxyFactoryBean(BeanManager manager, SyntheticAnnotated annotated, Class<?> type, Function<Bean<T>, String> toString, Bean<?> context, ProxyFactoryDefinition proxy) {
+ XmlProxyFactoryBean(BeanManager manager, SyntheticAnnotated annotated, Class<?> type, Function<Bean<T>, String> toString, Bean<?> context, CamelProxyFactoryDefinition proxy) {
super(manager, annotated, type, null, toString);
this.manager = manager;
this.context = context;
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java
index 1a5d819..cc35dc4 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java
@@ -28,8 +28,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.FailedToCreateConsumerException;
-import org.apache.camel.cdi.xml.ServiceExporterDefinition;
import org.apache.camel.component.bean.BeanProcessor;
+import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.util.ServiceHelper;
import static org.apache.camel.cdi.BeanManagerHelper.getReference;
@@ -43,11 +43,11 @@ final class XmlServiceExporterBean<T> extends SyntheticBean<T> {
private final Bean<?> context;
- private final ServiceExporterDefinition exporter;
+ private final CamelServiceExporterDefinition exporter;
private final Class<?> type;
- XmlServiceExporterBean(BeanManager manager, SyntheticAnnotated annotated, Class<?> type, Function<Bean<T>, String> toString, Bean<?> context, ServiceExporterDefinition exporter) {
+ XmlServiceExporterBean(BeanManager manager, SyntheticAnnotated annotated, Class<?> type, Function<Bean<T>, String> toString, Bean<?> context, CamelServiceExporterDefinition exporter) {
super(manager, annotated, type, null, toString);
this.manager = manager;
this.context = context;
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index a5f8e49..c75d30b 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -40,6 +40,8 @@ import org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
import org.apache.camel.core.xml.AbstractCamelFactoryBean;
import org.apache.camel.core.xml.CamelJMXAgentDefinition;
import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
+import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
+import org.apache.camel.core.xml.CamelServiceExporterDefinition;
import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.ContextScanDefinition;
@@ -163,11 +165,11 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
@XmlElement(name = "errorHandler", type = ErrorHandlerDefinition.class)
private List<ErrorHandlerDefinition> errorHandlers;
- @XmlElement(name = "export", type = ServiceExporterDefinition.class)
- private List<ServiceExporterDefinition> exports;
+ @XmlElement(name = "export", type = CamelServiceExporterDefinition.class)
+ private List<CamelServiceExporterDefinition> exports;
@XmlElement(name = "proxy")
- private List<ProxyFactoryDefinition> proxies;
+ private List<CamelProxyFactoryDefinition> proxies;
@XmlElement(name = "routeBuilder")
private List<RouteBuilderDefinition> builderRefs = new ArrayList<>();
@@ -685,19 +687,19 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Def
this.dependsOn = dependsOn;
}
- public List<ProxyFactoryDefinition> getProxies() {
+ public List<CamelProxyFactoryDefinition> getProxies() {
return proxies;
}
- public void setProxies(List<ProxyFactoryDefinition> proxies) {
+ public void setProxies(List<CamelProxyFactoryDefinition> proxies) {
this.proxies = proxies;
}
- public List<ServiceExporterDefinition> getExports() {
+ public List<CamelServiceExporterDefinition> getExports() {
return exports;
}
- public void setExports(List<ServiceExporterDefinition> exports) {
+ public void setExports(List<CamelServiceExporterDefinition> exports) {
this.exports = exports;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProxyFactoryDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProxyFactoryDefinition.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProxyFactoryDefinition.java
deleted file mode 100644
index 2c0a2bc..0000000
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProxyFactoryDefinition.java
+++ /dev/null
@@ -1,87 +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.camel.cdi.xml;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.model.IdentifiedType;
-
-/**
- * The <proxy> tag element.
- *
-*/
-// FIXME: to remove when getters are added to org.apache.camel.core.xml.CamelProxyFactoryDefinition
-@XmlRootElement(name = "proxy")
-public class ProxyFactoryDefinition extends IdentifiedType {
-
- @XmlAttribute
- private String serviceUrl;
-
- @XmlAttribute
- private String serviceRef;
-
- @XmlAttribute
- private Class<?> serviceInterface;
-
- @XmlAttribute
- private String camelContextId;
-
- @XmlAttribute
- private Boolean binding;
-
-
- public String getServiceUrl() {
- return serviceUrl;
- }
-
- public void setServiceUrl(String serviceUrl) {
- this.serviceUrl = serviceUrl;
- }
-
- public String getServiceRef() {
- return serviceRef;
- }
-
- public void setServiceRef(String serviceRef) {
- this.serviceRef = serviceRef;
- }
-
- public Class<?> getServiceInterface() {
- return serviceInterface;
- }
-
- public void setServiceInterface(Class<?> serviceInterface) {
- this.serviceInterface = serviceInterface;
- }
-
- public String getCamelContextId() {
- return camelContextId;
- }
-
- public void setCamelContextId(String camelContextId) {
- this.camelContextId = camelContextId;
- }
-
- public Boolean getBinding() {
- return binding;
- }
-
- public void setBinding(Boolean binding) {
- this.binding = binding;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ServiceExporterDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ServiceExporterDefinition.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ServiceExporterDefinition.java
deleted file mode 100644
index 74b8cac..0000000
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ServiceExporterDefinition.java
+++ /dev/null
@@ -1,75 +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.camel.cdi.xml;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.camel.model.IdentifiedType;
-
-/**
- * The <export> tag element.
- *
-*/
-// FIXME: to remove when getters are added to org.apache.camel.core.xml.CamelServiceExporterDefinition
-@XmlRootElement(name = "export")
-public class ServiceExporterDefinition extends IdentifiedType {
-
- @XmlAttribute
- private String uri;
-
- @XmlAttribute
- private String serviceRef;
-
- @XmlAttribute
- private Class<?> serviceInterface;
-
- @XmlAttribute
- private String camelContextId;
-
- public String getUri() {
- return uri;
- }
-
- public void setUri(String uri) {
- this.uri = uri;
- }
-
- public String getServiceRef() {
- return serviceRef;
- }
-
- public void setServiceRef(String serviceRef) {
- this.serviceRef = serviceRef;
- }
-
- public Class<?> getServiceInterface() {
- return serviceInterface;
- }
-
- public void setServiceInterface(Class<?> serviceInterface) {
- this.serviceInterface = serviceInterface;
- }
-
- public String getCamelContextId() {
- return camelContextId;
- }
-
- public void setCamelContextId(String camelContextId) {
- this.camelContextId = camelContextId;
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
index dc54bea..fa1b3a5 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java
@@ -28,15 +28,59 @@ import org.apache.camel.model.IdentifiedType;
*/ // to fudge the XSD generation
@XmlRootElement(name = "proxy")
public class CamelProxyFactoryDefinition extends IdentifiedType {
+
@XmlAttribute
private String serviceUrl;
+
@XmlAttribute
private String serviceRef;
+
@XmlAttribute
private Class<?> serviceInterface;
+
@XmlAttribute
private String camelContextId;
+
@XmlAttribute
private Boolean binding;
+ public String getServiceUrl() {
+ return serviceUrl;
+ }
+
+ public void setServiceUrl(String serviceUrl) {
+ this.serviceUrl = serviceUrl;
+ }
+
+ public String getServiceRef() {
+ return serviceRef;
+ }
+
+ public void setServiceRef(String serviceRef) {
+ this.serviceRef = serviceRef;
+ }
+
+ public Class<?> getServiceInterface() {
+ return serviceInterface;
+ }
+
+ public void setServiceInterface(Class<?> serviceInterface) {
+ this.serviceInterface = serviceInterface;
+ }
+
+ public String getCamelContextId() {
+ return camelContextId;
+ }
+
+ public void setCamelContextId(String camelContextId) {
+ this.camelContextId = camelContextId;
+ }
+
+ public Boolean getBinding() {
+ return binding;
+ }
+
+ public void setBinding(Boolean binding) {
+ this.binding = binding;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8a37e5e7/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
index a4b3afa..8986011 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelServiceExporterDefinition.java
@@ -28,13 +28,48 @@ import org.apache.camel.model.IdentifiedType;
*/
@XmlRootElement(name = "export")
public class CamelServiceExporterDefinition extends IdentifiedType {
+
@XmlAttribute
private String uri;
+
@XmlAttribute
private String serviceRef;
+
@XmlAttribute
private Class<?> serviceInterface;
+
@XmlAttribute
private String camelContextId;
-
+
+ public String getUri() {
+ return uri;
+ }
+
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+
+ public String getServiceRef() {
+ return serviceRef;
+ }
+
+ public void setServiceRef(String serviceRef) {
+ this.serviceRef = serviceRef;
+ }
+
+ public Class<?> getServiceInterface() {
+ return serviceInterface;
+ }
+
+ public void setServiceInterface(Class<?> serviceInterface) {
+ this.serviceInterface = serviceInterface;
+ }
+
+ public String getCamelContextId() {
+ return camelContextId;
+ }
+
+ public void setCamelContextId(String camelContextId) {
+ this.camelContextId = camelContextId;
+ }
}