You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/09/01 15:14:38 UTC

svn commit: r991522 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/language/simple/SimpleLanguage.java test/java/org/apache/camel/language/FileLanguageTest.java

Author: davsclaus
Date: Wed Sep  1 13:14:38 2010
New Revision: 991522

URL: http://svn.apache.org/viewvc?rev=991522&view=rev
Log:
CAMEL-3097: Added file:size to file language.

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java?rev=991522&r1=991521&r2=991522&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java Wed Sep  1 13:14:38 2010
@@ -303,7 +303,7 @@ public class SimpleLanguage extends Simp
             return ExpressionBuilder.fileAbsoluteExpression();
         } else if (ObjectHelper.equal(remainder, "absolute.path")) {
             return ExpressionBuilder.fileAbsolutePathExpression();
-        } else if (ObjectHelper.equal(remainder, "length")) {
+        } else if (ObjectHelper.equal(remainder, "length") || ObjectHelper.equal(remainder, "size")) {
             return ExpressionBuilder.fileSizeExpression();
         } else if (ObjectHelper.equal(remainder, "modified")) {
             return ExpressionBuilder.fileLastModifiedExpression();

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java?rev=991522&r1=991521&r2=991522&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/FileLanguageTest.java Wed Sep  1 13:14:38 2010
@@ -71,6 +71,7 @@ public class FileLanguageTest extends La
         assertExpression("${file:absolute}", FileUtil.isAbsolute(file));
         assertExpression("${file:absolute.path}", file.getAbsolutePath());
         assertExpression("${file:length}", file.length());
+        assertExpression("${file:size}", file.length());
 
         // modified is a Date object
         Date modified = SimpleLanguage.simple("file:modified").evaluate(exchange, Date.class);