CAMEL-6969: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f4e8992f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f4e8992f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f4e8992f Branch: refs/heads/master Commit: f4e8992f37d4a304582d9d499ae64b099a945ad6 Parents: 1ea2dbb Author: Claus Ibsen <[email protected]> Authored: Thu Jan 9 10:02:47 2014 +0100 Committer: Claus Ibsen <[email protected]> Committed: Thu Jan 9 10:02:47 2014 +0100 ---------------------------------------------------------------------- .../apache/camel/dataformat/csv/CsvLineConverter.java | 3 ++- .../apache/camel/dataformat/csv/CsvLineConverters.java | 11 ++++++----- .../org/apache/camel/dataformat/csv/CsvIteratorTest.java | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f4e8992f/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverter.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverter.java index 7f91636..8bc3c67 100644 --- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverter.java +++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverter.java @@ -22,11 +22,12 @@ package org.apache.camel.dataformat.csv; * @param <T> Class for representing a single line */ public interface CsvLineConverter<T> { + /** * Converts a single CSV line. * * @param line CSV line * @return Another representation of the CSV line */ - public T convertLine(String[] line); + T convertLine(String[] line); } http://git-wip-us.apache.org/repos/asf/camel/blob/f4e8992f/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverters.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverters.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverters.java index 1f3ad30..bba71d4 100644 --- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverters.java +++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvLineConverters.java @@ -28,6 +28,10 @@ import java.util.Set; * This {@code CsvLineConverters} class provides common implementations of the {@code CsvLineConverter} interface. */ public final class CsvLineConverters { + + private CsvLineConverters() { + // Prevent instantiation + } /** * Provides an implementation of {@code CsvLineConverter} that converts a line into a {@code List}. * @@ -49,7 +53,7 @@ public final class CsvLineConverters { return new MapLineConverter(headers); } - private static class ListLineConverter implements CsvLineConverter<List<String>> { + private static final class ListLineConverter implements CsvLineConverter<List<String>> { public static final ListLineConverter SINGLETON = new ListLineConverter(); @Override @@ -58,7 +62,7 @@ public final class CsvLineConverters { } } - private static class MapLineConverter implements CsvLineConverter<Map<String, String>> { + private static final class MapLineConverter implements CsvLineConverter<Map<String, String>> { private final String[] headers; private MapLineConverter(String[] headers) { @@ -95,7 +99,4 @@ public final class CsvLineConverters { } } - private CsvLineConverters() { - // Prevent instantiation - } } http://git-wip-us.apache.org/repos/asf/camel/blob/f4e8992f/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java index cd5425a..fedc5a3 100644 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java @@ -21,11 +21,12 @@ import java.io.InputStreamReader; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; + +import mockit.Expectations; +import mockit.Injectable; import org.apache.commons.csv.CSVParser; import org.junit.Assert; import org.junit.Test; -import mockit.Expectations; -import mockit.Injectable; public class CsvIteratorTest {
