Merge pull request #12 from 42BV/feature/invalid-columns-fix

Include error when a row has an invalid amount of columns

pom.xml

@@ -45,7 +45,7 @@
         <java.version>17</java.version>
 
         <!-- Dependencies -->
-        <spring.boot.version>3.0.5</spring.boot.version>
+        <spring.boot.version>3.1.5</spring.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>32.1.3-jre</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>
@@ -202,7 +202,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>8.1.2</version>
+                <version>8.4.2</version>
                 <configuration>
                     <failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>
                     <skipProvidedScope>true</skipProvidedScope>

src/main/java/nl/_42/boot/csv/CsvHandler.java

@@ -5,31 +5,36 @@
 
 /**
  * Handler of a specific CSV type.
+ *
  * @param <T> the bean class
  */
 public interface CsvHandler<T> {
 
     /**
      * Retrieve the CSV type name.
+     *
      * @return the type name
      */
     String getType();
 
     /**
      * Retrieve the target bean class.
+     *
      * @return the target bean class
      */
     Class<T> getBeanClass();
 
     /**
      * Process a CSV client, containing the data.
+     *
      * @param client the CSV client
      * @return the CSV result
      */
     CsvResult handle(CsvClient<T> client);
 
     /**
      * Describe this CSV type, can be shown for usage.
+     *
      * @param document the CSV description for this type
      */
     default void describe(CsvDocument document) {

src/main/java/nl/_42/boot/csv/CsvMapper.java

@@ -19,6 +19,7 @@
  * or dynamic based on a prefix or variable tail.
  * <br>
  * Only use this mapper when static mapping is not possible.
+ *
  * @param <T> the target type
  */
 public class CsvMapper<T> implements Function<Row, T> {
@@ -68,6 +69,7 @@ private Builder(Supplier<T> constructor, Header header) {
 
         /**
          * Expected the next column to have a certain name.
+         *
          * @param expected the expected name
          * @param consumer the handler
          * @return this builder
@@ -79,6 +81,7 @@ public Builder<T> add(String expected, BiConsumer<String, T> consumer) {
 
         /**
          * Register consumer when header is present.
+         *
          * @param expected the expected name
          * @param consumer the handler
          * @return this builder
@@ -95,7 +98,7 @@ private void checkHeader(String expected) {
             String name = getName(index);
             if (!Objects.equals(expected, name)) {
                 throw new IllegalArgumentException(
-                    format("Expected header '%s' at index %d but got '%s'", expected, index, name)
+                        format("Expected header '%s' at index %d but got '%s'", expected, index, name)
                 );
             }
         }
@@ -126,15 +129,16 @@ private BiConsumer<String, T> wrap(BiConsumer<String, T> consumer, int index) {
                     consumer.accept(key, value);
                 } catch (RuntimeException rte) {
                     throw new IllegalStateException(
-                        format("Could not map column '%s' at index %d: %s", name, index, rte.getMessage()),
-                        rte
+                            format("Could not map column '%s' at index %d: %s", name, index, rte.getMessage()),
+                            rte
                     );
                 }
             };
         }
 
         /**
          * Register all next columns that start with the prefix, if any.
+         *
          * @param prefix the prefix
          * @param mapper the function producing a handler for each column
          * @return this builder
@@ -151,6 +155,7 @@ public Builder<T> addStartsWith(String prefix, Function<String, BiConsumer<Strin
 
         /**
          * Register all remaining columns, if any.
+         *
          * @param mapper the function producing a handler for each column
          * @return this builder
          */
@@ -164,6 +169,7 @@ public Builder<T> addRemainder(Function<String, BiConsumer<String, T>> mapper) {
 
         /**
          * Use a different formatter for parsing headers and values.
+         *
          * @param formatter the formatter
          * @return this builder
          */

src/main/java/nl/_42/boot/csv/CsvResult.java

@@ -28,7 +28,7 @@ public static CsvResult error(Throwable throwable) {
 
     public CsvResult error(int rowNumber, String message) {
         CsvError error = errors.stream().filter(e -> e.rowNumber == rowNumber)
-                                        .findFirst().orElseGet(() -> addError(rowNumber));
+                .findFirst().orElseGet(() -> addError(rowNumber));
 
         error.addMessage(message);
         return this;

src/main/java/nl/_42/boot/csv/CsvService.java

@@ -37,6 +37,7 @@ public CsvService(CsvProperties properties) {
 
     /**
      * Retrieve all known CSV types and properties.
+     *
      * @return the parameters
      */
     public CsvParameters getParameters() {
@@ -46,6 +47,7 @@ public CsvParameters getParameters() {
 
     /**
      * Retrieve all CSV types.
+     *
      * @return the types
      */
     public Collection<String> getTypes() {
@@ -56,13 +58,14 @@ public Collection<String> getTypes() {
         }
 
         return types.stream()
-                    .filter(handlers::containsKey)
-                    .collect(Collectors.toList());
+                .filter(handlers::containsKey)
+                .collect(Collectors.toList());
     }
 
     /**
      * Process a CSV, based on default properties.
-     * @param is the CSV content
+     *
+     * @param is   the CSV content
      * @param type the CSV type
      * @return the result
      */
@@ -72,8 +75,9 @@ public CsvResult load(InputStream is, String type) {
 
     /**
      * Process a CSV.
-     * @param is the CSV content
-     * @param type the CSV type
+     *
+     * @param is         the CSV content
+     * @param type       the CSV type
      * @param properties the properties
      * @return the result
      */
@@ -84,6 +88,7 @@ public CsvResult load(InputStream is, String type, CsvProperties properties) {
 
     /**
      * Retrieve the documentation of a CSV handler.
+     *
      * @param type the CSV type
      * @return the documentation
      */
@@ -96,6 +101,7 @@ public CsvDocument getDocument(String type) {
 
     /**
      * Validate the CSV handler based on its documentation.
+     *
      * @param type the CSV type
      * @return the result
      */
@@ -150,6 +156,7 @@ private InputStreamReader getReader(InputStream is) throws IOException {
 
     /**
      * Register all known handlers.
+     *
      * @param handlers the handlers, if any
      */
     @Autowired(required = false)

src/main/java/nl/_42/boot/csv/CsvTemplate.java

@@ -32,31 +32,21 @@ public <T, R> CsvResult read(Supplier<T> supplier, Function<T, R> transformer, C
     private <T, R> boolean next(Supplier<T> supplier, Function<T, R> transformer, Consumer<R> consumer, int rowNumber) {
         boolean found = false;
 
-        T row = get(supplier);
-        if (row != null) {
-            try {
+        try {
+            T row = supplier.get();
+            if (row != null) {
                 R value = transformer.apply(row);
                 consumer.accept(value);
                 result.success();
-            } catch (RuntimeException rte) {
-                log.error("Could not handle CSV row " + rowNumber, rte);
-                result.error(rowNumber, rte.getMessage());
-            } finally {
                 found = true;
             }
+        } catch (RuntimeException rte) {
+            log.error("Could not handle CSV row " + rowNumber, rte);
+            result.error(rowNumber, rte.getMessage());
+            found = true;
         }
 
         return found;
     }
 
-    private <T> T get(Supplier<T> supplier) {
-        T row = null;
-        try {
-            row = supplier.get();
-        } catch (RuntimeException npe) {
-            log.error("Could not handle CSV", npe);
-        }
-        return row;
-    }
-
 }

src/main/java/nl/_42/boot/csv/bootstrap/CsvLoader.java

@@ -26,7 +26,6 @@ public class CsvLoader {
      * Load all CSV files inside a classpath location. During execution
      * the loader will scan for files matching the defined CSV types, e.g.
      * 'PERSON' expects a 'person.csv'.
-     *
      * Whenever a matching file is found it is loaded automatically.
      *
      * @param location the base directory on the classpath