You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2009/06/30 11:36:32 UTC
svn commit: r789638 -
/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
Author: cmoulliard
Date: Tue Jun 30 09:36:32 2009
New Revision: 789638
URL: http://svn.apache.org/viewvc?rev=789638&view=rev
Log:
Change the test ObjectHelper.notNull to notEmpty for testing done on field factory.getPairSeparator of the class : BindyKeyValuePairFactory.java
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java?rev=789638&r1=789637&r2=789638&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java Tue Jun 30 09:36:32 2009
@@ -74,7 +74,7 @@
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
BindyKeyValuePairFactory factory = getFactory(exchange.getContext().getPackageScanClassResolver());
-
+
// List of Pojos
List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
@@ -87,7 +87,7 @@
Scanner scanner = new Scanner(in);
// Retrieve the pair separator defined to split the record
- ObjectHelper.notEmpty(factory.getPairSeparator(), "The separator has not been defined in the annotation @Message.");
+ ObjectHelper.notNull(factory.getPairSeparator(), "The pair separator property of the annotation @Message");
String separator = factory.getPairSeparator();
int count = 0;
@@ -107,7 +107,7 @@
LOG.debug("Counter " + count++ + " : content : " + line);
}
- // Create POJO where CSV data will be stored
+ // Create POJO
model = factory.factory();
// Split the message according to the pair separator defined in