Merge pull request #335 from ozlerhakan/4.8.0

v4.8.0

Author: ozlerhakan

README.adoc

@@ -6,7 +6,7 @@
 :branch: 4.7.0
 
 image:https://github.com/ozlerhakan/poiji/actions/workflows/maven.yml/badge.svg["Build Status"] image:https://app.codacy.com/project/badge/Grade/64f7e2cb9e604807b62334a4cfc3952d["Codacy code quality",link="https://www.codacy.com/gh/ozlerhakan/poiji/dashboard?utm_source=github.com&utm_medium=referral&utm_content=ozlerhakan/poiji&utm_campaign=Badge_Grade"]
-image:https://codecov.io/gh/ozlerhakan/poiji/branch/master/graph/badge.svg?token=MN6V6xOWBq["Codecov",link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.4.0-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status",link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]
+image:https://codecov.io/gh/ozlerhakan/poiji/branch/master/graph/badge.svg?token=MN6V6xOWBq["Codecov",link="https://codecov.io/gh/ozlerhakan/poiji"] image:https://img.shields.io/badge/apache.poi-5.4.1-brightgreen.svg[] image:https://app.fossa.com/api/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji.svg?type=shield["FOSSA Status",link="https://app.fossa.com/projects/git%2Bgithub.com%2Fozlerhakan%2Fpoiji?ref=badge_shield"]
 
 Poiji is a tiny thread-safe Java library that provides one way mapping from Excel sheets to Java classes.
 In a way it lets us convert each row of the specified excel data into Java objects.
@@ -608,17 +608,23 @@ You can create your own casting implementation without relying on the default Po
 
 [source,java]
 ----
-public class MyCasting implements Casting {
+import com.poiji.config.DefaultCasting;
+
+public class ModifiedBooleanCasting extends DefaultCasting {
     @Override
-    public Object castValue(Class<?> fieldType, String value, PoijiOptions options) {
-       return value.trim();
+    Boolean booleanValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+        if (!value.equals("y") && !value.equals("n")) {
+            return onError(value, sheetName, row, col, bpe, options.preferNullOverDefault() ? null : false);
+        } else {
+            return value.equals("y");
+        }
     }
 }
 
 public class Person {
 
     @ExcelCell(0)
-    protected String employeeId;
+    protected Boolean employed;
 
     @ExcelCell(1)
     protected String name;
@@ -634,7 +640,7 @@ Then you can add your custom implementation with the `withCasting` method:
 [source,java]
 ----
  PoijiOptions options = PoijiOptions.PoijiOptionsBuilder.settings()
-                .withCasting(new MyCasting())
+                .withCasting(new ModifiedBooleanCasting())
                 .build();
 
 List<Person> people = Poiji.fromExcel(excel, Person.class, options);

pom.xml

@@ -45,7 +45,7 @@
     </issueManagement>
 
     <properties>
-        <apache.poi.version>5.4.0</apache.poi.version>
+        <apache.poi.version>5.4.1</apache.poi.version>
         <junit.version>4.13.2</junit.version>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/com/poiji/config/DefaultCasting.java

@@ -35,7 +35,7 @@ public DefaultCasting(boolean errorLoggingEnabled) {
         this.errorLoggingEnabled = errorLoggingEnabled;
     }
 
-    private <T> T onError(String value, String sheetName, int row, int col, Exception exception, T defaultValue) {
+    protected <T> T onError(String value, String sheetName, int row, int col, Exception exception, T defaultValue) {
         logError(value, defaultValue, sheetName, row, col, exception);
         return defaultValue;
     }
@@ -46,87 +46,87 @@ private void logError(String value, Object defaultValue, String sheetName, int r
         }
     }
 
-    private Boolean primitiveBooleanValue(String value, String sheetName, int row, int col) {
+    protected Boolean primitiveBooleanValue(String value, String sheetName, int row, int col) {
         try {
             return Parsers.booleans().parse(value);
         } catch (BooleanParser.BooleanParseException bpe) {
             return onError(value, sheetName, row, col, bpe, false);
         }
     }
 
-    private Boolean booleanValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Boolean booleanValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.booleans().parse(value);
         } catch (BooleanParser.BooleanParseException bpe) {
             return onError(value, sheetName, row, col, bpe, options.preferNullOverDefault() ? null : false);
         }
     }
 
-    private int primitiveIntegerValue(String value, String sheetName, int row, int col) {
+    protected int primitiveIntegerValue(String value, String sheetName, int row, int col) {
         try {
             return Parsers.integers().parse(value).intValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, 0);
         }
     }
 
-    private Integer integerValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Integer integerValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.integers().parse(value).intValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, options.preferNullOverDefault() ? null : 0);
         }
     }
 
-    private long primitiveLongValue(String value, String sheetName, int row, int col) {
+    protected long primitiveLongValue(String value, String sheetName, int row, int col) {
         try {
             return Parsers.longs().parse(value).longValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, 0L);
         }
     }
 
