CAMEL-7716 Fixed the CS error of camel-cvs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/343559bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/343559bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/343559bc Branch: refs/heads/master Commit: 343559bcfe6e4817783a34e24225a973cf843704 Parents: 3e32341 Author: Willem Jiang <[email protected]> Authored: Thu Nov 27 17:45:00 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Thu Nov 27 17:45:00 2014 +0800 ---------------------------------------------------------------------- .../camel/model/dataformat/CsvDataFormat.java | 2 +- .../camel/dataformat/csv/CsvMarshaller.java | 28 ++++++++--------- .../camel/dataformat/csv/CsvUnmarshaller.java | 17 +++++------ .../camel/dataformat/csv/CsvUnmarshalTest.java | 32 ++++++++++---------- .../apache/camel/dataformat/csv/TestUtils.java | 8 +++-- 5 files changed, 44 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/343559bc/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index 01613df..2cc0fd4 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -16,12 +16,12 @@ */ package org.apache.camel.model.dataformat; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.model.DataFormatDefinition; http://git-wip-us.apache.org/repos/asf/camel/blob/343559bc/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java index d845128..df36219 100644 --- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java +++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java @@ -36,6 +36,12 @@ import org.apache.commons.csv.CSVPrinter; * This class marshal data into a CSV format. */ abstract class CsvMarshaller { + private final CSVFormat format; + + private CsvMarshaller(CSVFormat format) { + this.format = format; + } + /** * Creates a new instance. * @@ -54,13 +60,7 @@ abstract class CsvMarshaller { return new FixedColumnsMarshaller(format, fixedColumns); } return new DynamicColumnsMarshaller(format); - } - - private final CSVFormat format; - - private CsvMarshaller(CSVFormat format) { - this.format = format; - } + } /** * Marshals the given object into the given stream. @@ -73,7 +73,7 @@ abstract class CsvMarshaller { */ public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws NoTypeConversionAvailableException, IOException { try (CSVPrinter printer = new CSVPrinter(new OutputStreamWriter(outputStream), format)) { - List list = ExchangeHelper.convertToType(exchange, List.class, object); + List<?> list = ExchangeHelper.convertToType(exchange, List.class, object); if (list != null) { for (Object child : list) { printer.printRecord(getRecordValues(exchange, child)); @@ -85,7 +85,7 @@ abstract class CsvMarshaller { } private Iterable<?> getRecordValues(Exchange exchange, Object data) throws NoTypeConversionAvailableException { - Map map = ExchangeHelper.convertToType(exchange, Map.class, data); + Map<?, ?> map = ExchangeHelper.convertToType(exchange, Map.class, data); if (map != null) { return getMapRecordValues(map); } @@ -98,14 +98,14 @@ abstract class CsvMarshaller { * @param map Input map * @return CSV record values of the given map */ - protected abstract Iterable<?> getMapRecordValues(Map map); + protected abstract Iterable<?> getMapRecordValues(Map<?, ?> map); //region Implementations /** * This marshaller has fixed columns */ - private static class FixedColumnsMarshaller extends CsvMarshaller { + private static final class FixedColumnsMarshaller extends CsvMarshaller { private final String[] fixedColumns; private FixedColumnsMarshaller(CSVFormat format, String[] fixedColumns) { @@ -114,7 +114,7 @@ abstract class CsvMarshaller { } @Override - protected Iterable<?> getMapRecordValues(Map map) { + protected Iterable<?> getMapRecordValues(Map<?, ?> map) { List<Object> result = new ArrayList<>(fixedColumns.length); for (String key : fixedColumns) { result.add(map.get(key)); @@ -126,7 +126,7 @@ abstract class CsvMarshaller { /** * This marshaller adapts the columns but always keep them in the same order */ - private static class DynamicColumnsMarshaller extends CsvMarshaller { + private static final class DynamicColumnsMarshaller extends CsvMarshaller { private final LinkedHashSet<Object> columns = new LinkedHashSet<>(); private DynamicColumnsMarshaller(CSVFormat format) { @@ -134,7 +134,7 @@ abstract class CsvMarshaller { } @Override - protected Iterable<?> getMapRecordValues(Map map) { + protected Iterable<?> getMapRecordValues(Map<?, ?> map) { columns.addAll(map.keySet()); List<Object> result = new ArrayList<>(columns.size()); for (Object key : columns) { http://git-wip-us.apache.org/repos/asf/camel/blob/343559bc/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java index cfbd324..13744b2 100644 --- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java +++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvUnmarshaller.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.camel.Exchange; import org.apache.camel.util.IOHelper; - import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; @@ -35,6 +34,14 @@ import org.apache.commons.csv.CSVRecord; * This class unmarshal CSV into lists or maps depending on the configuration. */ abstract class CsvUnmarshaller { + protected final CSVFormat format; + protected final CsvRecordConverter<?> converter; + + private CsvUnmarshaller(CSVFormat format, CsvDataFormat dataFormat) { + this.format = format; + this.converter = extractConverter(dataFormat); + } + public static CsvUnmarshaller create(CSVFormat format, CsvDataFormat dataFormat) { // If we want to use maps, thus the header must be either fixed or automatic if (dataFormat.isUseMaps() && format.getHeader() == null) { @@ -51,14 +58,6 @@ abstract class CsvUnmarshaller { return new BulkCsvUnmarshaller(format, dataFormat); } - protected final CSVFormat format; - protected final CsvRecordConverter<?> converter; - - private CsvUnmarshaller(CSVFormat format, CsvDataFormat dataFormat) { - this.format = format; - this.converter = extractConverter(dataFormat); - } - /** * Unmarshal the CSV * http://git-wip-us.apache.org/repos/asf/camel/blob/343559bc/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java index ed708ba..e476f92 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.dataformat.csv; +import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -26,7 +27,6 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; -import static java.util.Arrays.asList; import static org.apache.camel.dataformat.csv.TestUtils.asMap; /** @@ -45,11 +45,11 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:default", CSV_SAMPLE); output.assertIsSatisfied(); - List body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); + List<?> body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); assertEquals(3, body.size()); - assertEquals(asList("A", "B", "C"), body.get(0)); - assertEquals(asList("1", "2", "3"), body.get(1)); - assertEquals(asList("one", "two", "three"), body.get(2)); + assertEquals(Arrays.asList("A", "B", "C"), body.get(0)); + assertEquals(Arrays.asList("1", "2", "3"), body.get(1)); + assertEquals(Arrays.asList("one", "two", "three"), body.get(2)); } @Test @@ -59,10 +59,10 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:delimiter", CSV_SAMPLE.replace(',', '_')); output.assertIsSatisfied(); - List body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); - assertEquals(asList("A", "B", "C"), body.get(0)); - assertEquals(asList("1", "2", "3"), body.get(1)); - assertEquals(asList("one", "two", "three"), body.get(2)); + List<?> body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); + assertEquals(Arrays.asList("A", "B", "C"), body.get(0)); + assertEquals(Arrays.asList("1", "2", "3"), body.get(1)); + assertEquals(Arrays.asList("one", "two", "three"), body.get(2)); } @Test @@ -72,10 +72,10 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:lazy", CSV_SAMPLE); output.assertIsSatisfied(); - Iterator body = assertIsInstanceOf(Iterator.class, output.getExchanges().get(0).getIn().getBody()); - assertEquals(asList("A", "B", "C"), body.next()); - assertEquals(asList("1", "2", "3"), body.next()); - assertEquals(asList("one", "two", "three"), body.next()); + Iterator<?> body = assertIsInstanceOf(Iterator.class, output.getExchanges().get(0).getIn().getBody()); + assertEquals(Arrays.asList("A", "B", "C"), body.next()); + assertEquals(Arrays.asList("1", "2", "3"), body.next()); + assertEquals(Arrays.asList("one", "two", "three"), body.next()); assertFalse(body.hasNext()); } @@ -86,7 +86,7 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:map", CSV_SAMPLE); output.assertIsSatisfied(); - List body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); + List<?> body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); assertEquals(2, body.size()); assertEquals(asMap("A", "1", "B", "2", "C", "3"), body.get(0)); assertEquals(asMap("A", "one", "B", "two", "C", "three"), body.get(1)); @@ -99,7 +99,7 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:lazy_map", CSV_SAMPLE); output.assertIsSatisfied(); - Iterator body = assertIsInstanceOf(Iterator.class, output.getExchanges().get(0).getIn().getBody()); + Iterator<?> body = assertIsInstanceOf(Iterator.class, output.getExchanges().get(0).getIn().getBody()); assertEquals(asMap("A", "1", "B", "2", "C", "3"), body.next()); assertEquals(asMap("A", "one", "B", "two", "C", "three"), body.next()); assertFalse(body.hasNext()); @@ -112,7 +112,7 @@ public class CsvUnmarshalTest extends CamelTestSupport { template.sendBody("direct:map_headers", CSV_SAMPLE); output.assertIsSatisfied(); - List body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); + List<?> body = assertIsInstanceOf(List.class, output.getExchanges().get(0).getIn().getBody()); assertEquals(2, body.size()); assertEquals(asMap("AA", "1", "BB", "2", "CC", "3"), body.get(0)); assertEquals(asMap("AA", "one", "BB", "two", "CC", "three"), body.get(1)); http://git-wip-us.apache.org/repos/asf/camel/blob/343559bc/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java index 90412a6..48dfd12 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java @@ -23,6 +23,11 @@ import java.util.Map; * This class provides utility methods */ final class TestUtils { + + private TestUtils() { + // Prevent instantiation + } + /** * Create a map with the given key/value pairs * @@ -41,7 +46,4 @@ final class TestUtils { return map; } - private TestUtils() { - // Prevent instantiation - } }
