Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairTabUnmarshallTest.java Fri Nov 20 16:54:46 2009 @@ -37,20 +37,20 @@ @ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.fix.BindySimpleKeyValuePairTabUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class) public class BindySimpleKeyValuePairTabUnmarshallTest extends CommonBindyTest { - + @Test @DirtiesContext public void testUnMarshallMessage() throws Exception { - + result.expectedMessageCount(1); - result.expectedBodiesReceived( generateModel().toString() ); + result.expectedBodiesReceived(generateModel().toString()); result.assertIsSatisfied(); } - + public List<Map<String, Object>> generateModel() { - - List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); - Map<String, Object> model = new HashMap<String, Object>(); + + List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); + Map<String, Object> model = new HashMap<String, Object>(); Header header = new Header(); header.setBeginString("FIX.4.1"); @@ -59,10 +59,10 @@ header.setMsgType("0"); header.setSendCompId("INVMGR"); header.setTargetCompId("BRKR"); - + Trailer trailer = new Trailer(); - trailer.setCheckSum(220); - + trailer.setCheckSum(220); + Order order = new Order(); order.setAccount("BE.CHM.001"); order.setClOrdId("CHM0001-01"); @@ -70,14 +70,14 @@ order.setIDSource("4"); order.setSecurityId("BE0001245678"); order.setSide("1"); - + order.setHeader(header); order.setTrailer(trailer); - + model.put(order.getClass().getName(), order); model.put(header.getClass().getName(), header); model.put(trailer.getClass().getName(), trailer); - + models.add(model); return models; }
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallDslTest.java Fri Nov 20 16:54:46 2009 @@ -43,14 +43,14 @@ @Test @DirtiesContext public void testUnMarshallMessage() throws Exception { - + result.expectedMessageCount(1); result.expectedBodiesReceived(generateModel().toString()); result.assertIsSatisfied(); } - + public List<Map<String, Object>> generateModel() { - List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); Map<String, Object> model = new HashMap<String, Object>(); Header header = new Header(); @@ -60,10 +60,10 @@ header.setMsgType("0"); header.setSendCompId("INVMGR"); header.setTargetCompId("BRKR"); - + Trailer trailer = new Trailer(); - trailer.setCheckSum(220); - + trailer.setCheckSum(220); + Order order = new Order(); order.setAccount("BE.CHM.001"); order.setClOrdId("CHM0001-01"); @@ -71,14 +71,14 @@ order.setIDSource("4"); order.setSecurityId("BE0001245678"); order.setSide("1"); - + order.setHeader(header); order.setTrailer(trailer); - + model.put(order.getClass().getName(), order); model.put(header.getClass().getName(), header); model.put(trailer.getClass().getName(), trailer); - + models.add(model); return models; } @@ -91,12 +91,10 @@ return new RouteBuilder() { @Override public void configure() { - from(URI_FILE_FIX) - .unmarshal().bindy(BindyType.KeyValue, "org.apache.camel.dataformat.bindy.model.fix.simple") - .to(URI_MOCK_RESULT); + from(URI_FILE_FIX).unmarshal().bindy(BindyType.KeyValue, "org.apache.camel.dataformat.bindy.model.fix.simple").to(URI_MOCK_RESULT); } }; } } -} \ No newline at end of file +} Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnmarshallTest.java Fri Nov 20 16:54:46 2009 @@ -41,21 +41,21 @@ @ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.fix.BindySimpleKeyValuePairUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class) public class BindySimpleKeyValuePairUnmarshallTest extends CommonBindyTest { - + @Test @DirtiesContext public void testUnMarshallMessage() throws Exception { - + result.expectedMessageCount(1); result.expectedBodiesReceived(generateModel().toString()); result.assertIsSatisfied(); - + } - + public List<Map<String, Object>> generateModel() { Map<String, Object> model = new HashMap<String, Object>(); - List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); - + List<Map<String, Object>> models = new ArrayList<Map<String, Object>>(); + Header header = new Header(); header.setBeginString("FIX.4.1"); header.setBodyLength(20); @@ -63,10 +63,10 @@ header.setMsgType("0"); header.setSendCompId("INVMGR"); header.setTargetCompId("BRKR"); - + Trailer trailer = new Trailer(); - trailer.setCheckSum(220); - + trailer.setCheckSum(220); + Order order = new Order(); order.setAccount("BE.CHM.001"); order.setClOrdId("CHM0001-01"); @@ -74,19 +74,18 @@ order.setIDSource("4"); order.setSecurityId("BE0001245678"); order.setSide("1"); - + order.setHeader(header); order.setTrailer(trailer); - + model.put(order.getClass().getName(), order); model.put(header.getClass().getName(), header); model.put(trailer.getClass().getName(), trailer); - + models.add(model); return models; } - @Configuration public static class ContextConfig extends SingleRouteCamelConfiguration { BindyKeyValuePairDataFormat kvpBindyDataFormat = new BindyKeyValuePairDataFormat("org.apache.camel.dataformat.bindy.model.fix.simple"); Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Client.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Client.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Client.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Client.java Fri Nov 20 16:54:46 2009 @@ -57,10 +57,7 @@ @Override public String toString() { - return "Model : " + Client.class.getName() + " : " - + String.valueOf(this.clientNr) + ", " - + String.valueOf(this.firstName) + ", " - + String.valueOf(this.lastName); + return "Model : " + Client.class.getName() + " : " + String.valueOf(this.clientNr) + ", " + String.valueOf(this.firstName) + ", " + String.valueOf(this.lastName); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Order.java Fri Nov 20 16:54:46 2009 @@ -28,10 +28,10 @@ @DataField(pos = 1, columnName = "Order Nr") private int orderNr; - + @Link private Client client; - + @Link private Security security; @@ -49,7 +49,7 @@ @DataField(pos = 11, pattern = "dd-MM-yyyy", columnName = "Order Date") private Date orderDate; - + public Client getClient() { return client; } @@ -57,7 +57,7 @@ public void setClient(Client client) { this.client = client; } - + public Security getSecurity() { return security; } @@ -116,8 +116,7 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + ", " + this.instrumentType + ", " + this.currency + ", " - + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + ", " + this.instrumentType + ", " + + this.currency + ", " + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Security.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Security.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Security.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/generateheader/Security.java Fri Nov 20 16:54:46 2009 @@ -46,8 +46,7 @@ @Override public String toString() { - return "Model : " + Security.class.getName() + " : " + this.instrumentNumber + ", " - + this.instrumentCode; + return "Model : " + Security.class.getName() + " : " + this.instrumentNumber + ", " + this.instrumentCode; } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Client.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Client.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Client.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Client.java Fri Nov 20 16:54:46 2009 @@ -57,10 +57,7 @@ @Override public String toString() { - return "Model : " + Client.class.getName() + " : " - + String.valueOf(this.clientNr) + ", " - + String.valueOf(this.firstName) + ", " - + String.valueOf(this.lastName); + return "Model : " + Client.class.getName() + " : " + String.valueOf(this.clientNr) + ", " + String.valueOf(this.firstName) + ", " + String.valueOf(this.lastName); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Order.java Fri Nov 20 16:54:46 2009 @@ -31,7 +31,7 @@ @Link private Client client; - + @Link private Security security; @@ -89,7 +89,7 @@ public void setOrderDate(Date orderDate) { this.orderDate = orderDate; } - + public Security getSecurity() { return security; } @@ -116,13 +116,7 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " - + String.valueOf(this.orderNr) + ", " - + String.valueOf(this.amount) + ", " - + String.valueOf(this.instrumentType) + ", " - + String.valueOf(this.orderType) + ", " - + String.valueOf(this.currency) + ", " - + String.valueOf(this.client) + "," - + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + String.valueOf(this.orderNr) + ", " + String.valueOf(this.amount) + ", " + String.valueOf(this.instrumentType) + ", " + + String.valueOf(this.orderType) + ", " + String.valueOf(this.currency) + ", " + String.valueOf(this.client) + "," + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Security.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Security.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Security.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/complex/twoclassesandonelink/Security.java Fri Nov 20 16:54:46 2009 @@ -46,8 +46,7 @@ @Override public String toString() { - return "Model : " + Security.class.getName() + " : " + this.instrumentNumber + ", " - + this.instrumentCode; + return "Model : " + Security.class.getName() + " : " + this.instrumentNumber + ", " + this.instrumentCode; } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Header.java Fri Nov 20 16:54:46 2009 @@ -22,22 +22,28 @@ @Link public class Header { - @KeyValuePairField(tag = 8) // Message Header + @KeyValuePairField(tag = 8) + // Message Header private String beginString; - @KeyValuePairField(tag = 9) // Checksum + @KeyValuePairField(tag = 9) + // Checksum private int bodyLength; - - @KeyValuePairField(tag = 34) // Sequence number + + @KeyValuePairField(tag = 34) + // Sequence number private int msgSeqNum; - - @KeyValuePairField(tag = 35) // Message Type + + @KeyValuePairField(tag = 35) + // Message Type private String msgType; - @KeyValuePairField(tag = 49) // Company sender Id + @KeyValuePairField(tag = 49) + // Company sender Id private String sendCompId; - - @KeyValuePairField(tag = 56) // target company id + + @KeyValuePairField(tag = 56) + // target company id private String targetCompId; public String getBeginString() { @@ -87,12 +93,11 @@ public void setTargetCompId(String targetCompId) { this.targetCompId = targetCompId; } - + @Override public String toString() { - return Header.class.getName() - + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum - + " , 35: " + this.msgType + ", 49: " + this.sendCompId + ", 56: " + this.targetCompId; + return Header.class.getName() + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum + " , 35: " + this.msgType + ", 49: " + + this.sendCompId + ", 56: " + this.targetCompId; } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Order.java Fri Nov 20 16:54:46 2009 @@ -25,32 +25,37 @@ @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1") public class Order { - - @Link Header header; - - @Link Trailer trailer; - @KeyValuePairField(tag = 1) // Client reference + @Link + Header header; + + @Link + Trailer trailer; + + @KeyValuePairField(tag = 1) + // Client reference private String account; - @KeyValuePairField(tag = 11) // Order reference + @KeyValuePairField(tag = 11) + // Order reference private String clOrdId; - - @KeyValuePairField(tag = 58) // Free text + + @KeyValuePairField(tag = 58) + // Free text private String text; - + @OneToMany(mappedTo = "org.apache.camel.dataformat.bindy.model.fix.complex.onetomany.Security") - List<Security> securities; + private List<Security> securities; public List<Security> getSecurities() { - return securities; - } + return securities; + } - public void setSecurities(List<Security> securities) { - this.securities = securities; - } + public void setSecurities(List<Security> securities) { + this.securities = securities; + } - public Header getHeader() { + public Header getHeader() { return header; } @@ -65,7 +70,7 @@ public void setTrailer(Trailer trailer) { this.trailer = trailer; } - + public String getAccount() { return account; } @@ -89,20 +94,20 @@ public void setText(String text) { this.text = text; } - + @Override public String toString() { - StringBuffer temp = new StringBuffer(); - temp.append(Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 58: " + this.text); - temp.append("\r"); - - if (this.securities != null) { - for (Security sec : this.securities) { - temp.append(sec.toString()); - temp.append("\r"); - } - } - return temp.toString(); - } + StringBuffer temp = new StringBuffer(); + temp.append(Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 58: " + this.text); + temp.append("\r"); + + if (this.securities != null) { + for (Security sec : this.securities) { + temp.append(sec.toString()); + temp.append("\r"); + } + } + return temp.toString(); + } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Security.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Security.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Security.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Security.java Fri Nov 20 16:54:46 2009 @@ -21,16 +21,19 @@ // @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1") public class Security { - - @KeyValuePairField(tag = 22) // Fund ID type (Sedol, ISIN, ...) + + @KeyValuePairField(tag = 22) + // Fund ID type (Sedol, ISIN, ...) private String idSource; - - @KeyValuePairField(tag = 48) // Fund code + + @KeyValuePairField(tag = 48) + // Fund code private String securityCode; - - @KeyValuePairField(tag = 54) // Movement type ( 1 = Buy, 2 = sell) + + @KeyValuePairField(tag = 54) + // Movement type ( 1 = Buy, 2 = sell) private String side; - + public String getIdSource() { return idSource; } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Trailer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Trailer.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Trailer.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/complex/onetomany/Trailer.java Fri Nov 20 16:54:46 2009 @@ -23,7 +23,6 @@ public class Trailer { @KeyValuePairField(tag = 10) - // CheckSum private int checkSum; @@ -40,4 +39,4 @@ return Trailer.class.getName() + " --> 10: " + this.checkSum; } -} \ No newline at end of file +} Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Header.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Header.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Header.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Header.java Fri Nov 20 16:54:46 2009 @@ -22,22 +22,28 @@ @Link public class Header { - @KeyValuePairField(tag = 8) // Message Header + @KeyValuePairField(tag = 8) + // Message Header private String beginString; - @KeyValuePairField(tag = 9) // Checksum + @KeyValuePairField(tag = 9) + // Checksum private int bodyLength; - - @KeyValuePairField(tag = 34) // Sequence number + + @KeyValuePairField(tag = 34) + // Sequence number private int msgSeqNum; - - @KeyValuePairField(tag = 35) // Message Type + + @KeyValuePairField(tag = 35) + // Message Type private String msgType; - @KeyValuePairField(tag = 49) // Company sender Id + @KeyValuePairField(tag = 49) + // Company sender Id private String sendCompId; - - @KeyValuePairField(tag = 56) // target company id + + @KeyValuePairField(tag = 56) + // target company id private String targetCompId; public String getBeginString() { @@ -87,12 +93,11 @@ public void setTargetCompId(String targetCompId) { this.targetCompId = targetCompId; } - + @Override public String toString() { - return Header.class.getName() - + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum - + " , 35: " + this.msgType + ", 49: " + this.sendCompId + ", 56: " + this.targetCompId; + return Header.class.getName() + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum + " , 35: " + this.msgType + ", 49: " + + this.sendCompId + ", 56: " + this.targetCompId; } - + } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Order.java Fri Nov 20 16:54:46 2009 @@ -23,110 +23,106 @@ @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1") public class Order { - @Link - Header header; + @Link + Header header; - @Link - Trailer trailer; + @Link + Trailer trailer; + + @KeyValuePairField(tag = 1) + // Client reference + private String account; + + @KeyValuePairField(tag = 11) + // Order reference + private String clOrdId; + + @KeyValuePairField(tag = 22) + // Fund ID type (Sedol, ISIN, ...) + private String iDSource; + + @KeyValuePairField(tag = 48) + // Fund code + private String securityId; + + @KeyValuePairField(tag = 54) + // Movement type ( 1 = Buy, 2 = sell) + private String side; + + @KeyValuePairField(tag = 58) + // Free text + private String text; + + public Header getHeader() { + return header; + } + + public void setHeader(Header header) { + this.header = header; + } + + public Trailer getTrailer() { + return trailer; + } + + public void setTrailer(Trailer trailer) { + this.trailer = trailer; + } + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getClOrdId() { + return clOrdId; + } + + public void setClOrdId(String clOrdId) { + this.clOrdId = clOrdId; + } + + public String getIDSource() { + return iDSource; + } + + public void setIDSource(String source) { + this.iDSource = source; + } + + public String getSecurityId() { + return securityId; + } + + public void setSecurityId(String securityId) { + this.securityId = securityId; + } + + public String getSide() { + return side; + } + + public void setSide(String side) { + this.side = side; + } + + public String getText() { + return this.text; + } + + public void setText(String text) { + this.text = text; + } - @KeyValuePairField(tag = 1) - // Client reference - private String account; - - @KeyValuePairField(tag = 11) - // Order reference - private String clOrdId; - - @KeyValuePairField(tag = 22) - // Fund ID type (Sedol, ISIN, ...) - private String iDSource; - - @KeyValuePairField(tag = 48) - // Fund code - private String securityId; - - @KeyValuePairField(tag = 54) - // Movement type ( 1 = Buy, 2 = sell) - private String side; - - @KeyValuePairField(tag = 58) - // Free text - private String text; - - public Header getHeader() { - return header; - } - - public void setHeader(Header header) { - this.header = header; - } - - public Trailer getTrailer() { - return trailer; - } - - public void setTrailer(Trailer trailer) { - this.trailer = trailer; - } - - public String getAccount() { - return account; - } - - public void setAccount(String account) { - this.account = account; - } - - public String getClOrdId() { - return clOrdId; - } - - public void setClOrdId(String clOrdId) { - this.clOrdId = clOrdId; - } - - public String getIDSource() { - return iDSource; - } - - public void setIDSource(String source) { - this.iDSource = source; - } - - public String getSecurityId() { - return securityId; - } - - public void setSecurityId(String securityId) { - this.securityId = securityId; - } - - public String getSide() { - return side; - } - - public void setSide(String side) { - this.side = side; - } - - public String getText() { - return this.text; - } - - public void setText(String text) { - this.text = text; - } - @Override public String toString() { - return Order.class.getName() + " --> 1: " + this.account - + ", 11: " + this.clOrdId - + ", 22: " + this.iDSource - + ", 48: " + this.securityId - + ", 54: " + this.side - + ", 58: " + this.text; + return Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 22: " + this.iDSource + ", 48: " + this.securityId + ", 54: " + this.side + + ", 58: " + this.text; - } + } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Trailer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Trailer.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Trailer.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/simple/Trailer.java Fri Nov 20 16:54:46 2009 @@ -20,7 +20,7 @@ import org.apache.camel.dataformat.bindy.annotation.Link; @Link -public class Trailer{ +public class Trailer { @KeyValuePairField(tag = 10) // CheckSum @@ -33,10 +33,10 @@ public void setCheckSum(int checkSum) { this.checkSum = checkSum; } - + @Override public String toString() { return Trailer.class.getName() + " --> 10: " + this.checkSum; } -} \ No newline at end of file +} Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/body/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/body/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/body/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/body/Order.java Fri Nov 20 16:54:46 2009 @@ -26,27 +26,35 @@ @Section(number = 2) @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1", isOrdered = true) public class Order { - - @Link Header header; - - @Link Trailer trailer; - @KeyValuePairField(tag = 1, position = 1) // Client reference + @Link + Header header; + + @Link + Trailer trailer; + + @KeyValuePairField(tag = 1, position = 1) + // Client reference private String account; - @KeyValuePairField(tag = 11, position = 3) // Order reference + @KeyValuePairField(tag = 11, position = 3) + // Order reference private String clOrdId; - - @KeyValuePairField(tag = 22, position = 2) // Fund ID type (Sedol, ISIN, ...) + + @KeyValuePairField(tag = 22, position = 2) + // Fund ID type (Sedol, ISIN, ...) private String iDSource; - - @KeyValuePairField(tag = 48, position = 4) // Fund code + + @KeyValuePairField(tag = 48, position = 4) + // Fund code private String securityId; - - @KeyValuePairField(tag = 54, position = 5) // Movement type ( 1 = Buy, 2 = sell) + + @KeyValuePairField(tag = 54, position = 5) + // Movement type ( 1 = Buy, 2 = sell) private String side; - - @KeyValuePairField(tag = 58, position = 6) // Free text + + @KeyValuePairField(tag = 58, position = 6) + // Free text private String text; public Header getHeader() { @@ -64,7 +72,7 @@ public void setTrailer(Trailer trailer) { this.trailer = trailer; } - + public String getAccount() { return account; } @@ -112,17 +120,13 @@ public void setText(String text) { this.text = text; } - + @Override public String toString() { - return Order.class.getName() + " --> 1: " + this.account - + ", 11: " + this.clOrdId - + ", 22: " + this.iDSource - + ", 48: " + this.securityId - + ", 54: " + this.side - + ", 58: " + this.text; + return Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 22: " + this.iDSource + ", 48: " + this.securityId + ", 54: " + this.side + + ", 58: " + this.text; + + } - } - } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/header/Header.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/header/Header.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/header/Header.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/header/Header.java Fri Nov 20 16:54:46 2009 @@ -24,22 +24,28 @@ @Section(number = 1) public class Header { - @KeyValuePairField(tag = 8, position = 1) // Message Header + @KeyValuePairField(tag = 8, position = 1) + // Message Header private String beginString; - @KeyValuePairField(tag = 9, position = 2) // Checksum + @KeyValuePairField(tag = 9, position = 2) + // Checksum private int bodyLength; - - @KeyValuePairField(tag = 34, position = 4) // Sequence number + + @KeyValuePairField(tag = 34, position = 4) + // Sequence number private int msgSeqNum; - - @KeyValuePairField(tag = 35, position = 3) // Message Type + + @KeyValuePairField(tag = 35, position = 3) + // Message Type private String msgType; - @KeyValuePairField(tag = 49, position = 5) // Company sender Id + @KeyValuePairField(tag = 49, position = 5) + // Company sender Id private String sendCompId; - - @KeyValuePairField(tag = 56, position = 6) // target company id + + @KeyValuePairField(tag = 56, position = 6) + // target company id private String targetCompId; public String getBeginString() { @@ -89,12 +95,11 @@ public void setTargetCompId(String targetCompId) { this.targetCompId = targetCompId; } - + @Override public String toString() { - return Header.class.getName() - + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum - + " , 35: " + this.msgType + ", 49: " + this.sendCompId + ", 56: " + this.targetCompId; + return Header.class.getName() + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum + " , 35: " + this.msgType + ", 49: " + + this.sendCompId + ", 56: " + this.targetCompId; } - + } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/trailer/Trailer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/trailer/Trailer.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/trailer/Trailer.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/sorted/trailer/Trailer.java Fri Nov 20 16:54:46 2009 @@ -35,10 +35,10 @@ public void setCheckSum(int checkSum) { this.checkSum = checkSum; } - + @Override public String toString() { return Trailer.class.getName() + " --> 10: " + this.checkSum; } -} \ No newline at end of file +} Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Header.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Header.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Header.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Header.java Fri Nov 20 16:54:46 2009 @@ -22,22 +22,28 @@ @Link public class Header { - @KeyValuePairField(tag = 8) // Message Header + @KeyValuePairField(tag = 8) + // Message Header private String beginString; - @KeyValuePairField(tag = 9) // Checksum + @KeyValuePairField(tag = 9) + // Checksum private int bodyLength; - - @KeyValuePairField(tag = 34) // Sequence number + + @KeyValuePairField(tag = 34) + // Sequence number private int msgSeqNum; - - @KeyValuePairField(tag = 35) // Message Type + + @KeyValuePairField(tag = 35) + // Message Type private String msgType; - @KeyValuePairField(tag = 49) // Company sender Id + @KeyValuePairField(tag = 49) + // Company sender Id private String sendCompId; - - @KeyValuePairField(tag = 56) // target company id + + @KeyValuePairField(tag = 56) + // target company id private String targetCompId; public String getBeginString() { @@ -87,12 +93,11 @@ public void setTargetCompId(String targetCompId) { this.targetCompId = targetCompId; } - + @Override public String toString() { - return Header.class.getName() - + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum - + " , 35: " + this.msgType + ", 49: " + this.sendCompId + ", 56: " + this.targetCompId; + return Header.class.getName() + " --> 8: " + this.beginString + ", 9: " + this.bodyLength + ", 34: " + this.msgSeqNum + " , 35: " + this.msgType + ", 49: " + + this.sendCompId + ", 56: " + this.targetCompId; } - + } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Order.java Fri Nov 20 16:54:46 2009 @@ -22,27 +22,35 @@ @Message(keyValuePairSeparator = "=", pairSeparator = "\\u0009", type = "FIX", version = "4.1") public class Order { - - @Link Header header; - - @Link Trailer trailer; - @KeyValuePairField(tag = 1) // Client reference + @Link + Header header; + + @Link + Trailer trailer; + + @KeyValuePairField(tag = 1) + // Client reference private String account; - @KeyValuePairField(tag = 11) // Order reference + @KeyValuePairField(tag = 11) + // Order reference private String clOrdId; - - @KeyValuePairField(tag = 22) // Fund ID type (Sedol, ISIN, ...) + + @KeyValuePairField(tag = 22) + // Fund ID type (Sedol, ISIN, ...) private String iDSource; - - @KeyValuePairField(tag = 48) // Fund code + + @KeyValuePairField(tag = 48) + // Fund code private String securityId; - - @KeyValuePairField(tag = 54) // Movement type ( 1 = Buy, 2 = sell) + + @KeyValuePairField(tag = 54) + // Movement type ( 1 = Buy, 2 = sell) private String side; - - @KeyValuePairField(tag = 58) // Free text + + @KeyValuePairField(tag = 58) + // Free text private String text; public Header getHeader() { @@ -60,7 +68,7 @@ public void setTrailer(Trailer trailer) { this.trailer = trailer; } - + public String getAccount() { return account; } @@ -108,17 +116,13 @@ public void setText(String text) { this.text = text; } - + @Override public String toString() { - return Order.class.getName() + " --> 1: " + this.account - + ", 11: " + this.clOrdId - + ", 22: " + this.iDSource - + ", 48: " + this.securityId - + ", 54: " + this.side - + ", 58: " + this.text; + return Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 22: " + this.iDSource + ", 48: " + this.securityId + ", 54: " + this.side + + ", 58: " + this.text; + + } - } - } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Trailer.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Trailer.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Trailer.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/tab/Trailer.java Fri Nov 20 16:54:46 2009 @@ -23,7 +23,6 @@ public class Trailer { @KeyValuePairField(tag = 10) - // CheckSum private int checkSum; @@ -34,10 +33,10 @@ public void setCheckSum(int checkSum) { this.checkSum = checkSum; } - + @Override public String toString() { return Trailer.class.getName() + " --> 10: " + this.checkSum; } -} \ No newline at end of file +} Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java Fri Nov 20 16:54:46 2009 @@ -148,9 +148,8 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + this.instrumentNumber - + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " - + this.firstName + ", " + this.lastName + ", " + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", " + + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassandskipfirstline/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassandskipfirstline/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassandskipfirstline/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassandskipfirstline/Order.java Fri Nov 20 16:54:46 2009 @@ -148,9 +148,8 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + this.instrumentNumber - + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " - + this.firstName + ", " + this.lastName + ", " + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", " + + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassdifferentposition/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassdifferentposition/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassdifferentposition/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassdifferentposition/Order.java Fri Nov 20 16:54:46 2009 @@ -152,9 +152,8 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + this.instrumentNumber - + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " - + this.firstName + ", " + this.lastName + ", " + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", " + + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassgenerateheader/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassgenerateheader/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassgenerateheader/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassgenerateheader/Order.java Fri Nov 20 16:54:46 2009 @@ -148,9 +148,8 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + this.instrumentNumber - + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " - + this.firstName + ", " + this.lastName + ", " + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", " + + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmandatory/Order.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmandatory/Order.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmandatory/Order.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassmandatory/Order.java Fri Nov 20 16:54:46 2009 @@ -148,9 +148,8 @@ @Override public String toString() { - return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " - + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + this.instrumentNumber - + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " - + this.firstName + ", " + this.lastName + ", " + String.valueOf(this.orderDate); + return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", " + + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", " + + String.valueOf(this.orderDate); } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Author.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Author.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Author.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Author.java Fri Nov 20 16:54:46 2009 @@ -22,51 +22,51 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.OneToMany; -...@csvrecord(separator=",") +...@csvrecord(separator = ",") public class Author { - - @DataField(pos = 1) - private String firstName; - - @DataField(pos = 2) - private String lastName; - - @OneToMany - private List<Book> books; - - @DataField(pos = 5) - private String Age; - - public String getAge() { - return Age; - } - - public void setAge(String age) { - Age = age; - } - - public List<Book> getBooks() { - return books; - } - - public void setBooks(List<Book> books) { - this.books = books; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } + + @DataField(pos = 1) + private String firstName; + + @DataField(pos = 2) + private String lastName; + + @OneToMany + private List<Book> books; + + @DataField(pos = 5) + private String age; + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public List<Book> getBooks() { + return books; + } + + public void setBooks(List<Book> books) { + this.books = books; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Book.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Book.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Book.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/onetomany/Book.java Fri Nov 20 16:54:46 2009 @@ -20,23 +20,26 @@ public class Book { - @DataField(pos = 3) - private String title; - - @DataField(pos = 4) - private String year; - - public String getTitle() { - return title; - } - public void setTitle(String title) { - this.title = title; - } - public String getYear() { - return year; - } - public void setYear(String year) { - this.year = year; - } - + @DataField(pos = 3) + private String title; + + @DataField(pos = 4) + private String year; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getYear() { + return year; + } + + public void setYear(String year) { + this.year = year; + } + } Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java?rev=882639&r1=882638&r2=882639&view=diff ============================================================================== --- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java (original) +++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/util/AnnotationModuleLoaderTest.java Fri Nov 20 16:54:46 2009 @@ -26,8 +26,8 @@ import org.junit.Test; public class AnnotationModuleLoaderTest extends Assert { - - @Test + + @Test public void testLoadModels() throws Exception { AnnotationModelLoader loader = new AnnotationModelLoader(new DefaultPackageScanClassResolver()); Set<Class<?>> classes = loader.loadModels("org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink"); @@ -37,5 +37,5 @@ assertTrue(classes.contains(Order.class)); assertTrue(classes.contains(Security.class)); } - + }
