camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r585089 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/
Date Tue, 16 Oct 2007 09:25:09 GMT
Author: jstrachan
Date: Tue Oct 16 02:25:07 2007
New Revision: 585089

URL: http://svn.apache.org/viewvc?rev=585089&view=rev
Log:
added explicit generics to avoid possible compiler wierdness in the DSL like we had yesterday
where the compiler decided to use Object rather than ProcessorType in some DSL expressions

Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java Tue
Oct 16 02:25:07 2007
@@ -33,7 +33,7 @@
  */
 @XmlRootElement(name = "bean")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class BeanRef extends OutputType {
+public class BeanRef extends OutputType<ProcessorType> {
     @XmlAttribute(required = true)
     private String ref;
     @XmlAttribute(required = false)

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java Tue
Oct 16 02:25:07 2007
@@ -36,7 +36,7 @@
  */
 @XmlRootElement(name = "catch")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class CatchType extends ProcessorType {
+public class CatchType extends ProcessorType<ProcessorType> {
     @XmlElementRef
     private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
     @XmlElement(name = "exception")

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
Tue Oct 16 02:25:07 2007
@@ -28,7 +28,7 @@
  */
 @XmlRootElement(name = "finally")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class FinallyType extends OutputType {
+public class FinallyType extends OutputType<ProcessorType> {
     @Override
     public String toString() {
         return "Finally[" + getOutputs() + "]";

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
Tue Oct 16 02:25:07 2007
@@ -41,7 +41,7 @@
  */
 @XmlRootElement(name = "marshal")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MarshalType extends OutputType {
+public class MarshalType extends OutputType<ProcessorType> {
     @XmlAttribute(required = false)
     private String ref;
     // TODO cannot use @XmlElementRef as it doesn't allow optional properties

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
Tue Oct 16 02:25:07 2007
@@ -28,7 +28,7 @@
  */
 @XmlRootElement(name = "otherwise")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class OtherwiseType extends OutputType {
+public class OtherwiseType extends OutputType<ProcessorType> {
 
     @Override
     public String toString() {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java Tue
Oct 16 02:25:07 2007
@@ -31,7 +31,7 @@
  */
 @XmlRootElement(name = "policy")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class PolicyRef extends OutputType {
+public class PolicyRef extends OutputType<ProcessorType> {
     @XmlAttribute(required = true)
     private String ref;
     @XmlTransient

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
Tue Oct 16 02:25:07 2007
@@ -31,9 +31,9 @@
  */
 @XmlRootElement(name = "proceed")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ProceedType extends ProcessorType {
+public class ProceedType extends ProcessorType<ProcessorType> {
 
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorType<?>> getOutputs() {
         return Collections.EMPTY_LIST;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
Tue Oct 16 02:25:07 2007
@@ -30,7 +30,7 @@
  */
 @XmlRootElement(name = "process")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ProcessorRef extends OutputType {
+public class ProcessorRef extends OutputType<ProcessorType> {
     @XmlAttribute(required = true)
     private String ref;
     @XmlTransient

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java Tue
Oct 16 02:25:07 2007
@@ -40,7 +40,7 @@
  */
 @XmlRootElement(name = "thread")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ThreadType extends ProcessorType {
+public class ThreadType extends ProcessorType<ProcessorType> {
     
     @XmlAttribute
     private int coreSize = 1;
@@ -57,7 +57,7 @@
     @XmlAttribute
     private long stackSize;
     @XmlElementRef
-    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+    private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
 
     @XmlTransient
     private BlockingQueue<Runnable> taskQueue;
@@ -84,7 +84,7 @@
     }
 
     @Override
-    public List getOutputs() {
+    public List<ProcessorType<?>> getOutputs() {
         return outputs;
     }
     

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
Tue Oct 16 02:25:07 2007
@@ -34,7 +34,7 @@
  */
 @XmlRootElement(name = "throttler")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ThrottlerType extends ProcessorType {
+public class ThrottlerType extends ProcessorType<ProcessorType> {
     @XmlAttribute
     private Long maximumRequestsPerPeriod;
     @XmlAttribute
@@ -42,7 +42,7 @@
     @XmlElementRef
     private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
     @XmlElementRef
-    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+    private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
 
     public ThrottlerType() {
     }
@@ -106,11 +106,11 @@
         this.interceptors = interceptors;
     }
 
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorType<?>> getOutputs() {
         return outputs;
     }
 
-    public void setOutputs(List<ProcessorType> outputs) {
+    public void setOutputs(List<ProcessorType<?>> outputs) {
         this.outputs = outputs;
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Tue Oct
16 02:25:07 2007
@@ -40,7 +40,7 @@
  */
 @XmlRootElement(name = "to")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ToType extends ProcessorType {
+public class ToType extends ProcessorType<ProcessorType> {
     @XmlAttribute
     private String uri;
     @XmlAttribute
@@ -121,7 +121,7 @@
         this.endpoint = endpoint;
     }
 
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorType<?>> getOutputs() {
         return Collections.EMPTY_LIST;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=585089&r1=585088&r2=585089&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
Tue Oct 16 02:25:07 2007
@@ -40,7 +40,7 @@
  */
 @XmlRootElement(name = "unmarshal")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class UnmarshalType extends OutputType {
+public class UnmarshalType extends OutputType<ProcessorType> {
     @XmlAttribute(required = false)
     private String ref;
     // TODO cannot use @XmlElementRef as it doesn't allow optional properties



Mime
View raw message