Repository: camel Updated Branches: refs/heads/master f0391afae -> adc435dfe
http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java index 7382a1e..410f698 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/TerserExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For HL7 terser expressions and predicates * * @version */ -@Label("language,hl7") +@Metadata(label = "language,hl7") @XmlRootElement(name = "terser") @XmlAccessorType(XmlAccessType.FIELD) public class TerserExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java index 5d82216..8a41302 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java @@ -25,7 +25,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; import org.apache.camel.language.tokenizer.TokenizeLanguage; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ExpressionToPredicateAdapter; /** @@ -33,7 +33,7 @@ import org.apache.camel.util.ExpressionToPredicateAdapter; * * @see TokenizeLanguage */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "tokenize") @XmlAccessorType(XmlAccessType.FIELD) public class TokenizerExpression extends ExpressionDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java index 54d04a5..cb14949 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/VtdXmlExpression.java @@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For VTD-XML (fast and efficient XPath) expressions and predicates * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "vtdxml") @XmlAccessorType(XmlAccessType.FIELD) public class VtdXmlExpression extends NamespaceAwareExpression { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java index 43d99d1..b45251f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java @@ -25,14 +25,14 @@ import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; import org.apache.camel.language.tokenizer.XMLTokenizeLanguage; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * For expressions and predicates using a body or header tokenizer. * * @see XMLTokenizeLanguage */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "xtokenize") @XmlAccessorType(XmlAccessType.FIELD) public class XMLTokenizerExpression extends NamespaceAwareExpression { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java index 25fcd93..3326eb8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/XPathExpression.java @@ -27,13 +27,13 @@ import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; import org.apache.camel.builder.xml.XPathBuilder; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** * For XPath expressions and predicates */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "xpath") @XmlAccessorType(XmlAccessType.FIELD) public class XPathExpression extends NamespaceAwareExpression { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java index f6c7dd2..6caa97f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java +++ b/camel-core/src/main/java/org/apache/camel/model/language/XQueryExpression.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; /** @@ -33,7 +33,7 @@ import org.apache.camel.util.ObjectHelper; * * @version */ -@Label("language") +@Metadata(label = "language") @XmlRootElement(name = "xquery") @XmlAccessorType(XmlAccessType.FIELD) public class XQueryExpression extends NamespaceAwareExpression { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java index 0d9e769..e1feced 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CircuitBreakerLoadBalancerDefinition.java @@ -18,7 +18,6 @@ package org.apache.camel.model.loadbalancer; import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -28,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.CircuitBreakerLoadBalancer; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -41,7 +40,7 @@ import org.apache.camel.util.ObjectHelper; * timeout is reached. After this timeout is reached, if there is a new call, it will pass and if the result is * success the Circuit Breaker will move to closed state, or to open state if there was an error. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "circuitBreaker") @XmlAccessorType(XmlAccessType.FIELD) public class CircuitBreakerLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java index e7bbd8f..597683b 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.ObjectHelper; @@ -31,7 +31,7 @@ import org.apache.camel.util.ObjectHelper; /** * Custom load balancer */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "customLoadBalancer") @XmlAccessorType(XmlAccessType.FIELD) public class CustomLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java index e4c8311..d1f419f 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java @@ -18,7 +18,6 @@ package org.apache.camel.model.loadbalancer; import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -28,7 +27,6 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; @@ -40,7 +38,7 @@ import org.apache.camel.spi.RouteContext; * If you do not specify a list any exception will cause fail over to occur. * This balancer uses the same strategy for matching exceptions as the Exception Clause does for the onException. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "failover") @XmlAccessorType(XmlAccessType.FIELD) public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java index 19a6ba1..5d45183 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalancerDefinition.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext; * * The random load balancer selects a random endpoint for each exchange. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "random") @XmlAccessorType(XmlAccessType.FIELD) public class RandomLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java index c134444..35ab5e5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalancerDefinition.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -31,7 +31,7 @@ import org.apache.camel.spi.RouteContext; * The round robin load balancer will use the next endpoint for each message. * This load balancer is not meant to work with failover, for that you should use the dedicated failover load balancer. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "roundRobin") @XmlAccessorType(XmlAccessType.FIELD) public class RoundRobinLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java index 981a007..18b5830 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java @@ -25,7 +25,7 @@ import org.apache.camel.model.ExpressionSubElementDefinition; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.LoadBalancer; import org.apache.camel.processor.loadbalancer.StickyLoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -34,7 +34,7 @@ import org.apache.camel.spi.RouteContext; * Sticky load balancing using an Expression to calculate a correlation key to perform the sticky load balancing; * rather like jsessionid in the web or JMSXGroupID in JMS. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "sticky") @XmlAccessorType(XmlAccessType.FIELD) public class StickyLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java index 716e1af..e35b43d 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalancerDefinition.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.model.LoadBalancerDefinition; import org.apache.camel.processor.loadbalancer.LoadBalancer; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; /** @@ -30,7 +30,7 @@ import org.apache.camel.spi.RouteContext; * * The topic load balancer sends to all destinations (rather like JMS Topics) */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "topic") @XmlAccessorType(XmlAccessType.FIELD) public class TopicLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java index 959b5e8..b07a372 100644 --- a/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java @@ -28,7 +28,6 @@ import org.apache.camel.processor.loadbalancer.LoadBalancer; import org.apache.camel.processor.loadbalancer.WeightedLoadBalancer; import org.apache.camel.processor.loadbalancer.WeightedRandomLoadBalancer; import org.apache.camel.processor.loadbalancer.WeightedRoundRobinLoadBalancer; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.ObjectHelper; @@ -40,7 +39,7 @@ import org.apache.camel.util.ObjectHelper; * with respect to others. In addition to the weight, endpoint selection is then further refined using * random distribution based on weight. */ -@Label("eip,routing") +@Metadata(label = "eip,routing") @XmlRootElement(name = "weighted") @XmlAccessorType(XmlAccessType.FIELD) public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java index 8c05b05..e38b949 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/DeleteVerbDefinition.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Rest DELETE command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "delete") @XmlAccessorType(XmlAccessType.FIELD) public class DeleteVerbDefinition extends VerbDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java index ec0c30f..08698d0 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/GetVerbDefinition.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Rest GET command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "get") @XmlAccessorType(XmlAccessType.FIELD) public class GetVerbDefinition extends VerbDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java index 398bc16..5dce99a 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/HeadVerbDefinition.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Rest HEAD command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "head") @XmlAccessorType(XmlAccessType.FIELD) public class HeadVerbDefinition extends VerbDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java index c8e6f5d..76f7d3e 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/PostVerbDefinition.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Rest POST command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "post") @XmlAccessorType(XmlAccessType.FIELD) public class PostVerbDefinition extends VerbDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java index 323ec44..f688e49 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/PutVerbDefinition.java @@ -20,12 +20,12 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * Rest PUT command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "put") @XmlAccessorType(XmlAccessType.FIELD) public class PutVerbDefinition extends VerbDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java index e094a96..de75691 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingDefinition.java @@ -29,7 +29,6 @@ import org.apache.camel.Processor; import org.apache.camel.model.NoOutputDefinition; import org.apache.camel.processor.binding.RestBindingProcessor; import org.apache.camel.spi.DataFormat; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.IntrospectionSupport; @@ -37,7 +36,7 @@ import org.apache.camel.util.IntrospectionSupport; /** * To configure rest binding */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "restBinding") @XmlAccessorType(XmlAccessType.FIELD) public class RestBindingDefinition extends NoOutputDefinition<RestBindingDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java index 7a9218b..7dd7632 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestBindingMode.java @@ -19,9 +19,9 @@ package org.apache.camel.model.rest; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; -@Label("rest") +@Metadata(label = "rest") @XmlType @XmlEnum(String.class) public enum RestBindingMode { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java index 4365a0c..f44f5ba 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java @@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.apache.camel.CamelContext; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.RestConfiguration; import org.apache.camel.util.CamelContextHelper; @@ -35,7 +34,7 @@ import org.apache.camel.util.CamelContextHelper; /** * To configure rest */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "restConfiguration") @XmlAccessorType(XmlAccessType.FIELD) public class RestConfigurationDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java index d7c6f0d..82633ca 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java @@ -31,7 +31,6 @@ import org.apache.camel.CamelContext; import org.apache.camel.model.OptionalIdentifiedDefinition; import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.ToDefinition; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; @@ -39,7 +38,7 @@ import org.apache.camel.util.URISupport; /** * Defines a rest service using the rest-dsl */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "rest") @XmlAccessorType(XmlAccessType.FIELD) public class RestDefinition extends OptionalIdentifiedDefinition<RestDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java index 468edc4..6703aca 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestHostNameResolver.java @@ -19,12 +19,12 @@ package org.apache.camel.model.rest; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * To configure the rest hostname resolver */ -@Label("rest") +@Metadata(label = "rest") @XmlType @XmlEnum(String.class) public enum RestHostNameResolver { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java index 593a50f..95eb84c 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestPropertyDefinition.java @@ -21,12 +21,12 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * A key value pair */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "restProperty") @XmlAccessorType(XmlAccessType.FIELD) public class RestPropertyDefinition { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java index 0f83df1..b200537 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestsDefinition.java @@ -26,12 +26,12 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.model.ModelCamelContext; import org.apache.camel.model.OptionalIdentifiedDefinition; -import org.apache.camel.spi.Label; +import org.apache.camel.spi.Metadata; /** * A series of rest services defined using the rest-dsl */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "rests") @XmlAccessorType(XmlAccessType.FIELD) public class RestsDefinition extends OptionalIdentifiedDefinition<RestsDefinition> implements RestContainer { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index 6a1b3a5..df053fd 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -27,13 +27,12 @@ import javax.xml.bind.annotation.XmlTransient; import org.apache.camel.model.OptionalIdentifiedDefinition; import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.ToDefinition; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; /** * Rest command */ -@Label("rest") +@Metadata(label = "rest") @XmlRootElement(name = "verb") @XmlAccessorType(XmlAccessType.FIELD) public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java index e4b2f6e..4c1b80a 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java @@ -40,7 +40,6 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import org.apache.camel.spi.Label; import org.apache.camel.spi.Metadata; import static org.apache.camel.tools.apt.JsonSchemaHelper.sanitizeDescription; @@ -108,6 +107,10 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { } final XmlRootElement rootElement = classElement.getAnnotation(XmlRootElement.class); + if (rootElement == null) { + return; + } + String aName = rootElement.name(); if (isNullOrEmpty(aName) || "##default".equals(aName)) { XmlType typeElement = classElement.getAnnotation(XmlType.class); @@ -185,11 +188,6 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor { model.setJavaType(javaTypeName); model.setName(name); - Label label = classElement.getAnnotation(Label.class); - if (label != null) { - model.setLabel(label.value()); - } - Metadata metadata = classElement.getAnnotation(Metadata.class); if (metadata != null) { if (!Strings.isNullOrEmpty(metadata.label())) { http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java index 39b4156..787b1c4 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java @@ -45,8 +45,6 @@ import static org.apache.camel.tools.apt.Strings.canonicalClassName; import static org.apache.camel.tools.apt.Strings.getOrElse; import static org.apache.camel.tools.apt.Strings.isNullOrEmpty; -// TODO: add support for @Label - /** * Processes all Camel {@link UriEndpoint}s and generate json schema and html documentation for the endpoint/component. */ http://git-wip-us.apache.org/repos/asf/camel/blob/111acdf3/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Label.java ---------------------------------------------------------------------- diff --git a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Label.java b/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Label.java deleted file mode 100644 index 607305d..0000000 --- a/tooling/spi-annotations/src/main/java/org/apache/camel/spi/Label.java +++ /dev/null @@ -1,45 +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.spi; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Defines a label which can be used to associate a class or type with label(s). - * <p/> - * For example Camel uses this to categorize the EIPs with labels. - * - * @deprecated use {@link org.apache.camel.spi.Metadata} instead - */ -@Retention(RetentionPolicy.RUNTIME) -@Documented -@Target({ElementType.TYPE}) -@Deprecated -public @interface Label { - - /** - * To associate this class or type with label(s). - * <p/> - * Multiple labels can be defined as a comma separated value. - */ - String value() default ""; - -}
