camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r709613 [2/2] - in /activemq/camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/builder/xml/ camel-core/src/main/java/org/apache/camel/compone...
Date Sat, 01 Nov 2008 00:21:40 GMT
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.language.header;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.ExpressionBuilder;
@@ -28,15 +27,15 @@
  */
 public class HeaderLanguage implements Language {
 
-    public static Expression<Exchange> header(String headerName) {        
+    public static Expression header(String headerName) {        
         return ExpressionBuilder.headerExpression(headerName);
     }
 
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return PredicateBuilder.toPredicate(createExpression(expression));
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return HeaderLanguage.header(expression);
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/AbstractSimpleLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/AbstractSimpleLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/AbstractSimpleLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/AbstractSimpleLanguage.java Fri Oct 31 17:21:38 2008
@@ -31,18 +31,18 @@
  */
 public abstract class AbstractSimpleLanguage implements Language {
     
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return PredicateBuilder.toPredicate(createExpression(expression));
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         if (expression.indexOf("${") >= 0) {
             return createComplexExpression(expression);
         }
         return createSimpleExpression(expression);
     }
 
-    protected Expression<Exchange> createComplexExpression(String expression) {
+    protected Expression createComplexExpression(String expression) {
         List<Expression> results = new ArrayList<Expression>();
 
         int pivot = 0;
@@ -81,7 +81,7 @@
      * @param expression  the content between ${ and }
      * @return the expression
      */
-    protected abstract <E extends Exchange> Expression<Exchange> createSimpleExpression(String expression);
+    protected abstract Expression createSimpleExpression(String expression);
 
     protected String ifStartsWithReturnRemainder(String prefix, String text) {
         if (text.startsWith(prefix)) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java Fri Oct 31 17:21:38 2008
@@ -40,9 +40,9 @@
         // Helper class
     }
 
-    public static <E extends Exchange> Expression<E> fileNameExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileNameExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFileName", String.class);
             }
 
@@ -53,9 +53,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> fileNameNoExtensionExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileNameNoExtensionExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 String name = exchange.getIn().getHeader("CamelFileName", String.class);
                 if (name != null) {
                     return name.substring(0, name.lastIndexOf('.'));
@@ -71,9 +71,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> fileParentExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileParentExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFileParent", String.class);
             }
 
@@ -84,9 +84,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> filePathExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression filePathExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFilePath", String.class);
             }
 
@@ -97,9 +97,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> fileAbsolutePathExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileAbsolutePathExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFileAbsolutePath", String.class);
             }
 
@@ -110,9 +110,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> fileCanoicalPathExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileCanoicalPathExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFileCanonicalPath", String.class);
             }
 
