Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r790084 - in /camel/trunk/camel-core/src:
 main/java/org/apache/camel/component/file/FileComponent.java
 test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java
Date: Wed, 01 Jul 2009 09:19:58 -0000
To: commits@camel.apache.org
From: davsclaus@apache.org
Message-Id: <20090701091959.14A0B238886C@eris.apache.org>

Author: davsclaus
Date: Wed Jul  1 09:19:57 2009
New Revision: 790084

URL: http://svn.apache.org/viewvc?rev=790084&view=rev
Log:
CAMEL-1778: Better validation of starting directory for file endpoint.

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java   (with props)
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java?rev=790084&r1=790083&r2=790084&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileComponent.java Wed Jul  1 09:19:57 2009
@@ -35,6 +35,13 @@
     public static final String DEFAULT_LOCK_FILE_POSTFIX = ".camelLock";
 
     protected GenericFileEndpoint<File> buildFileEndpoint(String uri, String remaining, Map parameters) throws Exception {
+        // the starting directory must be a static (not containing dynamic expressions)
+        if (remaining.indexOf("${") != -1) {
+            throw new IllegalArgumentException("Invalid directory: " + remaining
+                    + ". Dynamic expressions with ${ } placeholders is not allowed."
+                    + " Use the fileName option to set the dynamic expression.");
+        }
+
         File file = new File(remaining);
 
         FileEndpoint result = new FileEndpoint(uri, this);

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java?rev=790084&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java Wed Jul  1 09:19:57 2009
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ResolveEndpointFailedException;
+
+/**
+ * @version $Revision$
+ */
+public class FileInvalidStartingPathTest extends ContextTestSupport {
+
+    public void testInvalidStartingPath() {
+        try {
+            context.getEndpoint("file://target/path/${date:now:yyyyMMdd}/${in.header.messageType}-${date:now:hhmmss}.txt");
+            fail("Should have thrown an exception");
+        } catch (ResolveEndpointFailedException e) {
+            assertTrue(e.getCause().getMessage().startsWith("Invalid directory"));
+        }
+    }
+
+    public void testValidStartingPath() {
+        context.getEndpoint("file://target/path/?fileName=${date:now:yyyyMMdd}/${in.header.messageType}-${date:now:hhmmss}.txt");
+    }
+
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileInvalidStartingPathTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date