update dependencies and serialize Optional properly

.editorconfig

@@ -77,8 +77,10 @@ ij_java_class_annotation_wrap = split_into_lines
 ij_java_class_brace_style = end_of_line
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_class_names_in_javadoc = 1
+ij_java_deconstruction_list_wrap = normal
 ij_java_do_not_indent_top_level_class_members = false
 ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
 ij_java_do_while_brace_force = always
 ij_java_doc_add_blank_line_after_description = true
 ij_java_doc_add_blank_line_after_param_comments = true
@@ -99,18 +101,31 @@ ij_java_doc_param_description_on_new_line = false
 ij_java_doc_preserve_line_breaks = false
 ij_java_doc_use_throws_not_exception_tag = true
 ij_java_else_on_new_line = false
+ij_java_entity_dd_prefix =
 ij_java_entity_dd_suffix = EJB
+ij_java_entity_eb_prefix =
 ij_java_entity_eb_suffix = Bean
+ij_java_entity_hi_prefix =
 ij_java_entity_hi_suffix = Home
 ij_java_entity_lhi_prefix = Local
 ij_java_entity_lhi_suffix = Home
 ij_java_entity_li_prefix = Local
+ij_java_entity_li_suffix =
 ij_java_entity_pk_class = java.lang.String
+ij_java_entity_ri_prefix =
+ij_java_entity_ri_suffix =
+ij_java_entity_vo_prefix =
 ij_java_entity_vo_suffix = VO
 ij_java_enum_constants_wrap = off
 ij_java_extends_keyword_wrap = off
 ij_java_extends_list_wrap = off
 ij_java_field_annotation_wrap = split_into_lines
+ij_java_field_name_prefix =
+ij_java_field_name_suffix =
+ij_java_filter_class_prefix =
+ij_java_filter_class_suffix =
+ij_java_filter_dd_prefix =
+ij_java_filter_dd_suffix =
 ij_java_finally_on_new_line = false
 ij_java_for_brace_force = always
 ij_java_for_statement_new_line_after_left_paren = false
@@ -135,15 +150,22 @@ ij_java_keep_line_breaks = true
 ij_java_keep_multiple_expressions_in_one_line = false
 ij_java_keep_simple_blocks_in_one_line = false
 ij_java_keep_simple_classes_in_one_line = true
-ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = true
 ij_java_keep_simple_methods_in_one_line = false
 ij_java_label_indent_absolute = false
 ij_java_label_indent_size = 0
 ij_java_lambda_brace_style = end_of_line
 ij_java_layout_static_imports_separately = true
 ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
 ij_java_line_comment_at_first_column = true
+ij_java_listener_class_prefix =
+ij_java_listener_class_suffix =
+ij_java_local_variable_name_prefix =
+ij_java_local_variable_name_suffix =
+ij_java_message_dd_prefix =
 ij_java_message_dd_suffix = EJB
+ij_java_message_eb_prefix =
 ij_java_message_eb_suffix = Bean
 ij_java_method_annotation_wrap = split_into_lines
 ij_java_method_brace_style = end_of_line
@@ -152,9 +174,15 @@ ij_java_method_parameters_new_line_after_left_paren = false
 ij_java_method_parameters_right_paren_on_new_line = false
 ij_java_method_parameters_wrap = off
 ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
 ij_java_names_count_to_use_import_on_demand = 999
+ij_java_new_line_after_lparen_in_annotation = false
+ij_java_new_line_after_lparen_in_deconstruction_pattern = true
 ij_java_new_line_after_lparen_in_record_header = false
+ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
 ij_java_parameter_annotation_wrap = off
+ij_java_parameter_name_prefix =
+ij_java_parameter_name_suffix =
 ij_java_parentheses_expression_new_line_after_left_paren = false
 ij_java_parentheses_expression_right_paren_on_new_line = false
 ij_java_place_assignment_sign_on_next_line = false
