Add maxHeight for images

To be able to limit images by height, an
additional `maxHeight` parameter is added
to the `@Image` annotation.
During processing, both `maxHeight` and
`maxWidth` are used to find the maximum scale
factor, which is then applied.

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group 'com.docutools'
-version = '4.0.0'
+version = '4.1.0'
 
 java {
     toolchain {

src/main/java/com/docutools/jocument/annotations/Image.java

@@ -16,11 +16,20 @@
 
   /**
    * The maximum pixel width the image should be inserted with. If the image is smaller won't affect it.
+   * A value of 0 is not permitted and will be ignored.
    *
    * @return the maximum pixel width of the image to be inserted
    */
   int maxWidth() default -1;
 
+  /**
+   * The maximum pixel height the image should be inserted with. If the image is smaller won't affect it.
+   * A value of 0 is not permitted and will be ignored.
+   *
+   * @return the maximum pixel height of the image to be inserted
+   */
+  int maxHeight() default -1;
+
   /**
    * Whether the resolved image should be deleted from the file system after insertion.
    *

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

@@ -470,7 +470,10 @@ private Optional<PlaceholderData> resolveSimplePlaceholder(Object property, Stri
       return formatTemporal(placeholderName, temporal, locale);
     } 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()).withFileDeletionAfterInsertion(image.deleteAfterInsertion()));
+          .map(image -> new ImagePlaceholderData(path)
+              .withMaxWidth(image.maxWidth())
+              .withMaxHeight(image.maxHeight())
+              .withFileDeletionAfterInsertion(image.deleteAfterInsertion()));
     } else if (property instanceof UUID uuid) {
       return Optional.of(new ScalarPlaceholderData<>(uuid.toString()));
     } else {

src/main/java/com/docutools/jocument/impl/word/placeholders/ImagePlaceholderData.java

@@ -20,18 +20,44 @@ public class ImagePlaceholderData extends CustomWordPlaceholderData {
   private final Path imagePath;
 
   // Options
-  private int maxWidth;
+  private int maxWidth = -1;
+  private int maxHeight = -1;
   private boolean deleteAfterInsertion;
 
   public ImagePlaceholderData(Path imagePath) {
     this.imagePath = imagePath;
   }
 
+  /**
+   * Set maximum width of the image. A width of 0 is not permitted and will be ignored.
+   *
+   * @param maxWidth The maximum width the image should have.
+   * @return the image placeholder data with the maxWidth applied (if != 0)
+   */
   public ImagePlaceholderData withMaxWidth(int maxWidth) {
+    if (maxWidth == 0) {
+      logger.warn("A max width of 0 is not permitted");
+      return this;
+    }
     this.maxWidth = maxWidth;
     return this;
   }
 
+  /**
+   * Set max height of the image. A height of 0 is not permitted and will be ignored.
+   *
+   * @param maxHeight The maximum height the image should have.
+   * @return the image placeholder data with the maxHeight applied (if != 0)
+   */
+  public ImagePlaceholderData withMaxHeight(int maxHeight) {
+    if (maxHeight == 0) {
+      logger.warn("A max height of 0 is not permitted");
+      return this;
+    }
+    this.maxHeight = maxHeight;
+    return this;
+  }
+
   public ImagePlaceholderData withFileDeletionAfterInsertion(boolean deleteAfterInsertion) {
     this.deleteAfterInsertion = deleteAfterInsertion;
     return this;
@@ -69,9 +95,9 @@ protected void transform(IBodyElement placeholder, IBody part, Locale locale, Ge
   private Path applyOptions(GenerationOptions options) {
     try {
       var image = options.imageStrategy().load(imagePath);
-      if (maxWidth > 0 && image.getWidth() > maxWidth) {
-        double scale = (double) maxWidth / image.getWidth();
-        var resized = options.imageStrategy().scale(image, scale);
+      double scale = Math.max(image.getWidth() / (double) maxWidth, image.getHeight() / (double) maxHeight);
+      if (scale > 1.0) {
+        var resized = options.imageStrategy().scale(image, 1 / scale);
         image.close();
         image = resized;
       }