Author: davsclaus
Date: Tue Nov 8 08:50:31 2011
New Revision: 1199159
URL: http://svn.apache.org/viewvc?rev=1199159&view=rev
Log:
CAMEL-4004: Introduced newFileConsumer for esier subclassing the file consumer.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java?rev=1199159&r1=1199158&r2=1199159&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
Tue Nov 8 08:50:31 2011
@@ -61,7 +61,7 @@ public class FileEndpoint extends Generi
}
}
- FileConsumer result = new FileConsumer(this, processor, operations);
+ FileConsumer result = newFileConsumer(processor, operations);
if (isDelete() && getMove() != null) {
throw new IllegalArgumentException("You cannot set both
delete=true and move options");
@@ -105,6 +105,17 @@ public class FileEndpoint extends Generi
return exchange;
}
+ /**
+ * Strategy to create a new {@link FileConsumer}
+ *
+ * @param processor the given processor
+ * @param operations file operations
+ * @return the created consumer
+ */
+ protected FileConsumer newFileConsumer(Processor processor,
GenericFileOperations<File> operations) {
+ return new FileConsumer(this, processor, operations);
+ }
+
public File getFile() {
return file;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java?rev=1199159&r1=1199158&r2=1199159&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExchangeHelper.java
Tue Nov 8 08:50:31 2011
@@ -630,13 +630,7 @@ public final class ExchangeHelper {
}
/**
- * @deprecated use
- *
org.apache.camel.CamelExchangeException.createExceptionMessage
- * instead
- * @param message
- * @param exchange
- * @param cause
- * @return
+ * @deprecated use
org.apache.camel.CamelExchangeException.createExceptionMessage instead
*/
@Deprecated
public static String createExceptionMessage(String message, Exchange
exchange, Throwable cause) {
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java?rev=1199159&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/NewFileConsumerTest.java
Tue Nov 8 08:50:31 2011
@@ -0,0 +1,82 @@
+/**
+ * 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 java.io.File;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class NewFileConsumerTest extends ContextTestSupport {
+
+ private MyFileEndpoint myFile;
+
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/myfile");
+ super.setUp();
+ }
+
+ public void testNewFileConsumer() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(1);
+
+ template.sendBodyAndHeader("file:target/myfile", "Hello World",
Exchange.FILE_NAME, "hello.txt");
+
+ assertMockEndpointsSatisfied();
+ oneExchangeDone.matchesMockWaitTime();
+
+ assertTrue("Should have invoked postPollCheck", myFile.isPost());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ myFile = new MyFileEndpoint();
+ myFile.setCamelContext(context);
+ myFile.setFile(new File("target/myfile"));
+
+ from(myFile).to("mock:result");
+ }
+ };
+ }
+
+ private class MyFileEndpoint extends FileEndpoint {
+
+ private volatile boolean post;
+
+ protected FileConsumer newFileConsumer(Processor processor,
GenericFileOperations<File> operations) {
+ return new FileConsumer(this, processor, operations) {
+ @Override
+ protected void postPollCheck() {
+ post = true;
+ }
+ };
+ }
+
+ public boolean isPost() {
+ return post;
+ }
+ }
+
+}
