Issue millij#27 Fix

Writer creates columns for methods that are not annotated with @SheetColumn
pbacz · Mar 31, 2020 · 8634989 · 8634989
1 parent 2a1bbaf
commit 8634989
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/src/main/java/io/github/millij/poi/util/Spreadsheet.java b/src/main/java/io/github/millij/poi/util/Spreadsheet.java
@@ -43,7 +43,6 @@ public static String getCellColumnReference(String cellRef) {
     }
 
 
-
     // Bean :: Property Utils
 
     public static Map<String, String> getPropertyToColumnNameMap(Class<?> beanType) {
@@ -59,25 +58,25 @@ public static Map<String, String> getPropertyToColumnNameMap(Class<?> beanType)
         Field[] fields = beanType.getDeclaredFields();
         for (Field f : fields) {
             String fieldName = f.getName();
-            mapping.put(fieldName, fieldName);
-
             SheetColumn ec = f.getAnnotation(SheetColumn.class);
-            if (ec != null && StringUtils.isNotEmpty(ec.value())) {
-                mapping.put(fieldName, ec.value());
+            if (ec != null) {
+                String value = StringUtils.isNotEmpty(ec.value())
+                        ? ec.value()
+                        : fieldName;
+                mapping.put(fieldName, value);
             }
         }
 
         // Methods
         Method[] methods = beanType.getDeclaredMethods();
         for (Method m : methods) {
             String fieldName = Beans.getFieldName(m);
-            if (!mapping.containsKey(fieldName)) {
-                mapping.put(fieldName, fieldName);
-            }
-
             SheetColumn ec = m.getAnnotation(SheetColumn.class);
-            if (ec != null && StringUtils.isNotEmpty(ec.value())) {
-                mapping.put(fieldName, ec.value());
+            if (ec != null && !mapping.containsKey(fieldName)) {
+                String value = StringUtils.isNotEmpty(ec.value())
+                        ? ec.value()
+                        : fieldName;
+                mapping.put(fieldName, value);
             }
         }