Author: akarpe
Date: Thu Jan 20 19:50:01 2011
New Revision: 1061479
URL: http://svn.apache.org/viewvc?rev=1061479&view=rev
Log:
CAMEL-3562 Updated behavior based on recommendations by Claus
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1061479&r1=1061478&r2=1061479&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
Thu Jan 20 19:50:01 2011
@@ -467,7 +467,7 @@ public class BindyFixedLengthFactory ext
}
// Get trimRecord parameter
- trimRecordOnUnmarshal = record.trimRecordOnUnmarshal();
+ trimRecordOnUnmarshal = record.trim();
if (LOG.isDebugEnabled()) {
LOG.debug("Trim record : " + trimRecordOnUnmarshal);
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java?rev=1061479&r1=1061478&r2=1061479&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
Thu Jan 20 19:50:01 2011
@@ -60,6 +60,6 @@ public @interface FixedLengthRecord {
boolean hasFooter() default false;
- boolean trimRecordOnUnmarshal() default true;
+ boolean trim() default false;
}
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java?rev=1061479&r1=1061478&r2=1061479&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
Thu Jan 20 19:50:01 2011
@@ -80,7 +80,7 @@ public class BindySimpleFixedLengthNoTri
}
- @FixedLengthRecord(length = 69, paddingChar = ' ', trimRecordOnUnmarshal =
false)
+ @FixedLengthRecord(length = 69, paddingChar = ' ')
public static class Order {
@DataField(pos = 1, length = 2)
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java?rev=1061479&r1=1061478&r2=1061479&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
Thu Jan 20 19:50:01 2011
@@ -80,7 +80,7 @@ public class BindySimpleFixedLengthUnmar
}
- @FixedLengthRecord(length = 65, paddingChar = ' ')
+ @FixedLengthRecord(length = 65, paddingChar = ' ', trim = true)
public static class Order {
@DataField(pos = 1, length = 2)
