Merge remote-tracking branch 'origin/main' into ethereum

# Conflicts:
#	.idea/jarRepositories.xml

Author: honeymoose

.idea/compiler.xml

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 iSharkFly
+Copyright (c) 2024 iSharkFly
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

.idea/dataSources.xml

@@ -15,12 +15,12 @@ Java 代码使用的是 JDK 17。
 
 请使用下面的联系方式和我们联系：
 
-| 联系方式名称 | 联系方式                                                 |
-|--------|------------------------------------------------------|
-| 电子邮件   | [service@ossez.com](mailto:service@ossez.com)        |
-| QQ 或微信 | 103899765                                            |
-| QQ 交流群 | 15186112                                             |
-| 社区论坛   | https://www.isharkfly.com/c/computer-program/java/15 |
+| 联系方式名称 | 联系方式                                          |
+|--------|-----------------------------------------------|
+| 电子邮件   | [service@ossez.com](mailto:service@ossez.com) |
+| QQ 或微信 | 103899765                                     |
+| QQ 交流群 | 15186112                                      |
+| 社区论坛   | https://www.ossez.com/c/open-source/java/15   |
 
 # 公众平台
 

.idea/encodings.xml

@@ -46,7 +46,7 @@ public void whenTestPeriod_thenOk() {
 
         Period period = Period.between(startDate, endDate);
 
-        logger.info(String.format("Years:%d months:%d days:%d", period.getYears(), period.getMonths(), period.getDays()));
+        logger.info("Years:{} months:{} days:{}", period.getYears(), period.getMonths(), period.getDays());
 
         assertFalse(period.isNegative());
         assertEquals(56, period.plusDays(50)

LICENSE

@@ -1,23 +1,19 @@
 package com.ossez.jackson.optionalwithjackson;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-
 import static io.restassured.path.json.JsonPath.from;
-
 import java.io.IOException;
 import java.util.Optional;
-
 import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Test;
 
 public class OptionalTypeUnitTest {
 
     ObjectMapper mapper = new ObjectMapper().registerModule(new Jdk8Module());
 
+    @Test
     public void givenPresentOptional_whenSerializing_thenValueInJson() throws JsonProcessingException {
 
         String subTitle = "The Parish Boy's Progress";
@@ -30,12 +26,6 @@ public void givenPresentOptional_whenSerializing_thenValueInJson() throws JsonPr
         assertThat(from(result).getString("subTitle")).isEqualTo(subTitle);
     }
 
-    @Test
-    public void givenFieldWithValue_whenDeserializing_thenThrowExceptio() throws JsonProcessingException {
-        String bookJson = "{ \"title\": \"Oliver Twist\", \"subTitle\": \"foo\" }";
-        Book result = mapper.readValue(bookJson, Book.class);
-    }
-
     @Test
     public void givenEmptyOptional_whenSerializing_thenNullValue() throws JsonProcessingException {
 

README.md

@@ -16,7 +16,7 @@
 
     <modules>
         <module>jackson</module>
-        <module>jackson-annotations</module>
+<!--        <module>jackson-annotations</module>-->
         <module>jackson-conversions</module>
         <module>jackson-conversions-2</module>
         <module>jackson-custom-conversions</module>