Catch if formatter is passed null

DDS-GmbH · Aug 3, 2023 · c5f1c59 · c5f1c59
1 parent d84d15a
commit c5f1c59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,10 +8,13 @@ plugins {
 }
 
 group 'com.docutools'
-version = '1.6.0'
+version = '1.6.1'
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 repositories {
     mavenCentral()

diff --git a/src/main/java/com/docutools/jocument/GenerationOptionsBuilder.java b/src/main/java/com/docutools/jocument/GenerationOptionsBuilder.java
@@ -44,7 +44,7 @@ public <T> GenerationOptionsBuilder format(Class<T> filter, PlaceholderDataForma
   }
 
   public <T> GenerationOptionsBuilder format(Class<T> filter, LocalisedPlaceholderDataFormatter<T> formatter) {
-    formattingOptions.add(new PlaceholderDataFormattingOption<>(obj -> obj.getClass().isAssignableFrom(filter), formatter));
+    formattingOptions.add(new PlaceholderDataFormattingOption<>(obj -> obj != null && obj.getClass().isAssignableFrom(filter), formatter));
     return this;
   }