-    private Long longValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Long longValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.longs().parse(value).longValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, options.preferNullOverDefault() ? null : 0L);
         }
     }
 
-    private double primitiveDoubleValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected double primitiveDoubleValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.numbers(options.getLocale()).parse(value).doubleValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, 0d);
         }
     }
 
-    private Double doubleValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Double doubleValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.numbers(options.getLocale()).parse(value).doubleValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, options.preferNullOverDefault() ? null : 0d);
         }
     }
 
-    private float primitiveFloatValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected float primitiveFloatValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.numbers(options.getLocale()).parse(value).floatValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, 0f);
         }
     }
 
-    private Float floatValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Float floatValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.numbers(options.getLocale()).parse(value).floatValue();
         } catch (NumberFormatException nfe) {
             return onError(value, sheetName, row, col, nfe, options.preferNullOverDefault() ? null : 0f);
         }
     }
 
-    private BigDecimal bigDecimalValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected BigDecimal bigDecimalValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         try {
             return Parsers.bigDecimals(options.getLocale()).parse(value);
         } catch (NumberFormatException | IllegalStateException e) {
@@ -146,7 +146,7 @@ private BigDecimal bigDecimalValue(String value, String sheetName, int row, int
      * date object without any exceptions but since the string was not an exact
      * match you get a very strange date
      */
-    private Date dateValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected Date dateValue(String value, String sheetName, int row, int col, PoijiOptions options) {
 
         if (options.getDateRegex() != null && !value.matches(options.getDateRegex())) {
             return options.preferNullOverDefault() ? null : Calendar.getInstance().getTime();
@@ -174,7 +174,7 @@ private Date dateValue(String value, String sheetName, int row, int col, PoijiOp
      * match you get a very strange date
      * 
      */
-    private LocalDate localDateValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected LocalDate localDateValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         if (options.getDateRegex() != null && !value.matches(options.getDateRegex())) {
             return options.preferNullOverDefault() ? null : LocalDate.now();
         } else {
@@ -186,7 +186,7 @@ private LocalDate localDateValue(String value, String sheetName, int row, int co
         }
     }
 
-    private LocalDateTime localDateTimeValue(String value, String sheetName, int row, int col, PoijiOptions options) {
+    protected LocalDateTime localDateTimeValue(String value, String sheetName, int row, int col, PoijiOptions options) {
         if (options.getDateTimeRegex() != null && !value.matches(options.getDateTimeRegex())) {
             return options.preferNullOverDefault() ? null : LocalDateTime.now();
         } else {
@@ -199,7 +199,7 @@ private LocalDateTime localDateTimeValue(String value, String sheetName, int row
         }
     }
 
-    private Object enumValue(String value, String sheetName, int row, int col, Class<?> type) {
+    protected Object enumValue(String value, String sheetName, int row, int col, Class<?> type) {
         return Arrays.stream(type.getEnumConstants())
                 .filter(o -> ((Enum<?>) o).name().equals(value))
                 .findFirst()
@@ -210,7 +210,7 @@ private Object enumValue(String value, String sheetName, int row, int col, Class
                 });
     }
 
-    private Object castListValue(String value, String sheetName, int row, int col, Field field, PoijiOptions options) {
+    protected Object castListValue(String value, String sheetName, int row, int col, Field field, PoijiOptions options) {
         final ParameterizedType genericType = (ParameterizedType) field.getGenericType();
         final Type fieldType = genericType.getActualTypeArguments()[0];
         String[] valueList = value.split(options.getListDelimiter());

src/main/java/com/poiji/config/DefaultCastingError.java

@@ -13,7 +13,7 @@ public final class DefaultCastingError {
 
     private Exception exception;
 
-    DefaultCastingError(String value, Object defaultValue, String sheetName, int row, int column, Exception exception) {
+    public DefaultCastingError(String value, Object defaultValue, String sheetName, int row, int column, Exception exception) {
         this.value = value;
         this.defaultValue = defaultValue;
         this.sheetName = sheetName;

src/test/java/com/poiji/config/DefaultCastingTest.java

@@ -0,0 +1,26 @@
+package com.poiji.config;
+
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.CoreMatchers.*;
+
+public class DefaultCastingTest {
+
+    @Test
+    public void valueMethodsShouldBeProtectedOrPublic() {
+        Method[] allMethods = DefaultCasting.class.getMethods();
+        for (Method method : allMethods) {
+            if (method.getName().endsWith("Value")) {
+                assertThat(
+                        "Method " + method.getName() + " should be protected or public",
+                        Modifier.isProtected(method.getModifiers()) || Modifier.isPublic(method.getModifiers()),
+                        is(true)
+                );
+            }
+        }
+    }
+}