Chagne term 'contents' -> 'body', Write simple test code

Author: lannstark

.gitignore

@@ -1,2 +1,3 @@
 .idea/
 .gradle/
+out/

README.md

@@ -36,7 +36,7 @@ dependencies {
 // Rendered Field Order is same as Dto field order
 public class ExcelDto {
 
-  // Annotation Case 1. no headerStyle and contentsStyle
+  // Annotation Case 1. no headerStyle and bodyStyle
   @ExcelColumn(headerName = "User Name")
   private String name;
 
@@ -46,24 +46,24 @@ public class ExcelDto {
   )
   private int age;
 
-  // Annotation Case 3. You can also configure contents style
+  // Annotation Case 3. You can also configure bodyStyle style
   @ExcelColumn(headerName = "Happy BirthDay",
-      contentsStyle = @ExcelColumnStyle(excelCellStyleClass = DefaultExcelCellStyle.class, enumName = "CONTENTS")
+      bodyStyle = @ExcelColumnStyle(excelCellStyleClass = DefaultExcelCellStyle.class, enumName = "BODY")
   )
   private LocalDate birthDay;
 
 }
 ```
 
-If you want to config default style in class, you should use @DefaultHeaderStyle or @DefaultContentsStyle.
+If you want to config default style in class, you should use @DefaultHeaderStyle or @DefaultBodyStyle.
 This style will be applied to all fields having not field style in this class.
 
 ```java
 @DefaultHeaderStyle(
     style = @ExcelColumnStyle(excelCellStyleClass = DefaultExcelCellStyle.class, enumName = "BLUE_HEADER")
 )
-@DefaultContentsStyle(
-	style = @ExcelColumnStyle(excelCellStyleClass = DefaultExcelCellStyle.class, enumName = "CONTENTS")
+@DefaultBodyStyle(
+	style = @ExcelColumnStyle(excelCellStyleClass = DefaultExcelCellStyle.class, enumName = "BODY")
 )
 public class ExcelDto {
 
@@ -192,7 +192,7 @@ public enum CustomCellStyle implements ExcelCellStyle {
 public class ExcelDto {
 
   @ExcelColumn(headerName = "Field Header Title",
-      contentsStyle = @ExcelColumnStyle(excelCellStyleClass = CustomCellStyle.class, enumName = "CUSTOM_HEADER")
+      bodyStyle = @ExcelColumnStyle(excelCellStyleClass = CustomCellStyle.class, enumName = "CUSTOM_HEADER")
   )
   private String field1;
 

build.gradle

@@ -14,4 +14,8 @@ repositories {
 dependencies {
     compile 'org.apache.poi:poi:4.1.2'
     compile 'org.apache.poi:poi-ooxml:4.1.2'
+
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.6.1'
 }

…/com/lannstark/DefaultContentsStyle.java …java/com/lannstark/DefaultBodyStyle.javasrc/main/java/com/lannstark/DefaultContentsStyle.java renamed to src/main/java/com/lannstark/DefaultBodyStyle.java src/main/java/com/lannstark/DefaultContentsStyle.java renamed to src/main/java/com/lannstark/DefaultBodyStyle.java

@@ -7,7 +7,7 @@
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface DefaultContentsStyle {
+public @interface DefaultBodyStyle {
 
 	ExcelColumnStyle style();
 

src/main/java/com/lannstark/ExcelColumn.java

@@ -14,6 +14,6 @@
 	String headerName() default "";
 
 	ExcelColumnStyle headerStyle() default @ExcelColumnStyle(excelCellStyleClass = NoExcelCellStyle.class);
-	ExcelColumnStyle contentsStyle() default @ExcelColumnStyle(excelCellStyleClass = NoExcelCellStyle.class);
+	ExcelColumnStyle bodyStyle() default @ExcelColumnStyle(excelCellStyleClass = NoExcelCellStyle.class);
 
 }

src/main/java/com/lannstark/excel/ExcelFile.java

@@ -2,9 +2,12 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.List;
 
-public interface ExcelFile {
+public interface ExcelFile<T> {
 
 	void write(OutputStream stream) throws IOException;
 
+	void addRows(List<T> data);
+
 }

src/main/java/com/lannstark/excel/SXSSFExcelFile.java

@@ -15,11 +15,12 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
+import java.util.Collections;
 import java.util.List;
 
 import static com.lannstark.utils.SuperClassReflectionUtils.getField;
 
-public abstract class SXSSFExcelFile<T> implements ExcelFile {
+public abstract class SXSSFExcelFile<T> implements ExcelFile<T> {
 
 	protected static final SpreadsheetVersion supplyExcelVersion = SpreadsheetVersion.EXCEL2007;
 
@@ -28,28 +29,37 @@ public abstract class SXSSFExcelFile<T> implements ExcelFile {
 	protected ExcelRenderResource resource;
 
 	/**
-	 * OneSheetExcelFile
+	 *SXSSFExcelFile
+	 * @param type Class type to be rendered
+	 */
+	public SXSSFExcelFile(Class<T> type) {
+		this(Collections.emptyList(), type, new DefaultDataFormatDecider());
+	}
+
+	/**
+	 * SXSSFExcelFile
 	 * @param data List Data to render excel file. data should have at least one @ExcelColumn on fields
 	 * @param type Class type to be rendered
 	 */
 	public SXSSFExcelFile(List<T> data, Class<T> type) {
-		this.wb = new SXSSFWorkbook();
-		this.resource = ExcelRenderResourceFactory.prepareRenderResource(type, wb, new DefaultDataFormatDecider());
-		renderExcel(data);
+		this(data, type, new DefaultDataFormatDecider());
 	}
 
 	/**
-	 * OneSheetExcelFile
+	 * SXSSFExcelFile
 	 * @param data List Data to render excel file. data should have at least one @ExcelColumn on fields
 	 * @param type Class type to be rendered
 	 * @param dataFormatDecider Custom DataFormatDecider
 	 */
 	public SXSSFExcelFile(List<T> data, Class<T> type, DataFormatDecider dataFormatDecider) {
+		validateData(data);
 		this.wb = new SXSSFWorkbook();
 		this.resource = ExcelRenderResourceFactory.prepareRenderResource(type, wb, dataFormatDecider);
 		renderExcel(data);
 	}
 
+	protected void validateData(List<T> data) { }
+
 	protected abstract void renderExcel(List<T> data);
 
 	protected void renderHeadersWithNewSheet(Sheet sheet, int rowIndex, int columnStartIndex) {
@@ -62,15 +72,15 @@ protected void renderHeadersWithNewSheet(Sheet sheet, int rowIndex, int columnSt
 		}
 	}
 
-	protected void renderContent(Object data, int rowIndex, int columnStartIndex) {
+	protected void renderBody(Object data, int rowIndex, int columnStartIndex) {
 		Row row = sheet.createRow(rowIndex);
 		int columnIndex = columnStartIndex;
 		for (String dataFieldName : resource.getDataFieldNames()) {
 			Cell cell = row.createCell(columnIndex++);
 			try {
 				Field field = getField(data.getClass(), (dataFieldName));
 				field.setAccessible(true);
-				cell.setCellStyle(resource.getCellStyle(dataFieldName, ExcelRenderLocation.CONTENTS));
+				cell.setCellStyle(resource.getCellStyle(dataFieldName, ExcelRenderLocation.BODY));
 				Object cellValue = field.get(data);
 				renderCellValue(cell, cellValue);
 			} catch (Exception e) {

src/main/java/com/lannstark/excel/multiplesheet/MultiSheetExcelFile.java

@@ -12,13 +12,19 @@
  * - support Excel Version over 2007
  * - support multi sheet rendering
  * - support Dffierent DataFormat by Class Type
- * - support Custom CellStyle according to (header or contents) and data field
+ * - support Custom CellStyle according to (header or body) and data field
  */
 public class MultiSheetExcelFile<T> extends SXSSFExcelFile<T> {
 
 	private static final int maxRowCanBeRendered = supplyExcelVersion.getMaxRows() - 1;
 	private static final int ROW_START_INDEX = 0;
 	private static final int COLUMN_START_INDEX = 0;
+	private int currentRowIndex = ROW_START_INDEX;
+
+	public MultiSheetExcelFile(Class<T> type) {
+		super(type);
+		wb.setZip64Mode(Zip64Mode.Always);
+	}
 
 	/*
 	 * If you use SXSSF with hug data, you need to set zip mode
@@ -42,16 +48,17 @@ protected void renderExcel(List<T> data) {
 			return ;
 		}
 
+		// 2. Render body
 		createNewSheetWithHeader();
-		int renderedDataCnt = 0;
-		int rowIndex = ROW_START_INDEX + 1;
-		for (Object renderedData : data) {
-			renderContent(renderedData, rowIndex++, COLUMN_START_INDEX);
-			renderedDataCnt ++;
+		addRows(data);
+	}
 
-			if (renderedDataCnt == maxRowCanBeRendered) {
-				renderedDataCnt = 0;
-				rowIndex = 1;
+	@Override
+	public void addRows(List<T> data) {
+		for (Object renderedData : data) {
+			renderBody(renderedData, currentRowIndex++, COLUMN_START_INDEX);
+			if (currentRowIndex == maxRowCanBeRendered) {
+				currentRowIndex = 1;
 				createNewSheetWithHeader();
 			}
 		}
@@ -60,6 +67,7 @@ protected void renderExcel(List<T> data) {
 	private void createNewSheetWithHeader() {
 		sheet = wb.createSheet();
 		renderHeadersWithNewSheet(sheet, ROW_START_INDEX, COLUMN_START_INDEX);
+		currentRowIndex++;
 	}
 
 }

src/main/java/com/lannstark/excel/onesheet/OneSheetExcelFile.java

@@ -10,25 +10,29 @@
  *
  * - support Excel Version over 2007
  * - support one sheet rendering
- * - support Dffierent DataFormat by Class Type
- * - support Custom CellStyle according to (header or contents) and data field
+ * - support different DataFormat by Class Type
+ * - support Custom CellStyle according to (header or body) and data field
  */
 public final class OneSheetExcelFile<T> extends SXSSFExcelFile<T> {
 
 	private static final int ROW_START_INDEX = 0;
 	private static final int COLUMN_START_INDEX = 0;
+	private int currentRowIndex = ROW_START_INDEX;
+
+	public OneSheetExcelFile(Class<T> type) {
+		super(type);
+	}
 
 	public OneSheetExcelFile(List<T> data, Class<T> type) {
 		super(data, type);
-		validateMaxRow(data);
 	}
 
 	public OneSheetExcelFile(List<T> data, Class<T> type, DataFormatDecider dataFormatDecider) {
 		super(data, type, dataFormatDecider);
-		validateMaxRow(data);
 	}
 
-	private void validateMaxRow(List<?> data) {
+	@Override
+	protected void validateData(List<T> data) {
 		int maxRows = supplyExcelVersion.getMaxRows();
 		if (data.size() > maxRows) {
 			throw new IllegalArgumentException(
@@ -40,17 +44,21 @@ private void validateMaxRow(List<?> data) {
 	public void renderExcel(List<T> data) {
 		// 1. Create sheet and renderHeader
 		sheet = wb.createSheet();
-		renderHeadersWithNewSheet(sheet, ROW_START_INDEX, COLUMN_START_INDEX);
+		renderHeadersWithNewSheet(sheet, currentRowIndex++, COLUMN_START_INDEX);
 
 		if (data.isEmpty()) {
 			return;
 		}
 
-		// 2. Render Contents
-		int rowIndex = ROW_START_INDEX + 1;
+		// 2. Render Body
 		for (Object renderedData : data) {
-			renderContent(renderedData, rowIndex++, COLUMN_START_INDEX);
+			renderBody(renderedData, currentRowIndex++, COLUMN_START_INDEX);
 		}
 	}
 
+	@Override
+	public void addRows(List<T> data) {
+		renderBody(data, currentRowIndex++, COLUMN_START_INDEX);
+	}
+
 }

src/main/java/com/lannstark/resource/DefaultDataFormatDecider.java

@@ -8,26 +8,37 @@
 public class DefaultDataFormatDecider implements DataFormatDecider {
 
 	private static final String CURRENT_FORMAT = "#,##0";
+	private static final String FLOAT_FORMAT_2_DECIMAL_PLACES = "#,##0.00";
 	private static final String DEFAULT_FORMAT = "";
 
 	@Override
 	public short getDataFormat(DataFormat dataFormat, Class<?> type) {
-		if (isNumericType(type)) {
+		if (isFloatType(type)) {
+			return dataFormat.getFormat(FLOAT_FORMAT_2_DECIMAL_PLACES);
+		}
+
+		if (isIntegerType(type)) {
 			return dataFormat.getFormat(CURRENT_FORMAT);
 		}
 		return dataFormat.getFormat(DEFAULT_FORMAT);
 	}
 
-	private boolean isNumericType(Class<?> type) {
-		List<Class<?>> numericTypes = Arrays.asList(
+	private boolean isFloatType(Class<?> type) {
+		List<Class<?>> floatTypes = Arrays.asList(
+				Float.class, float.class,
+				Double.class, double.class
+		);
+		return floatTypes.contains(type);
+	}
+
+	private boolean isIntegerType(Class<?> type) {
+		List<Class<?>> integerTypes = Arrays.asList(
 				Byte.class, byte.class,
 				Short.class, short.class,
 				Integer.class, int.class,
-				Long.class, long.class,
-				Float.class, float.class,
-				Double.class, double.class
+				Long.class, long.class
 		);
-		return numericTypes.contains(type);
+		return integerTypes.contains(type);
 	}
 
 }