@@ -123,9 +123,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> fileSizeExpression() {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression fileSizeExpression() {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 return exchange.getIn().getHeader("CamelFileLength", Long.class);
             }
 
@@ -136,9 +136,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> dateExpression(final String command, final String pattern) {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression dateExpression(final String command, final String pattern) {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 if ("file".equals(command)) {
                     Date date = exchange.getIn().getHeader("CamelFileLastModified", Date.class);
                     if (date != null) {
@@ -160,9 +160,9 @@
         };
     }
 
-    public static <E extends Exchange> Expression<E> simpleExpression(final String simple) {
-        return new Expression<E>() {
-            public Object evaluate(E exchange) {
+    public static Expression simpleExpression(final String simple) {
+        return new Expression() {
+            public Object evaluate(Exchange exchange) {
                 // must call evaluate to return the nested language evaluate when evaluating
                 // stacked expressions
                 try {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java Fri Oct 31 17:21:38 2008
@@ -50,7 +50,7 @@
         return language.createExpression(expression);
     }
 
-    protected Expression<FileExchange> createSimpleExpression(String expression) {
+    protected Expression createSimpleExpression(String expression) {
 
         // file: prefix
         String remainder = ifStartsWithReturnRemainder("file:", expression);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java Fri Oct 31 17:21:38 2008
@@ -52,7 +52,7 @@
         return language.createExpression(expression);
     }
 
-    protected Expression<Exchange> createSimpleExpression(String expression) {
+    protected Expression createSimpleExpression(String expression) {
         if (ObjectHelper.isEqualToAny(expression, "body", "in.body")) {
             return ExpressionBuilder.bodyExpression();
         } else if (ObjectHelper.equal(expression, "out.body")) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java Fri Oct 31 17:21:38 2008
@@ -18,7 +18,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.xml.XPathBuilder;
@@ -32,13 +31,13 @@
 public class XPathLanguage implements Language {
     private QName resultType;
 
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         XPathBuilder builder = XPathBuilder.xpath(expression);
         configureBuilder(builder);
         return builder;
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         XPathBuilder builder = XPathBuilder.xpath(expression);
         configureBuilder(builder);
         return builder;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java Fri Oct 31 17:21:38 2008
@@ -151,7 +151,7 @@
         return this;
     }
 
-    public LoadBalanceType sticky(Expression<Exchange> correlationExpression) {
+    public LoadBalanceType sticky(Expression correlationExpression) {
         loadBalancerType = new LoadBalancerType(new StickyLoadBalancer(correlationExpression));
         return this;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java Fri Oct 31 17:21:38 2008
@@ -45,7 +45,7 @@
         super(expression);
     }
 
-    public void setExpression(Expression<?> expr) {
+    public void setExpression(Expression expr) {
         if (expr != null) {
             setExpression(new ExpressionType(expr));
         }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Fri Oct 31 17:21:38 2008
@@ -613,7 +613,7 @@
      * @param expression the expression on which to compare messages in order
      * @return the builder
      */
-    public ResequencerType resequencer(Expression<Exchange> expression) {
+    public ResequencerType resequencer(Expression expression) {
         return resequencer(Collections.<Expression>singletonList(expression));
     }
 
@@ -787,7 +787,7 @@
      *                            the messages should be processed
      * @return the builder
      */
-    public DelayerType delayer(Expression<Exchange> processAtExpression) {
+    public DelayerType delayer(Expression processAtExpression) {
         return delayer(processAtExpression, 0L);
     }
 
@@ -804,7 +804,7 @@
      *                            should be processed
      * @return the builder
      */
-    public DelayerType delayer(Expression<Exchange> processAtExpression, long delay) {
+    public DelayerType delayer(Expression processAtExpression, long delay) {
         DelayerType answer = new DelayerType(processAtExpression, delay);
         addOutput(answer);
         return answer;
@@ -862,7 +862,7 @@
         return ExpressionClause.createAndSetExpression(loop);
     }
 
-    public LoopType loop(Expression<?> expression) {
+    public LoopType loop(Expression expression) {
         LoopType loop = getNodeFactory().createLoop();
         loop.setExpression(expression);
         addOutput(loop);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Fri Oct 31 17:21:38 2008
@@ -190,7 +190,7 @@
         
     }
     
-    public ResequencerType comparator(ExpressionResultComparator<Exchange> comparator) {
+    public ResequencerType comparator(ExpressionResultComparator comparator) {
         if (streamConfig == null) {
             throw new IllegalStateException("comparator() only supported for stream resequencer");
         }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java Fri Oct 31 17:21:38 2008
@@ -65,7 +65,7 @@
     private Long timeout; // optional XML attribute requires wrapper object
     
     @XmlTransient
-    private ExpressionResultComparator<Exchange> comparator;
+    private ExpressionResultComparator comparator;
 
     /**
      * Creates a new {@link StreamResequencerConfig} instance using default
@@ -98,7 +98,7 @@
      * @param capacity   capacity of the resequencer's inbound queue.
      * @param timeout    minimum time to wait for missing elements (messages).
      */
-    public StreamResequencerConfig(int capacity, long timeout, ExpressionResultComparator<Exchange> comparator) {
+    public StreamResequencerConfig(int capacity, long timeout, ExpressionResultComparator comparator) {
         this.capacity = capacity;
         this.timeout = timeout;
         this.comparator = comparator;
@@ -132,11 +132,11 @@
         this.timeout = timeout;
     }
 
-    public ExpressionResultComparator<Exchange> getComparator() {
+    public ExpressionResultComparator getComparator() {
         return comparator;
     }
 
-    public void setComparator(ExpressionResultComparator<Exchange> comparator) {
+    public void setComparator(ExpressionResultComparator comparator) {
         this.comparator = comparator;
     }
     

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java Fri Oct 31 17:21:38 2008
@@ -49,7 +49,7 @@
 @XmlRootElement
 @XmlType(name = "expressionType")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionType implements Expression<Exchange>, Predicate<Exchange> {
+public class ExpressionType implements Expression, Predicate {
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
@@ -135,7 +135,7 @@
         return "";
     }
 
-    public Predicate<Exchange> createPredicate(RouteContext routeContext) {
+    public Predicate createPredicate(RouteContext routeContext) {
         if (predicate == null) {
             if (expressionType != null) {
                 predicate = expressionType.createPredicate(routeContext);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Fri Oct 31 17:21:38 2008
@@ -71,8 +71,8 @@
     }
 
     @Override
-    public Predicate<Exchange> createPredicate(RouteContext routeContext) {
-        return new BeanExpression<Exchange>(beanName(), getMethod());
+    public Predicate createPredicate(RouteContext routeContext) {
+        return new BeanExpression(beanName(), getMethod());
     }
 
     protected String beanName() {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java Fri Oct 31 17:21:38 2008
@@ -43,7 +43,7 @@
 
     public void process(Exchange exchange) throws Exception {
         for (FilterProcessor filterProcessor : filters) {
-            Predicate<Exchange> predicate = filterProcessor.getPredicate();
+            Predicate predicate = filterProcessor.getPredicate();
             if (predicate != null && predicate.matches(exchange)) {
                 // process next will also take care (has not null test) if next was a stop().
                 // stop() has no processor to execute, and thus we will end in a NPE 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java Fri Oct 31 17:21:38 2008
@@ -32,10 +32,10 @@
  * @version $Revision$
  */
 public class Delayer extends DelayProcessorSupport {
-    private Expression<Exchange> timeExpression;
+    private Expression timeExpression;
     private long delay;
 
-    public Delayer(Processor processor, Expression<Exchange> timeExpression, long delay) {
+    public Delayer(Processor processor, Expression timeExpression, long delay) {
         super(processor);
         this.timeExpression = timeExpression;
         this.delay = delay;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java Fri Oct 31 17:21:38 2008
@@ -27,9 +27,9 @@
  * @version $Revision$
  */
 public class FilterProcessor extends DelegateProcessor {
-    private Predicate<Exchange> predicate;
+    private Predicate predicate;
 
-    public FilterProcessor(Predicate<Exchange> predicate, Processor processor) {
+    public FilterProcessor(Predicate predicate, Processor processor) {
         super(processor);
         this.predicate = predicate;
     }
@@ -45,7 +45,7 @@
         return "Filter[if: " + predicate + " do: " + getProcessor() + "]";
     }
 
-    public Predicate<Exchange> getPredicate() {
+    public Predicate getPredicate() {
         return predicate;
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java Fri Oct 31 17:21:38 2008
@@ -35,9 +35,9 @@
 
     private static final Log LOG = LogFactory.getLog(LoopProcessor.class);
 
-    private Expression<Exchange> expression;
+    private Expression expression;
 
-    public LoopProcessor(Expression<Exchange> expression, Processor processor) {
+    public LoopProcessor(Expression expression, Processor processor) {
         super(processor);
         this.expression = expression;
     }
@@ -66,7 +66,7 @@
         return "Loop[for: " + expression + " times do: " + getProcessor() + "]";
     }
 
-    public Expression<Exchange> getExpression() {
+    public Expression getExpression() {
         return expression;
     }
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Fri Oct 31 17:21:38 2008
@@ -41,10 +41,10 @@
  * @version $Revision$
  */
 public class RecipientList extends ServiceSupport implements Processor {
-    private final Expression<Exchange> expression;
+    private final Expression expression;
     private ProducerCache<Exchange> producerCache = new ProducerCache<Exchange>();
 
-    public RecipientList(Expression<Exchange> expression) {
+    public RecipientList(Expression expression) {
         notNull(expression, "expression");
         this.expression = expression;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java Fri Oct 31 17:21:38 2008
@@ -35,7 +35,7 @@
  * @version $Revision$
  */
 public class Resequencer extends BatchProcessor {
-    public Resequencer(Endpoint endpoint, Processor processor, Expression<Exchange> expression) {
+    public Resequencer(Endpoint endpoint, Processor processor, Expression expression) {
         this(endpoint, processor, createSet(expression));
     }
 
@@ -55,8 +55,8 @@
     // Implementation methods
     //-------------------------------------------------------------------------
 
-    protected static Set<Exchange> createSet(Expression<Exchange> expression) {
-        return createSet(new ExpressionComparator<Exchange>(expression));
+    protected static Set<Exchange> createSet(Expression expression) {
+        return createSet(new ExpressionComparator(expression));
     }
 
     protected static Set<Exchange> createSet(List<Expression> expressions) {

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java Fri Oct 31 17:21:38 2008
@@ -36,12 +36,12 @@
     /**
      * Gets the correlation expression
      */
-    Expression<Exchange> getCorrelationExpression();
+    Expression getCorrelationExpression();
 
     /**
      * Sets the correlation expression to be used
      */
-    void setCorrelationExpression(Expression<Exchange> correlationExpression);
+    void setCorrelationExpression(Expression correlationExpression);
 
     /**
      * Gets the aggregation strategy

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java Fri Oct 31 17:21:38 2008
@@ -37,14 +37,14 @@
 public class DefaultAggregationCollection extends AbstractCollection<Exchange> implements AggregationCollection {
 
     private static final transient Log LOG = LogFactory.getLog(DefaultAggregationCollection.class);
-    private Expression<Exchange> correlationExpression;
+    private Expression correlationExpression;
     private AggregationStrategy aggregationStrategy;
     private Map<Object, Exchange> map = new LinkedHashMap<Object, Exchange>();
 
     public DefaultAggregationCollection() {
     }
 
-    public DefaultAggregationCollection(Expression<Exchange> correlationExpression, AggregationStrategy aggregationStrategy) {
+    public DefaultAggregationCollection(Expression correlationExpression, AggregationStrategy aggregationStrategy) {
         this.correlationExpression = correlationExpression;
         this.aggregationStrategy = aggregationStrategy;
     }
@@ -101,11 +101,11 @@
     public void onAggregation(Object correlationKey, Exchange newExchange) {
     }
 
-    public Expression<Exchange> getCorrelationExpression() {
+    public Expression getCorrelationExpression() {
         return correlationExpression;
     }
 
-    public void setCorrelationExpression(Expression<Exchange> correlationExpression) {
+    public void setCorrelationExpression(Expression correlationExpression) {
         this.correlationExpression = correlationExpression;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java Fri Oct 31 17:21:38 2008
@@ -34,7 +34,7 @@
     private Predicate aggregationCompletedPredicate;
     private List<Exchange> collection = new ArrayList<Exchange>();
 
-    public PredicateAggregationCollection(Expression<Exchange> correlationExpression, AggregationStrategy aggregationStrategy, Predicate aggregationCompletedPredicate) {
+    public PredicateAggregationCollection(Expression correlationExpression, AggregationStrategy aggregationStrategy, Predicate aggregationCompletedPredicate) {
         super(correlationExpression, aggregationStrategy);
         this.aggregationCompletedPredicate = aggregationCompletedPredicate;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java Fri Oct 31 17:21:38 2008
@@ -34,12 +34,12 @@
  */
 public class IdempotentConsumer extends ServiceSupport implements Processor {
     private static final transient Log LOG = LogFactory.getLog(IdempotentConsumer.class);
-    private Expression<Exchange> messageIdExpression;
+    private Expression messageIdExpression;
     private Processor nextProcessor;
     private MessageIdRepository messageIdRepository;
 
-    public IdempotentConsumer(Expression<Exchange> messageIdExpression,
-                              MessageIdRepository messageIdRepository, Processor nextProcessor) {
+    public IdempotentConsumer(Expression messageIdExpression, 
+            MessageIdRepository messageIdRepository, Processor nextProcessor) {
         this.messageIdExpression = messageIdExpression;
         this.messageIdRepository = messageIdRepository;
         this.nextProcessor = nextProcessor;
@@ -65,7 +65,7 @@
 
     // Properties
     // -------------------------------------------------------------------------
-    public Expression<Exchange> getMessageIdExpression() {
+    public Expression getMessageIdExpression() {
         return messageIdExpression;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java Fri Oct 31 17:21:38 2008
@@ -38,7 +38,7 @@
     private boolean enabled = true;
     private String logName;
     private LoggingLevel logLevel;
-    private Predicate<Exchange> traceFilter;
+    private Predicate traceFilter;
     private boolean traceInterceptors;
     private boolean traceExceptions = true;
     private boolean traceOutExchanges = false;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java Fri Oct 31 17:21:38 2008
@@ -33,7 +33,7 @@
  * @version $Revision$
  */
 public class StickyLoadBalancer extends QueueLoadBalancer {
-    private Expression<Exchange> correlationExpression;
+    private Expression correlationExpression;
     private QueueLoadBalancer loadBalancer;
     private int numberOfHashGroups = 64 * 1024;
     private final Map<Object, Processor> stickyMap = new HashMap<Object, Processor>();
@@ -42,16 +42,16 @@
         this.loadBalancer = new RoundRobinLoadBalancer();
     }
 
-    public StickyLoadBalancer(Expression<Exchange> correlationExpression) {
+    public StickyLoadBalancer(Expression correlationExpression) {
         this(correlationExpression, new RoundRobinLoadBalancer());
     }
 
-    public StickyLoadBalancer(Expression<Exchange> correlationExpression, QueueLoadBalancer loadBalancer) {
+    public StickyLoadBalancer(Expression correlationExpression, QueueLoadBalancer loadBalancer) {
         this.correlationExpression = correlationExpression;
         this.loadBalancer = loadBalancer;
     }
 
-    public void setCorrelationExpression(Expression<Exchange> correlationExpression) {
+    public void setCorrelationExpression(Expression correlationExpression) {
         this.correlationExpression = correlationExpression;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java Fri Oct 31 17:21:38 2008
@@ -35,15 +35,15 @@
  * 
  * @version $Revision$
  */
-public class DefaultExchangeComparator implements ExpressionResultComparator<Exchange> {
+public class DefaultExchangeComparator implements ExpressionResultComparator {
 
-    private Expression<Exchange> expression;
+    private Expression expression;
 
-    public Expression<Exchange> getExpression() {
+    public Expression getExpression() {
         return expression;
     }
 
-    public void setExpression(Expression<Exchange> expression) {
+    public void setExpression(Expression expression) {
         this.expression = expression;
     }
 

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java Fri Oct 31 17:21:38 2008
@@ -29,7 +29,7 @@
  * 
  * @version $Revision$
  */
-public interface ExpressionResultComparator<E extends Exchange> extends SequenceElementComparator<E> {
+public interface ExpressionResultComparator extends SequenceElementComparator<Exchange> {
 
     /**
      * Sets the list expressions used for comparing {@link Exchange}s.

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Language.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Language.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Language.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Language.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spi;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 
@@ -33,7 +32,7 @@
      * @param expression  the expression
      * @return the created predicate
      */
-    Predicate<Exchange> createPredicate(String expression);
+    Predicate createPredicate(String expression);
 
     /**
      * Creates an expression based on the given string input
@@ -41,5 +40,5 @@
      * @param expression  the expression as a string input
      * @return the created expression
      */
-    Expression<Exchange> createExpression(String expression);
+    Expression createExpression(String expression);
 }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java Fri Oct 31 17:21:38 2008
@@ -196,7 +196,7 @@
         notNull(expressionText, "expressionText");
 
         Language language = resolveMandatoryLanguage(camelContext, languageName);
-        Expression<Exchange> expression = language.createExpression(expressionText);
+        Expression expression = language.createExpression(expressionText);
         if (expression == null) {
             throw new IllegalArgumentException("Could not create expression: " + expressionText + " with language: " + language);
         }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionComparator.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionComparator.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionComparator.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionComparator.java Fri Oct 31 17:21:38 2008
@@ -27,14 +27,14 @@
  *  
  * @version $Revision$
  */
-public class ExpressionComparator<E extends Exchange> implements Comparator<E> {
-    private final Expression<E> expression;
+public class ExpressionComparator implements Comparator<Exchange> {
+    private final Expression expression;
 
-    public ExpressionComparator(Expression<E> expression) {
+    public ExpressionComparator(Expression expression) {
         this.expression = expression;
     }
 
-    public int compare(E e1, E e2) {
+    public int compare(Exchange e1, Exchange e2) {
         Object o1 = expression.evaluate(e1);
         Object o2 = expression.evaluate(e2);
         return ObjectHelper.compare(o1, o2);

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java Fri Oct 31 17:21:38 2008
@@ -39,7 +39,7 @@
      * @param exchange the exchange to use to evaluate the expression
      * @return the result of the evaluation as a string.
      */
-    public static <E extends Exchange> String evaluateAsString(Expression<E> expression, E exchange) {
+    public static String evaluateAsString(Expression expression, Exchange exchange) {
         return evaluateAsType(expression, exchange, String.class);
     }
 
@@ -52,8 +52,7 @@
      * @param resultType the type of the result that is required
      * @return the result of the evaluation as the specified type.
      */
-    public static <T, E extends Exchange> T evaluateAsType(Expression<E> expression, E exchange,
-                                                           Class<T> resultType) {
+    public static <T> T evaluateAsType(Expression expression, Exchange exchange, Class<T> resultType) {
         Object value = expression.evaluate(exchange);
         return exchange.getContext().getTypeConverter().convertTo(resultType, exchange, value);
     }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Fri Oct 31 17:21:38 2008
@@ -239,7 +239,7 @@
     protected void assertExpression(Exchange exchange, String languageName, String expressionText, Object expectedValue) {
         Language language = assertResolveLanguage(languageName);
 
-        Expression<Exchange> expression = language.createExpression(expressionText);
+        Expression expression = language.createExpression(expressionText);
         assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression);
 
         assertExpression(expression, exchange, expectedValue);
@@ -252,7 +252,7 @@
     protected void assertPredicate(String languageName, String expressionText, Exchange exchange, boolean expected) {
         Language language = assertResolveLanguage(languageName);
 
-        Predicate<Exchange> predicate = language.createPredicate(expressionText);
+        Predicate predicate = language.createPredicate(expressionText);
         assertNotNull("No Predicate could be created for text: " + expressionText + " language: " + language, predicate);
 
         assertPredicate(predicate, exchange, expected);

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java Fri Oct 31 17:21:38 2008
@@ -76,7 +76,7 @@
     protected void assertExpression(String expressionText, String expectedValue, String orThisExpectedValue) {
         Language language = assertResolveLanguage(getLanguageName());
 
-        Expression<Exchange> expression = language.createExpression(expressionText);
+        Expression expression = language.createExpression(expressionText);
         assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression);
         
         Object value = expression.evaluate(exchange);

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Fri Oct 31 17:21:38 2008
@@ -46,7 +46,7 @@
     /**
      * Returns a value builder for the given header
      */
-    public <E extends Exchange> ValueBuilder<E> header(String name) {
+    public ValueBuilder header(String name) {
         return Builder.header(name);
     }
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java Fri Oct 31 17:21:38 2008
@@ -42,11 +42,11 @@
     protected Exchange exchange = new DefaultExchange(new DefaultCamelContext());
 
     public void testRegexTokenize() throws Exception {
-        Expression<Exchange> expression = regexTokenize(headerExpression("location"), ",");
+        Expression expression = regexTokenize(headerExpression("location"), ",");
         ArrayList expected = new ArrayList(Arrays.asList(new String[] {"Islington", "London", "UK"}));
         assertExpression(expression, exchange, expected);
 
-        Predicate<Exchange> predicate = contains(regexTokenize(headerExpression("location"), ","),
+        Predicate predicate = contains(regexTokenize(headerExpression("location"), ","),
                                                  constantExpression("London"));
         assertPredicate(predicate, exchange, true);
 
@@ -56,7 +56,7 @@
     }
 
     public void testRegexReplaceAll() throws Exception {
-        Expression<Exchange> expression = regexReplaceAll(headerExpression("location"), "London",
+        Expression expression = regexReplaceAll(headerExpression("location"), "London",
                                                           "Westminster");
         assertExpression(expression, exchange, "Islington,Westminster,UK");
 
@@ -65,12 +65,12 @@
     }
 
     public void testTokenize() throws Exception {
-        Expression <Exchange> expression = tokenizeExpression(headerExpression("location"), ",");
+        Expression expression = tokenizeExpression(headerExpression("location"), ",");
 
         ArrayList expected = new ArrayList(Arrays.asList(new String[] {"Islington", "London", "UK"}));
         assertExpression(expression, exchange, expected);
 
-        Predicate<Exchange> predicate = contains(tokenizeExpression(headerExpression("location"), ","),
+        Predicate predicate = contains(tokenizeExpression(headerExpression("location"), ","),
                                                  constantExpression("London"));
         assertPredicate(predicate, exchange, true);
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java Fri Oct 31 17:21:38 2008
@@ -55,11 +55,11 @@
         in.setHeader("size", 10);
     }
 
-    protected void assertMatches(Predicate<Exchange> predicate) {
+    protected void assertMatches(Predicate predicate) {
         assertPredicateMatches(predicate, exchange);
     }
 
-    protected void assertDoesNotMatch(Predicate<Exchange> predicate) {
+    protected void assertDoesNotMatch(Predicate predicate) {
         assertPredicateDoesNotMatch(predicate, exchange);
     }
 

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java Fri Oct 31 17:21:38 2008
@@ -57,7 +57,7 @@
         };
     }
 
-    public static class MyPredicate implements Predicate<Exchange> {
+    public static class MyPredicate implements Predicate {
         public String body;
 
         public boolean matches(Exchange exchange) {

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java Fri Oct 31 17:21:38 2008
@@ -33,12 +33,12 @@
  */
 public class CustomDataSetTest extends ContextTestSupport {
     protected DataSet dataSet = new DataSetSupport() {
-        Expression<Exchange> expression = new XPathBuilder<Exchange>("/message/@index").resultType(Long.class);
+        Expression expression = new XPathBuilder("/message/@index").resultType(Long.class);
 
         @Override
         public void assertMessageExpected(DataSetEndpoint dataSetEndpoint, Exchange expected, Exchange actual, long index) throws Exception {
             // lets compare the XPath result
-            Predicate<Exchange> predicate = PredicateBuilder.isEqualTo(expression, ExpressionBuilder.constantExpression(index));
+            Predicate predicate = PredicateBuilder.isEqualTo(expression, ExpressionBuilder.constantExpression(index));
             log.debug("evaluating predicate: " + predicate);
             predicate.assertMatches("Actual: " + actual, actual);
         }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java Fri Oct 31 17:21:38 2008
@@ -26,12 +26,11 @@
  *
  * @version $Revision$
  */
-public abstract class ExpressionAdapter extends ExpressionSupport<Exchange> {
+public abstract class ExpressionAdapter extends ExpressionSupport {
 
     public abstract Object evaluate(Exchange exchange);
 
     protected String assertionFailureMessage(Exchange exchange) {
         return toString();
     }
-
 }

Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java Fri Oct 31 17:21:38 2008
@@ -76,14 +76,14 @@
     private static class MyReverseAggregationCollection extends AbstractCollection<Exchange> implements AggregationCollection {
 
         private List<Exchange> collection = new ArrayList<Exchange>();
-        private Expression<Exchange> correlation;
+        private Expression correlation;
         private AggregationStrategy strategy;
 
-        public Expression<Exchange> getCorrelationExpression() {
+        public Expression getCorrelationExpression() {
             return correlation;
         }
 
-        public void setCorrelationExpression(Expression<Exchange> correlationExpression) {
+        public void setCorrelationExpression(Expression correlationExpression) {
             this.correlation = correlationExpression;
         }
 

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java Fri Oct 31 17:21:38 2008
@@ -41,13 +41,13 @@
 public abstract class BamProcessorSupport<T> implements Processor {
     private static final transient Log LOG = LogFactory.getLog(BamProcessorSupport.class);
     private Class<T> entityType;
-    private Expression<Exchange> correlationKeyExpression;
+    private Expression correlationKeyExpression;
     private TransactionTemplate transactionTemplate;
     private int retryCount = 20;
     private long retrySleep = 1000L;
 
     protected BamProcessorSupport(TransactionTemplate transactionTemplate,
-                                  Expression<Exchange> correlationKeyExpression) {
+                                  Expression correlationKeyExpression) {
         this.transactionTemplate = transactionTemplate;
         this.correlationKeyExpression = correlationKeyExpression;
 
@@ -68,7 +68,7 @@
     }
 
     protected BamProcessorSupport(TransactionTemplate transactionTemplate,
-                                  Expression<Exchange> correlationKeyExpression, Class<T> entitytype) {
+                                  Expression correlationKeyExpression, Class<T> entitytype) {
         this.transactionTemplate = transactionTemplate;
         this.entityType = entitytype;
         this.correlationKeyExpression = correlationKeyExpression;
@@ -115,7 +115,7 @@
 
     // Properties
     // -----------------------------------------------------------------------
-    public Expression<Exchange> getCorrelationKeyExpression() {
+    public Expression getCorrelationKeyExpression() {
         return correlationKeyExpression;
     }
 
@@ -129,11 +129,11 @@
 
     protected abstract T loadEntity(Exchange exchange, Object key) throws Exception;
 
-    protected abstract Class getKeyType();
+    protected abstract Class<?> getKeyType();
 
     protected Object getCorrelationKey(Exchange exchange) throws NoCorrelationKeyException {
         Object value = correlationKeyExpression.evaluate(exchange);
-        Class keyType = getKeyType();
+        Class<?> keyType = getKeyType();
         if (keyType != null) {
             value = ExchangeHelper.convertToType(exchange, keyType, value);
         }

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java Fri Oct 31 17:21:38 2008
@@ -38,11 +38,11 @@
 public class JpaBamProcessor extends JpaBamProcessorSupport<ProcessInstance> {
     private static final transient Log LOG = LogFactory.getLog(JpaBamProcessor.class);
 
-    public JpaBamProcessor(TransactionTemplate transactionTemplate, JpaTemplate template, Expression<Exchange> correlationKeyExpression, ActivityRules activityRules) {
+    public JpaBamProcessor(TransactionTemplate transactionTemplate, JpaTemplate template, Expression correlationKeyExpression, ActivityRules activityRules) {
         super(transactionTemplate, template, correlationKeyExpression, activityRules);
     }
 
-    public JpaBamProcessor(TransactionTemplate transactionTemplate, JpaTemplate template, Expression<Exchange> correlationKeyExpression, 
+    public JpaBamProcessor(TransactionTemplate transactionTemplate, JpaTemplate template, Expression correlationKeyExpression, 
                            ActivityRules activityRules, Class<ProcessInstance> entitytype) {
         super(transactionTemplate, template, correlationKeyExpression, activityRules, entitytype);
     }

Modified: activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java (original)
+++ activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java Fri Oct 31 17:21:38 2008
@@ -49,16 +49,15 @@
     private String keyPropertyName = "correlationKey";
     private boolean correlationKeyIsPrimary = true;
 
-    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, JpaTemplate template,
-                                  Expression<Exchange> correlationKeyExpression, ActivityRules activityRules,
-                                  Class<T> entitytype) {
+    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, JpaTemplate template, 
+            Expression correlationKeyExpression, ActivityRules activityRules, Class<T> entitytype) {
         super(transactionTemplate, correlationKeyExpression, entitytype);
         this.activityRules = activityRules;
         this.template = template;
     }
 
-    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, JpaTemplate template,
-                                  Expression<Exchange> correlationKeyExpression, ActivityRules activityRules) {
+    public JpaBamProcessorSupport(TransactionTemplate transactionTemplate, JpaTemplate template, 
+            Expression correlationKeyExpression, ActivityRules activityRules) {
         super(transactionTemplate, correlationKeyExpression);
         this.activityRules = activityRules;
         this.template = template;

Modified: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java Fri Oct 31 17:21:38 2008
@@ -40,7 +40,7 @@
     }
 
     public static ExpressionSupport toExpression(final Closure filter) {
-        return new ExpressionSupport<Exchange>() {
+        return new ExpressionSupport() {
             protected String assertionFailureMessage(Exchange exchange) {
                 return filter.toString();
             }

Modified: activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java Fri Oct 31 17:21:38 2008
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.language.groovy;
 
+import groovy.lang.Binding;
+import groovy.lang.Script;
+
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.Set;
 
-import groovy.lang.Binding;
-import groovy.lang.Script;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.ExpressionSupport;
 import org.apache.camel.util.ExchangeHelper;
@@ -29,7 +30,7 @@
 /**
  * @version $Revision$
  */
-public class GroovyExpression extends ExpressionSupport<Exchange> {
+public class GroovyExpression extends ExpressionSupport {
     private Class<Script> scriptType;
     private String text;
 
@@ -63,6 +64,7 @@
                 return null;
             }
 
+            @Override
             public Set entrySet() {
                 return Collections.EMPTY_SET;
             }

Modified: activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java (original)
+++ activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java Fri Oct 31 17:21:38 2008
@@ -29,7 +29,7 @@
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.TraceMethod;
 
-public enum HttpMethods implements Expression<Exchange> {
+public enum HttpMethods implements Expression {
 
     GET(GetMethod.class), POST(PostMethod.class), PUT(PutMethod.class), DELETE(DeleteMethod.class), HEAD(
         HeadMethod.class), OPTIONS(OptionsMethod.class), TRACE(TraceMethod.class);

Modified: activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java (original)
+++ activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java Fri Oct 31 17:21:38 2008
@@ -39,7 +39,7 @@
  * 
  * @version $Revision$
  */
-public class SqlBuilder<E extends Exchange> implements Expression<E>, Predicate<E> {
+public class SqlBuilder implements Expression, Predicate {
 
     private Query query;
     private Map<String, Object> variables = new HashMap<String, Object>();
@@ -48,16 +48,16 @@
         this.query = query;
     }
 
-    public Object evaluate(E exchange) {
+    public Object evaluate(Exchange exchange) {
         return evaluateQuery(exchange);
     }
 
-    public boolean matches(E exchange) {
+    public boolean matches(Exchange exchange) {
         List list = evaluateQuery(exchange);
         return matches(exchange, list);
     }
 
-    public void assertMatches(String text, E exchange) throws AssertionError {
+    public void assertMatches(String text, Exchange exchange) throws AssertionError {
         List list = evaluateQuery(exchange);
         if (!matches(exchange, list)) {
             throw new AssertionError(this + " failed on " + exchange + " as found " + list);
@@ -74,7 +74,7 @@
      * @return a new builder
      * @throws QueryParseException if there is an issue with the SQL
      */
-    public static <E extends Exchange> SqlBuilder<E> sql(String sql) throws QueryParseException {
+    public static SqlBuilder sql(String sql) throws QueryParseException {
         Query q = new Query();
         q.parse(sql);
         return new SqlBuilder(q);
@@ -83,7 +83,7 @@
     /**
      * Adds the variable value to be used by the SQL query
      */
-    public SqlBuilder<E> variable(String name, Object value) {
+    public SqlBuilder variable(String name, Object value) {
         getVariables().put(name, value);
         return this;
     }
@@ -100,11 +100,11 @@
 
     // Implementation methods
     // -----------------------------------------------------------------------
-    protected boolean matches(E exchange, List list) {
+    protected boolean matches(Exchange exchange, List list) {
         return ObjectHelper.matches(list);
     }
 
-    protected List evaluateQuery(E exchange) {
+    protected List evaluateQuery(Exchange exchange) {
         configureQuery(exchange);
         Message in = exchange.getIn();
         List list = in.getBody(List.class);
@@ -118,7 +118,7 @@
         }
     }
 
-    protected void configureQuery(E exchange) {
+    protected void configureQuery(Exchange exchange) {
         // lets pass in the headers as variables that the SQL can use
         addVariables(exchange.getProperties());
         addVariables(exchange.getIn().getHeaders());

Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java Fri Oct 31 17:21:38 2008
@@ -42,7 +42,7 @@
     private EntityManagerFactory entityManagerFactory;
     private String persistenceUnit = "camel";
     private JpaTemplate template;
-    private Expression<Exchange> producerExpression;
+    private Expression producerExpression;
     private int maximumResults = -1;
     private Class<?> entityType;
     private Map entityManagerProperties;
@@ -102,14 +102,14 @@
         this.template = template;
     }
 
-    public Expression<Exchange> getProducerExpression() {
+    public Expression getProducerExpression() {
         if (producerExpression == null) {
             producerExpression = createProducerExpression();
         }
         return producerExpression;
     }
 
-    public void setProducerExpression(Expression<Exchange> producerExpression) {
+    public void setProducerExpression(Expression producerExpression) {
         this.producerExpression = producerExpression;
     }
 
@@ -207,12 +207,12 @@
         // return new DefaultTransactionStrategy(emf);
     }
 
-    protected Expression<Exchange> createProducerExpression() {
+    protected Expression createProducerExpression() {
         final Class<?> type = getEntityType();
         if (type == null) {
             return ExpressionBuilder.bodyExpression();
         } else {
-            return new Expression<Exchange>() {
+            return new Expression() {
                 public Object evaluate(Exchange exchange) {
                     Object answer = exchange.getIn().getBody(type);
                     if (answer == null) {

Modified: activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java (original)
+++ activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java Fri Oct 31 17:21:38 2008
@@ -34,9 +34,9 @@
 public class JpaProducer extends DefaultProducer<Exchange> {
     private final TransactionStrategy template;
     private final JpaEndpoint endpoint;
-    private final Expression<Exchange> expression;
+    private final Expression expression;
 
-    public JpaProducer(JpaEndpoint endpoint, Expression<Exchange> expression) {
+    public JpaProducer(JpaEndpoint endpoint, Expression expression) {
         super(endpoint);
         this.endpoint = endpoint;
         this.expression = expression;

Modified: activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java (original)
+++ activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java Fri Oct 31 17:21:38 2008
@@ -40,7 +40,7 @@
  *
  * @version $Revision$
  */
-public class JuelExpression extends ExpressionSupport<Exchange> {
+public class JuelExpression extends ExpressionSupport {
     private final String expression;
     private final Class<?> type;
     private ExpressionFactory expressionFactory;

Modified: activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelLanguage.java (original)
+++ activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelLanguage.java Fri Oct 31 17:21:38 2008
@@ -28,11 +28,11 @@
  * @version $Revision$
  */
 public class JuelLanguage implements Language {
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return new JuelExpression(expression, Boolean.class);
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return new JuelExpression(expression, Object.class);
     }
 }

Modified: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java (original)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java Fri Oct 31 17:21:38 2008
@@ -28,7 +28,7 @@
 /**
  * <a href="http://commons.apache.org/jxpath/">JXPath</a> {@link Expression} support 
  */
-public class JXPathExpression extends ExpressionSupport<Exchange> {
+public class JXPathExpression extends ExpressionSupport {
 
     private String expression;
     private CompiledExpression compiledExpression;

Modified: activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java (original)
+++ activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.language.jxpath;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.spi.Language;
@@ -27,11 +26,11 @@
  */
 public class JXPathLanguage implements Language {
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return new JXPathExpression(expression, Object.class);
     }
 
-    public Predicate<Exchange> createPredicate(String predicate) {
+    public Predicate createPredicate(String predicate) {
         return new JXPathExpression(predicate, Boolean.class);
     }
 

Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java (original)
+++ activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java Fri Oct 31 17:21:38 2008
@@ -30,7 +30,7 @@
  *
  * @version $Revision$
  */
-public class OgnlExpression extends ExpressionSupport<Exchange> {
+public class OgnlExpression extends ExpressionSupport {
 
     private final String expressionString;
     private final Class<?> type;

Modified: activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java (original)
+++ activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.language.ognl;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.spi.Language;
@@ -28,11 +27,11 @@
  */
 public class OgnlLanguage implements Language {
 
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return new OgnlExpression(this, expression, Boolean.class);
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return new OgnlExpression(this, expression, Object.class);
     }
 }

Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java Fri Oct 31 17:21:38 2008
@@ -72,7 +72,7 @@
  *
  * @version $Revision$
  */
-public abstract class XQueryBuilder implements Expression<Exchange>, Predicate<Exchange>, NamespaceAware, Processor {
+public abstract class XQueryBuilder implements Expression, Predicate, NamespaceAware, Processor {
     private static final transient Log LOG = LogFactory.getLog(XQueryBuilder.class);
     private Configuration configuration;
     private XQueryExpression expression;

Modified: activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java Fri Oct 31 17:21:38 2008
@@ -26,11 +26,11 @@
  */
 public class XQueryLanguage implements Language {
 
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return XQueryBuilder.xquery(expression);
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return XQueryBuilder.xquery(expression);
     }
 }

Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java Fri Oct 31 17:21:38 2008
@@ -45,7 +45,7 @@
  *
  * @version $Revision$
  */
-public class ScriptBuilder<E extends Exchange> implements Expression<E>, Predicate<E>, Processor {
+public class ScriptBuilder implements Expression, Predicate, Processor {
     private static final transient Log LOG = LogFactory.getLog(ScriptBuilder.class);
 
     private String scriptEngineName;
@@ -73,16 +73,16 @@
         return getScriptDescription();
     }
 
-    public Object evaluate(E exchange) {
+    public Object evaluate(Exchange exchange) {
         return evaluateScript(exchange);
     }
 
-    public boolean matches(E exchange) {
+    public boolean matches(Exchange exchange) {
         Object scriptValue = evaluateScript(exchange);
         return matches(exchange, scriptValue);
     }
 
-    public void assertMatches(String text, E exchange) throws AssertionError {
+    public void assertMatches(String text, Exchange exchange) throws AssertionError {
         Object scriptValue = evaluateScript(exchange);
         if (!matches(exchange, scriptValue)) {
             throw new AssertionError(this + " failed on " + exchange + " as script returned <" + scriptValue + ">");
@@ -499,7 +499,7 @@
         }
     }
 
-    protected boolean matches(E exchange, Object scriptValue) {
+    protected boolean matches(Exchange exchange, Object scriptValue) {
         return ObjectConverter.toBool(scriptValue);
     }
 

Modified: activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java (original)
+++ activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.builder.script;
 
-import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
 import org.apache.camel.spi.Language;
@@ -31,11 +30,11 @@
         this.language = language;
     }
 
-    public Predicate<Exchange> createPredicate(String expression) {
+    public Predicate createPredicate(String expression) {
         return new ScriptBuilder(language, expression);
     }
 
-    public Expression<Exchange> createExpression(String expression) {
+    public Expression createExpression(String expression) {
         return new ScriptBuilder(language, expression);
     }
 }



Mime
View raw message