Fix xlsx formatting

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.docutools'
-version = '1.5.7-alpha.1'
+version = '1.5.9-alpha.1'
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17

src/main/java/com/docutools/jocument/impl/ReflectionResolver.java

@@ -35,6 +35,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -401,6 +402,8 @@ private Optional<PlaceholderData> resolveSimplePlaceholder(Object property, Stri
     } else if (property instanceof Path path && isFieldAnnotatedWith(bean.getClass(), placeholderName, Image.class)) {
       return ReflectionUtils.findFieldAnnotation(bean.getClass(), placeholderName, Image.class)
           .map(image -> new ImagePlaceholderData(path).withMaxWidth(image.maxWidth()));
+    } else if (property instanceof UUID uuid) {
+      return Optional.of(new ScalarPlaceholderData<>(uuid.toString()));
     } else {
       return Optional.empty();
     }

src/main/java/com/docutools/jocument/impl/excel/implementations/SXSSFWriter.java

@@ -45,10 +45,13 @@ public class SXSSFWriter implements ExcelWriter {
   /**
    * Maps the {@link CellStyle} objects of the old workbook to the new ones.
    */
-  private final Map<CellStyle, CellStyle> styleStyleMapping = new HashMap<>();
+  private final Map<Integer, CellStyle> cellStyleMap = new HashMap<>();
   private Sheet currentSheet;
+  private Sheet templateSheet;
   private Row currentRow;
   private int rowOffset = 0;
+  private int leftMostColumn = -1;
+  private int rightMostColumn = -1;
 
   /**
    * Creates a new SXSSFWriter.
@@ -102,6 +105,7 @@ private static void transferPicture(XSSFShape shape, SXSSFSheet newSheet) {
   @Override
   public void newSheet(Sheet sheet) {
     logger.info("Creating new sheet of {}", sheet.getSheetName());
+    templateSheet = sheet;
     currentSheet = workbook.createSheet(sheet.getSheetName());
     currentSheet.setActiveCell(sheet.getActiveCell());
     currentSheet.setAutobreaks(sheet.getAutobreaks());
@@ -139,19 +143,55 @@ public void newRow(Row row) {
     logger.debug("Creating new row {}", row.getRowNum());
     currentRow = currentSheet.createRow(row.getRowNum() + rowOffset);
     currentRow.setHeight(row.getHeight());
-    currentRow.setRowStyle(row.getRowStyle());
+    if (row.isFormatted()) {
+      currentRow.setRowStyle(cellStyleMap.computeIfAbsent((int) row.getRowStyle().getIndex(), i -> copyCellStyle(row.getRowStyle())));
+    }
     currentRow.setZeroHeight(row.getZeroHeight());
+    updateColumnStyles(row);
+  }
+
+  private void updateColumnStyles(Row row) {
+    if (rightMostColumn == -1 || leftMostColumn == -1) {
+      setup(row);
+    }
+    if (row.getLastCellNum() > rightMostColumn) {
+      for (; rightMostColumn < row.getLastCellNum(); rightMostColumn++) {
+        copyColumnStyle(rightMostColumn);
+      }
+      logger.debug("Rightmost column: {}", rightMostColumn);
+    }
+    if (row.getFirstCellNum() < leftMostColumn) {
+      for (; leftMostColumn > row.getLastCellNum(); leftMostColumn--) {
+        copyColumnStyle(leftMostColumn);
+      }
+      logger.debug("Leftmost column: {}", leftMostColumn);
+    }
+  }
+
+  private void setup(Row row) {
+    leftMostColumn = row.getFirstCellNum();
+    rightMostColumn = row.getLastCellNum();
+    logger.debug("Rightmost column: {}", rightMostColumn);
+    logger.debug("Leftmost column: {}", leftMostColumn);
+    for (int i = leftMostColumn; i < rightMostColumn; i++) {
+      copyColumnStyle(i);
+    }
+  }
+
+  private void copyColumnStyle(int rightMostColumn) {
+    CellStyle columnStyle = templateSheet.getColumnStyle(rightMostColumn);
+    if (columnStyle != null) {
+      currentSheet.setDefaultColumnStyle(rightMostColumn,
+          cellStyleMap.computeIfAbsent((int) columnStyle.getIndex(), i -> copyCellStyle(columnStyle)));
+    }
   }
 
   @Override
   public void addCell(Cell cell) {
-    logger.debug("Creating new cell {} {}", cell.getColumnIndex(), cell.getRow().getRowNum());
+    logger.trace("Creating new cell {} {}", cell.getColumnIndex(), cell.getRow().getRowNum());
     var newCell = currentRow.createCell(cell.getColumnIndex(), cell.getCellType());
-    if (workbook.getCellStyleAt(cell.getCellStyle().getIndex()) == null) {
-      copyCellStyle(cell.getCellStyle());
-    }
     newCell.setCellComment(cell.getCellComment());
-    newCell.setCellStyle(cell.getCellStyle());
+    newCell.setCellStyle(cellStyleMap.computeIfAbsent((int) cell.getCellStyle().getIndex(), i -> copyCellStyle(cell.getCellStyle())));
     newCell.setHyperlink(cell.getHyperlink());
     currentSheet.setColumnWidth(cell.getColumnIndex(), cell.getSheet().getColumnWidth(cell.getColumnIndex()));
     switch (cell.getCellType()) {
@@ -162,6 +202,7 @@ public void addCell(Cell cell) {
       case BOOLEAN -> newCell.setCellValue(cell.getBooleanCellValue());
       case ERROR -> newCell.setCellErrorValue(cell.getErrorCellValue());
       default -> {
+        // do nothing
       }
     }
     if (cell.getHyperlink() != null) {
@@ -180,11 +221,11 @@ public void addCell(Cell templateCell, String newCellText) {
 
   @Override
   public void addCell(Cell templateCell, String newCellText, int columnOffset) {
-    logger.debug("Creating new cell {} {} with text {}",
+    logger.trace("Creating new cell {} {} with text {}",
         templateCell.getColumnIndex(), templateCell.getRow().getRowNum(), newCellText);
     var newCell = currentRow.createCell(templateCell.getColumnIndex() + columnOffset, templateCell.getCellType());
     newCell.setCellComment(templateCell.getCellComment());
-    newCell.setCellStyle(styleStyleMapping.computeIfAbsent(templateCell.getCellStyle(), this::copyCellStyle));
+    newCell.setCellStyle(cellStyleMap.computeIfAbsent((int) templateCell.getCellStyle().getIndex(), i -> copyCellStyle(templateCell.getCellStyle())));
     newCell.setHyperlink(templateCell.getHyperlink());
     currentSheet.setColumnWidth(templateCell.getColumnIndex(), templateCell.getSheet().getColumnWidth(templateCell.getColumnIndex()));
     if (templateCell.getCellType() == CellType.FORMULA) {

src/test/java/com/docutools/jocument/ReflectionResolvingTests.java

@@ -274,4 +274,14 @@ void shouldTranslateShipName() {
 
     assertThat(shipName.get().toString(), equalTo("VSS Unternehmung"));
   }
+
+  @Test
+  void shouldResolveUUIDtoString() {
+    Person picardPerson = SampleModelData.PICARD_PERSON;
+    var resolver = new ReflectionResolver(picardPerson);
+
+    var id = resolver.resolve("id");
+
+    assertThat(id.get().toString(), equalTo(picardPerson.getId().toString()));
+  }
 }

src/test/java/com/docutools/jocument/excel/ExcelDocuments.java

@@ -130,7 +130,25 @@ void shouldResolveNestedLoops() throws InterruptedException, IOException {
   void inherti() throws InterruptedException, IOException {
     // Arrange
     Template template = Template.fromClassPath("/templates/excel/Formatting.xlsx")
-            .orElseThrow();
+        .orElseThrow();
+    PlaceholderResolver resolver = new ReflectionResolver(SampleModelData.PICARD);
+
+    // Act
+    Document document = template.startGeneration(resolver);
+    document.blockUntilCompletion(60000L); // 1 minute
+
+    // Assert
+    assertThat(document.completed(), is(true));
+
+    Desktop.getDesktop().open(document.getPath().toFile());
+  }
+
+  @Test
+  @DisplayName("Inherit style from source excel.")
+  void inheritStylePerCell() throws InterruptedException, IOException {
+    // Arrange
+    Template template = Template.fromClassPath("/templates/excel/ComplexFormatting.xlsx")
+        .orElseThrow();
     PlaceholderResolver resolver = new ReflectionResolver(SampleModelData.PICARD);
 
     // Act

src/test/java/com/docutools/jocument/sample/model/Person.java

@@ -6,8 +6,10 @@
 import java.time.LocalDate;
 import java.time.Period;
 import java.time.ZoneOffset;
+import java.util.UUID;
 
 public class Person {
+  private final UUID id = UUID.randomUUID();
 
   private final String firstName;
   private final String lastName;
@@ -55,4 +57,8 @@ public void setFavouriteShip(Ship favouriteShip) {
   public Ship getFavouriteShip() {
     return favouriteShip;
   }
+
+  public UUID getId() {
+    return id;
+  }
 }