Merge branch 'main' into patch_005

Author: delei

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/CellExtra.java

@@ -25,6 +25,8 @@
 
 package org.apache.fesod.sheet.metadata;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.constant.ExcelXmlConstants;
 import org.apache.fesod.sheet.enums.CellExtraTypeEnum;
 import org.apache.poi.ss.util.CellReference;
@@ -34,6 +36,8 @@
  *
  *
  */
+@Getter
+@Setter
 public class CellExtra extends AbstractCell {
     /**
      * Cell extra type
@@ -99,52 +103,4 @@ public CellExtra(
         this.lastRowIndex = lastRowIndex;
         this.lastColumnIndex = lastColumnIndex;
     }
-
-    public CellExtraTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CellExtraTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Integer getFirstRowIndex() {
-        return firstRowIndex;
-    }
-
-    public void setFirstRowIndex(Integer firstRowIndex) {
-        this.firstRowIndex = firstRowIndex;
-    }
-
-    public Integer getFirstColumnIndex() {
-        return firstColumnIndex;
-    }
-
-    public void setFirstColumnIndex(Integer firstColumnIndex) {
-        this.firstColumnIndex = firstColumnIndex;
-    }
-
-    public Integer getLastRowIndex() {
-        return lastRowIndex;
-    }
-
-    public void setLastRowIndex(Integer lastRowIndex) {
-        this.lastRowIndex = lastRowIndex;
-    }
-
-    public Integer getLastColumnIndex() {
-        return lastColumnIndex;
-    }
-
-    public void setLastColumnIndex(Integer lastColumnIndex) {
-        this.lastColumnIndex = lastColumnIndex;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/property/ColumnWidthProperty.java

@@ -25,13 +25,17 @@
 
 package org.apache.fesod.sheet.metadata.property;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.annotation.write.style.ColumnWidth;
 
 /**
  * Configuration from annotations
  *
  *
  */
+@Getter
+@Setter
 public class ColumnWidthProperty {
     private Integer width;
 
@@ -45,12 +49,4 @@ public static ColumnWidthProperty build(ColumnWidth columnWidth) {
         }
         return new ColumnWidthProperty(columnWidth.value());
     }
-
-    public Integer getWidth() {
-        return width;
-    }
-
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/property/LoopMergeProperty.java

@@ -25,13 +25,17 @@
 
 package org.apache.fesod.sheet.metadata.property;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.annotation.write.style.ContentLoopMerge;
 
 /**
  * Configuration from annotations
  *
  *
  */
+@Getter
+@Setter
 public class LoopMergeProperty {
     /**
      * Each row
@@ -53,20 +57,4 @@ public static LoopMergeProperty build(ContentLoopMerge contentLoopMerge) {
         }
         return new LoopMergeProperty(contentLoopMerge.eachRow(), contentLoopMerge.columnExtend());
     }
-
-    public int getEachRow() {
-        return eachRow;
-    }
-
-    public void setEachRow(int eachRow) {
-        this.eachRow = eachRow;
-    }
-
-    public int getColumnExtend() {
-        return columnExtend;
-    }
-
-    public void setColumnExtend(int columnExtend) {
-        this.columnExtend = columnExtend;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/property/NumberFormatProperty.java

@@ -26,13 +26,17 @@
 package org.apache.fesod.sheet.metadata.property;
 
 import java.math.RoundingMode;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.annotation.format.NumberFormat;
 
 /**
  * Configuration from annotations
  *
  *
  */
+@Getter
+@Setter
 public class NumberFormatProperty {
     private String format;
     private RoundingMode roundingMode;
@@ -48,20 +52,4 @@ public static NumberFormatProperty build(NumberFormat numberFormat) {
         }
         return new NumberFormatProperty(numberFormat.value(), numberFormat.roundingMode());
     }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    public RoundingMode getRoundingMode() {
-        return roundingMode;
-    }
-
-    public void setRoundingMode(RoundingMode roundingMode) {
-        this.roundingMode = roundingMode;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/property/OnceAbsoluteMergeProperty.java

@@ -25,13 +25,17 @@
 
 package org.apache.fesod.sheet.metadata.property;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.annotation.write.style.OnceAbsoluteMerge;
 
 /**
  * Configuration from annotations
  *
  *
  */
+@Getter
+@Setter
 public class OnceAbsoluteMergeProperty {
     /**
      * First row
@@ -67,36 +71,4 @@ public static OnceAbsoluteMergeProperty build(OnceAbsoluteMerge onceAbsoluteMerg
                 onceAbsoluteMerge.firstColumnIndex(),
                 onceAbsoluteMerge.lastColumnIndex());
     }
-
-    public int getFirstRowIndex() {
-        return firstRowIndex;
-    }
-
-    public void setFirstRowIndex(int firstRowIndex) {
-        this.firstRowIndex = firstRowIndex;
-    }
-
-    public int getLastRowIndex() {
-        return lastRowIndex;
-    }
-
-    public void setLastRowIndex(int lastRowIndex) {
-        this.lastRowIndex = lastRowIndex;
-    }
-
-    public int getFirstColumnIndex() {
-        return firstColumnIndex;
-    }
-
-    public void setFirstColumnIndex(int firstColumnIndex) {
-        this.firstColumnIndex = firstColumnIndex;
-    }
-
-    public int getLastColumnIndex() {
-        return lastColumnIndex;
-    }
-
-    public void setLastColumnIndex(int lastColumnIndex) {
-        this.lastColumnIndex = lastColumnIndex;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/property/RowHeightProperty.java

@@ -25,6 +25,8 @@
 
 package org.apache.fesod.sheet.metadata.property;
 
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.annotation.write.style.ContentRowHeight;
 import org.apache.fesod.sheet.annotation.write.style.HeadRowHeight;
 
@@ -33,6 +35,8 @@
  *
  *
  */
+@Getter
+@Setter
 public class RowHeightProperty {
     private Short height;
 
@@ -53,12 +57,4 @@ public static RowHeightProperty build(ContentRowHeight contentRowHeight) {
         }
         return new RowHeightProperty(contentRowHeight.value());
     }
-
-    public Short getHeight() {
-        return height;
-    }
-
-    public void setHeight(Short height) {
-        this.height = height;
-    }
 }

fesod-sheet/src/main/java/org/apache/fesod/sheet/read/metadata/holder/ReadRowHolder.java

@@ -26,6 +26,8 @@
 package org.apache.fesod.sheet.read.metadata.holder;
 
 import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.fesod.sheet.enums.HolderEnum;
 import org.apache.fesod.sheet.enums.RowTypeEnum;
 import org.apache.fesod.sheet.metadata.Cell;
@@ -37,6 +39,8 @@
  *
  *
  */
+@Getter
+@Setter
 public class ReadRowHolder implements Holder {
     /**
      * Returns row index of a row in the sheet that contains this cell.Start form 0.
@@ -70,46 +74,6 @@ public ReadRowHolder(
         this.cellMap = cellMap;
     }
 
-    public GlobalConfiguration getGlobalConfiguration() {
-        return globalConfiguration;
-    }
-
-    public void setGlobalConfiguration(GlobalConfiguration globalConfiguration) {
-        this.globalConfiguration = globalConfiguration;
-    }
-
-    public Object getCurrentRowAnalysisResult() {
-        return currentRowAnalysisResult;
-    }
-
-    public void setCurrentRowAnalysisResult(Object currentRowAnalysisResult) {
-        this.currentRowAnalysisResult = currentRowAnalysisResult;
-    }
-
-    public Integer getRowIndex() {
-        return rowIndex;
-    }
-
-    public void setRowIndex(Integer rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-
-    public RowTypeEnum getRowType() {
-        return rowType;
-    }
-
-    public void setRowType(RowTypeEnum rowType) {
-        this.rowType = rowType;
-    }
-
-    public Map<Integer, Cell> getCellMap() {
-        return cellMap;
-    }
-
-    public void setCellMap(Map<Integer, Cell> cellMap) {
-        this.cellMap = cellMap;
-    }
-
     @Override
     public HolderEnum holderType() {
         return HolderEnum.ROW;

fesod-sheet/src/main/java/org/apache/fesod/sheet/util/ClassUtils.java

@@ -364,7 +364,11 @@ private static FieldCache doDeclaredFields(Class<?> clazz, ConfigurationHolder c
             // The current field needs to be ignored
             if (writeHolder.ignore(field.getFieldName(), entry.getKey())) {
                 ignoreSet.add(field.getFieldName());
-                indexFieldMap.remove(index);
+                // indexFieldMap is keyed by the field's explicit @ExcelProperty(index), which for
+                // explicit-index fields equals the sortedFieldMap position (entry.getKey()); remove
+                // by that key, not the running counter, otherwise an unrelated explicit-index entry
+                // is dropped and the ignored field's entry may survive.
+                indexFieldMap.remove(key);
             } else {
                 // Mandatory sorted fields
                 if (indexFieldMap.containsKey(key)) {

fesod-sheet/src/main/java/org/apache/fesod/sheet/write/metadata/fill/FillWrapper.java

@@ -26,12 +26,16 @@
 package org.apache.fesod.sheet.write.metadata.fill;
 
 import java.util.Collection;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Multiple lists are supported when packing
  *
  *
  **/
+@Getter
+@Setter
 public class FillWrapper {
     /**
      * The collection prefix that needs to be filled.
@@ -50,20 +54,4 @@ public FillWrapper(String name, Collection collectionData) {
         this.name = name;
         this.collectionData = collectionData;
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Collection getCollectionData() {
-        return collectionData;
-    }
-
-    public void setCollectionData(Collection collectionData) {
-        this.collectionData = collectionData;
-    }
 }