@@ -168,13 +196,26 @@ ij_java_replace_sum_lambda_with_method_ref = true
 ij_java_resource_list_new_line_after_left_paren = false
 ij_java_resource_list_right_paren_on_new_line = false
 ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_annotation = false
+ij_java_rparen_on_new_line_in_deconstruction_pattern = true
 ij_java_rparen_on_new_line_in_record_header = false
+ij_java_servlet_class_prefix =
+ij_java_servlet_class_suffix =
+ij_java_servlet_dd_prefix =
+ij_java_servlet_dd_suffix =
+ij_java_session_dd_prefix =
 ij_java_session_dd_suffix = EJB
+ij_java_session_eb_prefix =
 ij_java_session_eb_suffix = Bean
+ij_java_session_hi_prefix =
 ij_java_session_hi_suffix = Home
 ij_java_session_lhi_prefix = Local
 ij_java_session_lhi_suffix = Home
 ij_java_session_li_prefix = Local
+ij_java_session_li_suffix =
+ij_java_session_ri_prefix =
+ij_java_session_ri_suffix =
+ij_java_session_si_prefix =
 ij_java_session_si_suffix = Service
 ij_java_space_after_closing_angle_bracket_in_type_argument = false
 ij_java_space_after_colon = true
@@ -193,6 +234,7 @@ ij_java_space_before_class_left_brace = true
 ij_java_space_before_colon = true
 ij_java_space_before_colon_in_foreach = true
 ij_java_space_before_comma = false
+ij_java_space_before_deconstruction_list = false
 ij_java_space_before_do_left_brace = true
 ij_java_space_before_else_keyword = true
 ij_java_space_before_else_left_brace = true
@@ -223,6 +265,7 @@ ij_java_space_within_empty_array_initializer_braces = false
 ij_java_space_within_empty_method_call_parentheses = false
 ij_java_space_within_empty_method_parentheses = false
 ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
 ij_java_spaces_around_assignment_operators = true
 ij_java_spaces_around_bitwise_operators = true
 ij_java_spaces_around_equality_operators = true
@@ -241,6 +284,7 @@ ij_java_spaces_within_braces = false
 ij_java_spaces_within_brackets = false
 ij_java_spaces_within_cast_parentheses = false
 ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_deconstruction_list = false
 ij_java_spaces_within_for_parentheses = false
 ij_java_spaces_within_if_parentheses = false
 ij_java_spaces_within_method_call_parentheses = false
@@ -252,9 +296,13 @@ ij_java_spaces_within_synchronized_parentheses = false
 ij_java_spaces_within_try_parentheses = false
 ij_java_spaces_within_while_parentheses = false
 ij_java_special_else_if_treatment = true
+ij_java_static_field_name_prefix =
+ij_java_static_field_name_suffix =
+ij_java_subclass_name_prefix =
 ij_java_subclass_name_suffix = Impl
 ij_java_ternary_operation_signs_on_next_line = false
 ij_java_ternary_operation_wrap = off
+ij_java_test_name_prefix =
 ij_java_test_name_suffix = Test
 ij_java_throws_keyword_wrap = off
 ij_java_throws_list_wrap = off

pom.xml

@@ -41,34 +41,39 @@
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
-            <version>7.4</version>
+            <version>8.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.30</version>
+            <version>1.18.36</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.16</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.14</version>
+            <version>1.5.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.18.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>6.1.1</version>
+            <version>6.1.14</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.0</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>
@@ -77,31 +82,31 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.24.2</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.8.0</version>
+            <version>5.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -118,7 +123,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -130,7 +135,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <consoleOutput>true</consoleOutput>
@@ -141,7 +146,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.12.5</version><!-- use a current version of Checkstyle -->
+                        <version>10.20.1</version><!-- use a current version of Checkstyle -->
                     </dependency>
                 </dependencies>
                 <executions>
