Version 0.3.0. Fix for format not applied when cell had no options. Fix to use cell renderers first.

Author: jameskleeh

build.gradle

@@ -14,7 +14,7 @@ apply plugin: "jacoco"
 
 
 group 'com.jameskleeh'
-version '0.2.0'
+version '0.3.0'
 
 targetCompatibility = 1.7
 

src/main/groovy/com/jameskleeh/excel/CellStyleBuilder.groovy

@@ -356,11 +356,6 @@ class CellStyleBuilder {
         XSSFCellStyle cellStyle = workbook.createCellStyle()
         if (options.containsKey(FORMAT)) {
             setFormat(cellStyle, options[FORMAT])
-        } else {
-            Object format = Excel.getFormat(value.class)
-            if (format) {
-                setFormat(cellStyle, format)
-            }
         }
         if (options.containsKey(FONT)) {
             setFont(cellStyle, options[FONT])
@@ -405,6 +400,12 @@ class CellStyleBuilder {
         convertSimpleOptions(options)
         convertSimpleOptions(defaultOptions)
         options = merge(defaultOptions, options)
+        if (!options.containsKey(FORMAT) && value != null) {
+            def format = Excel.getFormat(value.class)
+            if (format != null) {
+                options.put(FORMAT, format)
+            }
+        }
         if (options) {
             WorkbookCache workbookCache = WORKBOOK_CACHE.get(workbook)
             if (workbookCache.containsStyle(options)) {

src/main/groovy/com/jameskleeh/excel/Row.groovy

@@ -23,8 +23,6 @@ import groovy.transform.CompileStatic
 import org.apache.poi.ss.util.CellRangeAddress
 import org.apache.poi.xssf.usermodel.XSSFCell
 import org.apache.poi.xssf.usermodel.XSSFRow
-import org.apache.poi.xssf.usermodel.XSSFSheet
-import org.apache.poi.xssf.usermodel.XSSFWorkbook
 
 /**
  * A class used to create a row in an excel document

src/main/groovy/com/jameskleeh/excel/internal/CreatesCells.groovy

@@ -186,7 +186,10 @@ abstract class CreatesCells {
 
         XSSFCell cell = nextCell()
         setStyle(value, cell, style)
-        if (value instanceof String) {
+        Closure callable = Excel.getRenderer(value.class)
+        if (callable != null) {
+            cell.setCellValue((String)callable.call(value))
+        } else if (value instanceof String) {
             cell.setCellValue(value)
         } else if (value instanceof Calendar) {
             cell.setCellValue(value)
@@ -197,12 +200,7 @@ abstract class CreatesCells {
         } else if (value instanceof Boolean) {
             cell.setCellValue(value)
         } else {
-            Closure callable = Excel.getRenderer(value.class)
-            if (callable != null) {
-                cell.setCellValue((String)callable.call(value))
-            } else {
-                cell.setCellValue(value.toString())
-            }
+            cell.setCellValue(value.toString())
         }
         cell
     }

src/test/groovy/com/jameskleeh/excel/CellStyleBuilderSpec.groovy

@@ -16,6 +16,11 @@ import java.awt.Color
  */
 class CellStyleBuilderSpec extends Specification {
 
+    void cleanup() {
+        Excel.formatEntries.clear()
+        Excel.rendererEntries.clear()
+    }
+
     void "test convertSimpleOptions"() {
         given:
         CellStyleBuilder cellStyleBuilder = new CellStyleBuilder(new XSSFWorkbook())
@@ -94,8 +99,8 @@ class CellStyleBuilderSpec extends Specification {
         then:
         thrown(IllegalArgumentException)
 
-        when:
-        cellStyle = cellStyleBuilder.buildStyle("someString", [:])
+        when: "A call to getStyle is essential here to bring in the formats registered in Excel"
+        cellStyle = cellStyleBuilder.getStyle("someString", [:])
 
         then:
         cellStyle.dataFormatString == "bar"

src/test/groovy/com/jameskleeh/excel/ExcelSpec.groovy

@@ -1,13 +1,8 @@
 package com.jameskleeh.excel
 
-import org.apache.poi.ss.usermodel.FillPatternType
+import spock.lang.Issue
 import spock.lang.Specification
 
-import java.awt.Color
-
-/**
- * Created by jameskleeh on 9/25/16.
- */
 class ExcelSpec extends Specification {
 
     void cleanup() {
@@ -125,4 +120,24 @@ class ExcelSpec extends Specification {
         format == 18
     }
 
+    @Issue("https://github.com/jameskleeh/groovy-excel-builder/issues/7")
+    void "test creating cells with registered cell formats"() {
+        Excel.registerCellRenderer(String, 0) { it + 'extra' }
+        Excel.registerCellFormat(BigDecimal, 0xa)
+
+        when:
+        def wb = ExcelBuilder.build {
+            sheet {
+                row {
+                    cell(new BigDecimal("1.32"))
+                    cell("Foo")
+                }
+            }
+        }
+
+        then:
+        wb.getSheetAt(0).getRow(0).getCell(0).cellStyle.dataFormat == (short)0xa
+        wb.getSheetAt(0).getRow(0).getCell(1).stringCellValue == "Fooextra"
+    }
+
 }