Author: jstrachan
Date: Tue Jul 6 14:47:12 2010
New Revision: 960907
URL: http://svn.apache.org/viewvc?rev=960907&view=rev
Log:
fix for CAMEL-2913 so we can mark some common properties as being required to
help tooling
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java
(contents, props changed)
- copied, changed from r960836,
camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java?rev=960907&r1=960906&r2=960907&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanDefinition.java
Tue Jul 6 14:47:12 2010
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Processor;
import org.apache.camel.component.bean.BeanProcessor;
import org.apache.camel.component.bean.RegistryBean;
+import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
@@ -72,6 +73,7 @@ public class BeanDefinition extends Outp
return ref;
}
+ @Required
public void setRef(String ref) {
this.ref = ref;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=960907&r1=960906&r2=960907&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
Tue Jul 6 14:47:12 2010
@@ -28,6 +28,7 @@ import org.apache.camel.Predicate;
import org.apache.camel.Processor;
import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.processor.FilterProcessor;
+import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
/**
@@ -70,6 +71,7 @@ public class ExpressionNode extends Proc
return expression;
}
+ @Required
public void setExpression(ExpressionDefinition expression) {
this.expression = expression;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?rev=960907&r1=960906&r2=960907&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java
Tue Jul 6 14:47:12 2010
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlRoot
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.Endpoint;
+import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -87,6 +88,7 @@ public class FromDefinition extends Opti
*
* @param uri the endpoint URI to use
*/
+ @Required
public void setUri(String uri) {
this.uri = uri;
clear();
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java?rev=960907&r1=960906&r2=960907&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
Tue Jul 6 14:47:12 2010
@@ -35,7 +35,7 @@ import org.apache.camel.spi.NodeIdFactor
*/
@XmlType(name = "optionalIdentifiedDefinition")
@XmlAccessorType(XmlAccessType.FIELD)
-public abstract class OptionalIdentifiedDefinition<T extends
OptionalIdentifiedDefinition> {
+public abstract class OptionalIdentifiedDefinition<T extends
OptionalIdentifiedDefinition<T>> {
@XmlAttribute(required = false)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java?rev=960907&r1=960906&r2=960907&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SendDefinition.java
Tue Jul 6 14:47:12 2010
@@ -28,6 +28,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.spi.Required;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -80,6 +81,7 @@ public abstract class SendDefinition<Typ
return uri;
}
+ @Required
public void setUri(String uri) {
this.uri = uri;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java
(from r960836,
camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java&r1=960836&r2=960907&rev=960907&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Consume.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java Tue
Jul 6 14:47:12 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.spi;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -23,21 +23,13 @@ import java.lang.annotation.RetentionPol
import java.lang.annotation.Target;
/**
- * Subscribes a method to an {...@link Endpoint} either via its
- * <a href="http://camel.apache.org/uris.html";>URI</a> or via the name of the
endpoint reference
- * which is then resolved in a registry such as the Spring Application Context.
+ * Used to denote fields which are required to be specified for validation
purposes
+ * particularly in tooling.
*
- * When a message {...@link Exchange} is received from the {...@link Endpoint}
then the
- * <a href="http://camel.apache.org/bean-integration.html";>Bean Integration</a>
- * mechanism is used to map the incoming {...@link Message} to the method
parameters.
- *
* @version $Revision$
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
-public @interface Consume {
- String uri() default "";
- String ref() default "";
- String context() default "";
+public @interface Required {
}
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Required.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
