Merge pull request #112 from mygreen/topic/fix_notwork_save

@XlsColumn  などのアノテーションをメソッドにを付与しているとき処理対象外となる事象を修正

src/main/java/com/gh/mygreen/xlsmapper/fieldaccessor/FieldAccessor.java

@@ -165,6 +165,9 @@ public boolean equals(final Object obj) {
 
     /**
      * 読み込み可能かどうか判定します。
+     * フィールドの値を参照可能かどうか判定します。
+     * <p>シートを読み込み時にセルの値をBeanに設定可能かの判定に使用します。</p>
+     *
      * @return フィールドまたはgetterメソッドが存在する場合にtrueを返します。
      */
     public boolean isReadable() {
@@ -175,6 +178,8 @@ public boolean isReadable() {
 
     /**
      * 書き込み可能かどうか判定します。
+     * <p>シートを書き込み時にBeanの値をセルに設定可能かの判定に使用します。</p>
+     *
      * @return フィールドまたはsetterメソッドが存在する場合にtrueを返します。
      */
     public boolean isWritable() {

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/RecordsProcessorUtil.java

@@ -223,7 +223,7 @@ private static void checkLoadingNestedRecordClass(final Class<?> recordClass, fi
 
         final List<FieldAccessor> nestedProperties = FieldAccessorUtils.getPropertiesWithAnnotation(recordClass, reader, XlsNestedRecords.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : nestedProperties) {
@@ -306,7 +306,7 @@ private static void checkSavingNestedRecordClass(final Class<?> recordClass, fin
 
         final List<FieldAccessor> nestedProperties = FieldAccessorUtils.getPropertiesWithAnnotation(recordClass, reader, XlsNestedRecords.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : nestedProperties) {

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/ArrayCellsProcessor.java

@@ -34,6 +34,11 @@ public class ArrayCellsProcessor extends AbstractFieldProcessor<XlsArrayCells> {
     public void loadProcess(final Sheet sheet, final Object beansObj, final  XlsArrayCells anno, final FieldAccessor accessor,
             final Configuration config, final LoadingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -153,6 +158,15 @@ public void saveProcess(final Sheet sheet, final Object beansObj, final XlsArray
             final FieldAccessor accessor, final Configuration config, final SavingWorkObject work)
             throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
+        if(!Utils.isSaveCase(anno.cases())) {
+            return;
+        }
+
         final Class<?> clazz = accessor.getType();
         final Object result = accessor.getValue(beansObj);
         if(Collection.class.isAssignableFrom(clazz)) {

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/CellProcessor.java

@@ -33,6 +33,11 @@ public class CellProcessor extends AbstractFieldProcessor<XlsCell> {
     public void loadProcess(final Sheet sheet, final Object beansObj, final XlsCell anno, final FieldAccessor accessor,
             final Configuration config, final LoadingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -115,6 +120,11 @@ private CellPosition getCellPosition(final FieldAccessor accessor, final XlsCell
     public void saveProcess(final Sheet sheet, final Object targetObj, final XlsCell anno, final FieldAccessor accessor,
             final Configuration config, final SavingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isSaveCase(anno.cases())) {
             return;
         }

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/CommentProcessor.java

@@ -31,6 +31,11 @@ public class CommentProcessor extends AbstractFieldProcessor<XlsComment> {
     public void loadProcess(final Sheet sheet, final Object beansObj, final XlsComment anno, final FieldAccessor accessor,
             final Configuration config, final LoadingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -118,6 +123,11 @@ private CellPosition getCellPosition(final FieldAccessor accessor, final XlsComm
     public void saveProcess(final Sheet sheet, final Object targetObj, final XlsComment anno, final FieldAccessor accessor,
             final Configuration config, final SavingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isSaveCase(anno.cases())) {
             return;
         }

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/HorizontalRecordsProcessor.java

@@ -89,6 +89,11 @@ public class HorizontalRecordsProcessor extends AbstractFieldProcessor<XlsHorizo
     public void loadProcess(final Sheet sheet, final Object beansObj, final XlsHorizontalRecords anno, final FieldAccessor accessor,
             final Configuration config, final LoadingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -316,7 +321,7 @@ private List<?> loadRecords(final Sheet sheet, final List<RecordHeader> headers,
                     return FieldAccessorUtils.getColumnPropertiesByName(
                             record.getClass(), work.getAnnoReader(), config, key)
                             .stream()
-                            .filter(p -> p.isReadable())
+                            .filter(p -> p.isWritable())
                             .collect(Collectors.toList());
                 });
 
@@ -525,7 +530,7 @@ private int getStartHeaderIndexForLoading(final List<RecordHeader> headers, Clas
             final List<FieldAccessor> propeties = FieldAccessorUtils.getColumnPropertiesByName(
                     recordClass, annoReader, config, headerInfo.getLabel())
                     .stream()
-                    .filter(p -> p.isReadable())
+                    .filter(p -> p.isWritable())
                     .collect(Collectors.toList());
 
             if(!propeties.isEmpty()) {
@@ -543,7 +548,7 @@ private void loadMapColumns(final Sheet sheet, final List<RecordHeader> headers,
         final List<FieldAccessor> mapProperties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 recordClass, work.getAnnoReader(), XlsMapColumns.class)
                 .stream()
-                .filter(f -> f.isReadable())
+                .filter(f -> f.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : mapProperties) {
@@ -621,7 +626,10 @@ private void loadArrayColumns(final Sheet sheet, final List<RecordHeader> header
 
             // アノテーション「@XlsArrayColumns」の属性「columnName」と一致するプロパティを取得する。
             final List<FieldAccessor> arrayProperties = FieldAccessorUtils.getArrayColumnsPropertiesByName(
-                    recordClass, work.getAnnoReader(), config, headerInfo.getLabel());
+                    recordClass, work.getAnnoReader(), config, headerInfo.getLabel())
+                    .stream()
+                    .filter(f -> f.isWritable())
+                    .collect(Collectors.toList());
 
             if(arrayProperties.isEmpty()) {
                 continue;
@@ -703,7 +711,7 @@ private int loadNestedRecords(final Sheet sheet, final List<RecordHeader> header
         final List<FieldAccessor> nestedProperties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 record.getClass(), work.getAnnoReader(), XlsNestedRecords.class)
                 .stream()
-                .filter(f -> f.isReadable())
+                .filter(f -> f.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : nestedProperties) {
@@ -812,6 +820,11 @@ private boolean isAvailabledRecord(final Optional<Method> ignoreMethod, final Ob
     public void saveProcess(final Sheet sheet, final Object beansObj, final XlsHorizontalRecords anno,
             final FieldAccessor accessor, final Configuration config, final SavingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isSaveCase(anno.cases())) {
             return;
         }
@@ -1117,7 +1130,7 @@ record = null;
                         return FieldAccessorUtils.getColumnPropertiesByName(
                                 record.getClass(), work.getAnnoReader(), config, key)
                                 .stream()
-                                .filter(p -> p.isWritable())
+                                .filter(p -> p.isReadable())
                                 .collect(Collectors.toList());
                     });
 
@@ -1336,7 +1349,7 @@ private int getStartHeaderIndexForSaving(final List<RecordHeader> headers, Class
             final List<FieldAccessor> propeties = FieldAccessorUtils.getColumnPropertiesByName(
                     recordClass, annoReader, config, headerInfo.getLabel())
                     .stream()
-                    .filter(p -> p.isWritable())
+                    .filter(p -> p.isReadable())
                     .collect(Collectors.toList());
             if(!propeties.isEmpty()) {
                 return i;
@@ -1414,7 +1427,7 @@ private void saveMapColumns(final Sheet sheet, final List<RecordHeader> headers,
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 recordClass, work.getAnnoReader(), XlsMapColumns.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -1524,7 +1537,11 @@ private void saveArrayColumns(final Sheet sheet, final List<RecordHeader> header
 
             // アノテーション「@XlsArrayColumns」の属性「columnName」と一致するプロパティを取得する。
             final List<FieldAccessor> arrayProperties = FieldAccessorUtils.getArrayColumnsPropertiesByName(
-                    recordClass, work.getAnnoReader(), config, headerInfo.getLabel());
+                    recordClass, work.getAnnoReader(), config, headerInfo.getLabel())
+                    .stream()
+                    .filter(f -> f.isReadable())
+                    .collect(Collectors.toList());
+;
 
             if(arrayProperties.isEmpty()) {
                 continue;
@@ -1692,8 +1709,9 @@ private int saveNestedRecords(final Sheet sheet, final List<RecordHeader> header
         final List<FieldAccessor> nestedProperties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 record.getClass(), work.getAnnoReader(), XlsNestedRecords.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
+
         for(FieldAccessor property : nestedProperties) {
 
             final XlsNestedRecords nestedAnno = property.getAnnotationNullable(XlsNestedRecords.class);

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/IterateTablesProcessor.java

@@ -57,6 +57,11 @@ public class IterateTablesProcessor extends AbstractFieldProcessor<XlsIterateTab
     public void loadProcess(final Sheet sheet, final Object beansObj, final XlsIterateTables anno,
             final FieldAccessor accessor, final Configuration config, final LoadingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -232,7 +237,7 @@ private void loadSingleLabelledComment(final Sheet sheet, final Object tableObj,
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledComment.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -277,7 +282,7 @@ private void loadSingleLabelledCell(final Sheet sheet, final Object tableObj,
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledCell.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -322,7 +327,7 @@ private void loadSingleLabelledArrayCell(final Sheet sheet, final Object tableOb
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledArrayCells.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -368,7 +373,7 @@ private void loadMultipleHorizontalTableCell(final Sheet sheet, final Object tab
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsHorizontalRecords.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         final List<FieldAccessorProxy> accessorProxies = new ArrayList<>();
@@ -408,7 +413,7 @@ private void loadMultipleVerticalTableCell(final Sheet sheet, final Object table
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsVerticalRecords.class)
                 .stream()
-                .filter(p -> p.isReadable())
+                .filter(p -> p.isWritable())
                 .collect(Collectors.toList());
 
         final List<FieldAccessorProxy> accessorProxies = new ArrayList<>();
@@ -435,6 +440,11 @@ private void loadMultipleVerticalTableCell(final Sheet sheet, final Object table
     public void saveProcess(final Sheet sheet, final Object beansObj, final XlsIterateTables anno, final FieldAccessor accessor,
             final Configuration config, final SavingWorkObject work) throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isSaveCase(anno.cases())) {
             return;
         }
@@ -568,7 +578,7 @@ private void saveSingleLabelledComment(final Sheet sheet, final Object tableObj,
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledComment.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -607,7 +617,7 @@ private void saveSingleLabelledCell(final Sheet sheet, final Object tableObj, fi
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledCell.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -646,7 +656,7 @@ private void saveSingleLabelledArrayCell(final Sheet sheet, final Object tableOb
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsLabelledArrayCells.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         for(FieldAccessor property : properties) {
@@ -693,7 +703,7 @@ private void saveMultipleHorizontalTableCell(final Sheet sheet, final Object tab
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsHorizontalRecords.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         final List<FieldAccessorProxy> accessorProxies = new ArrayList<>();
@@ -735,7 +745,7 @@ private void saveMultipleVerticalTableCell(final Sheet sheet, final Object table
         final List<FieldAccessor> properties = FieldAccessorUtils.getPropertiesWithAnnotation(
                 tableObj.getClass(), work.getAnnoReader(), XlsVerticalRecords.class)
                 .stream()
-                .filter(p -> p.isWritable())
+                .filter(p -> p.isReadable())
                 .collect(Collectors.toList());
 
         final List<FieldAccessorProxy> accessorProxies = new ArrayList<>();

src/main/java/com/gh/mygreen/xlsmapper/fieldprocessor/impl/LabelledArrayCellsProcessor.java

@@ -39,6 +39,11 @@ public void loadProcess(final Sheet sheet, final Object beansObj, final XlsLabel
             final FieldAccessor accessor, final Configuration config, final LoadingWorkObject work)
             throws XlsMapperException {
 
+        if(!accessor.isWritable()) {
+            // セルの値を書き込むメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isLoadCase(anno.cases())) {
             return;
         }
@@ -148,6 +153,11 @@ public void saveProcess(final Sheet sheet, final Object beansObj, final XlsLabel
             final FieldAccessor accessor, final Configuration config, final SavingWorkObject work)
             throws XlsMapperException {
 
+        if(!accessor.isReadable()) {
+            // セルの値を参照するメソッド／フィールドがない場合はスキップ
+            return;
+        }
+
         if(!Utils.isSaveCase(anno.cases())) {
             return;
         }