This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-2.20.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit e7f3841894ab656a87407b57b02a42096ddb8225 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Nov 15 11:24:37 2017 +0100 CAMEL-129009: Fixed CS. This closes #2092 --- .../csv/BindyMarshalOneToManyWithHeadersTest.java | 31 ++++++++++++++++------ .../bindy/model/simple/linkonetomany/Order.java | 20 ++++++++++++-- .../model/simple/linkonetomany/OrderItem.java | 16 +++++++++++ 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java index 5e360a4..4d79088 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java @@ -1,5 +1,24 @@ +/** + * 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.dataformat.bindy.csv; +import java.util.Arrays; +import java.util.List; + import org.apache.camel.EndpointInject; import org.apache.camel.LoggingLevel; import org.apache.camel.Produce; @@ -14,9 +33,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import java.util.Arrays; -import java.util.List; - @ContextConfiguration public class BindyMarshalOneToManyWithHeadersTest extends AbstractJUnit4SpringContextTests { @@ -36,10 +52,9 @@ public class BindyMarshalOneToManyWithHeadersTest extends AbstractJUnit4SpringCo @Test @DirtiesContext public void testMarshallMessage() throws Exception { - - expected = "orderNumber,customerName,sku,quantity,unitPrice\r\n" + - "11111,Joe Blow,abc,1,3\r\n" + - "11111,Joe Blow,cde,3,2\r\n"; + expected = "orderNumber,customerName,sku,quantity,unitPrice\r\n" + + "11111,Joe Blow,abc,1,3\r\n" + + "11111,Joe Blow,cde,3,2\r\n"; result.expectedBodiesReceived(expected); @@ -75,7 +90,7 @@ public class BindyMarshalOneToManyWithHeadersTest extends AbstractJUnit4SpringCo public void configure() { Tracer tracer = new Tracer(); - tracer.setLogLevel(LoggingLevel.ERROR); + tracer.setLogLevel(LoggingLevel.INFO); tracer.setLogName("org.apache.camel.bindy"); getContext().addInterceptStrategy(tracer); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/Order.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/Order.java index c08ea09..d3bf9c7 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/Order.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/Order.java @@ -1,11 +1,27 @@ +/** + * 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.dataformat.bindy.model.simple.linkonetomany; +import java.util.List; + import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; import org.apache.camel.dataformat.bindy.annotation.OneToMany; -import java.util.List; - @CsvRecord(separator = ",", generateHeaderColumns = true) public class Order { diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/OrderItem.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/OrderItem.java index e6d0b75..cb0fa14 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/OrderItem.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/linkonetomany/OrderItem.java @@ -1,3 +1,19 @@ +/** + * 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.dataformat.bindy.model.simple.linkonetomany; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" <commits@camel.apache.org>.