@@ -157,20 +162,20 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.5.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.1</version>
                 <configuration>
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.13</version>
+                <version>1.7.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -192,12 +197,12 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.3.1</version>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.3</version>
+                        <version>3.11.1</version>
                         <configuration>
                             <source>${java.version}</source>
                             <encoding>${encoding}</encoding>
@@ -222,7 +227,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.7</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -296,5 +301,12 @@
         <developerConnection>scm:git:ssh://[email protected]/dm-drogeriemarkt/structured-logging.git</developerConnection>
         <url>http://github.com/dm-drogeriemarkt/structured-logging/tree/master</url>
     </scm>
+    <repositories>
+        <repository>
+            <id>maven_central</id>
+            <name>Maven Central</name>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+    </repositories>
 
 </project>

src/main/java/de/dm/prom/structuredlogging/MdcContext.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 
@@ -37,20 +38,21 @@ public final class MdcContext implements java.io.Closeable {
 
     static {
         SimpleModule module = new SimpleModule();
-        module.addSerializer(Instant.class, new ToStringSerializer());
-        module.addSerializer(LocalDate.class, new ToStringSerializer());
-        module.addSerializer(LocalDateTime.class, new ToStringSerializer());
-        module.addSerializer(OffsetDateTime.class, new ToStringSerializer());
-        module.addSerializer(OffsetTime.class, new ToStringSerializer());
-        module.addSerializer(Period.class, new ToStringSerializer());
-        module.addSerializer(ZonedDateTime.class, new ToStringSerializer());
-        module.addSerializer(LocalTime.class, new ToStringSerializer());
-        module.addSerializer(Duration.class, new ToStringSerializer());
-        module.addSerializer(MonthDay.class, new ToStringSerializer());
-        module.addSerializer(Year.class, new ToStringSerializer());
-        module.addSerializer(YearMonth.class, new ToStringSerializer());
+        module.addSerializer(Instant.class, ToStringSerializer.instance);
+        module.addSerializer(LocalDate.class, ToStringSerializer.instance);
+        module.addSerializer(LocalDateTime.class, ToStringSerializer.instance);
+        module.addSerializer(OffsetDateTime.class, ToStringSerializer.instance);
+        module.addSerializer(OffsetTime.class, ToStringSerializer.instance);
+        module.addSerializer(Period.class, ToStringSerializer.instance);
+        module.addSerializer(ZonedDateTime.class, ToStringSerializer.instance);
+        module.addSerializer(LocalTime.class, ToStringSerializer.instance);
+        module.addSerializer(Duration.class, ToStringSerializer.instance);
+        module.addSerializer(MonthDay.class, ToStringSerializer.instance);
+        module.addSerializer(Year.class, ToStringSerializer.instance);
+        module.addSerializer(YearMonth.class, ToStringSerializer.instance);
 
         DEFAULT_OBJECT_MAPPER.registerModule(module);
+        DEFAULT_OBJECT_MAPPER.registerModule(new Jdk8Module());
     }
 
     /**

src/test/java/de/dm/prom/structuredlogging/ExampleBean.java

@@ -19,6 +19,7 @@
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
+import java.util.Optional;
 
 import static java.time.DayOfWeek.MONDAY;
 import static java.time.Month.JANUARY;
@@ -42,6 +43,8 @@ class ExampleBean {
     private MonthDay monthDay;
     private Year year;
     private YearMonth yearMonth;
+    private Optional<String> emptyOptional;
+    private Optional<String> nonEmptyOptional;
 
     static ExampleBean getExample() {
         LocalDateTime importantTime = LocalDateTime.of(2019, JANUARY, 1, 13, 37);
@@ -63,6 +66,8 @@ static ExampleBean getExample() {
                 .monthDay(MonthDay.of(12, 24))
                 .year(Year.of(1984))
                 .yearMonth(YearMonth.of(2000, 8))
+                .emptyOptional(Optional.empty())
+                .nonEmptyOptional(Optional.of("Hello"))
                 .build();
     }
 }