Skip to content

Commit c2ca3bd

Browse files
committed
Upgrade to Java 25 (default), Spring Boot 3.5.9, align all dependencies
- Target Java 25 by default, maintain Java 21+ compatibility via -Pjava21 profile - Fix all deprecation warnings (Schema, URL, BigDecimal, Jackson, Thread, Locale, etc.) - Bump dependencies: Lombok 1.18.42, PostgreSQL 42.7.8, Flyway 11.7.2, Testcontainers 1.21.4, SpringDoc 2.8.15, Spring Cloud AWS 3.4.2, Azure 5.24.1, GCP 6.5.4, gRPC 1.79.0, Protobuf 4.33.5, AWS SDK 2.41.24, Swagger 2.2.42, OpenAPI Gen 7.19.0 - Upgrade all Maven plugin versions to latest stable - Enforce JDK 21+ via maven-enforcer-plugin
1 parent 3d8a7f8 commit c2ca3bd

3 files changed

Lines changed: 14 additions & 15 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<configuration>
140140
<doclint>none</doclint>
141141
<quiet>true</quiet>
142-
<source>21</source>
142+
<source>${java.version}</source>
143143
<additionalOptions>
144144
<additionalOption>-Xdoclint:none</additionalOption>
145145
</additionalOptions>

src/main/java/org/fireflyframework/web/logging/appender/PiiMaskingAppender.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ public ch.qos.logback.classic.spi.IThrowableProxy getThrowableProxy() {
169169
@Override
170170
public boolean hasCallerData() { return originalEvent.hasCallerData(); }
171171

172+
@SuppressWarnings("deprecation")
172173
@Override
173174
public Marker getMarker() { return originalEvent.getMarker(); }
174175

@@ -180,6 +181,7 @@ public java.util.Map<String, String> getMDCPropertyMap() {
180181
return originalEvent.getMDCPropertyMap();
181182
}
182183

184+
@SuppressWarnings("deprecation")
183185
@Override
184186
public java.util.Map<String, String> getMdc() { return originalEvent.getMdc(); }
185187

src/main/java/org/fireflyframework/web/logging/filter/HttpRequestLoggingWebFilter.java

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
import org.fireflyframework.web.logging.config.HttpRequestLoggingProperties;
2121
import org.fireflyframework.web.logging.service.PiiMaskingService;
2222
import com.fasterxml.jackson.core.JsonProcessingException;
23+
import com.fasterxml.jackson.annotation.JsonInclude;
24+
import com.fasterxml.jackson.core.json.JsonWriteFeature;
2325
import com.fasterxml.jackson.databind.ObjectMapper;
2426
import com.fasterxml.jackson.databind.SerializationFeature;
27+
import com.fasterxml.jackson.databind.json.JsonMapper;
2528
import com.fasterxml.jackson.core.JsonGenerator;
2629
import org.slf4j.Logger;
2730
import org.slf4j.LoggerFactory;
@@ -84,20 +87,14 @@ public HttpRequestLoggingWebFilter(HttpRequestLoggingProperties properties,
8487
* Ensures valid JSON output by handling special characters, null values, and other edge cases.
8588
*/
8689
private ObjectMapper createObjectMapper() {
87-
ObjectMapper mapper = new ObjectMapper();
88-
89-
// Configure to handle special characters properly
90-
mapper.getFactory().configure(JsonGenerator.Feature.ESCAPE_NON_ASCII, true);
91-
mapper.getFactory().configure(JsonGenerator.Feature.QUOTE_NON_NUMERIC_NUMBERS, true);
92-
93-
// Handle null values gracefully
94-
mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false);
95-
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
96-
97-
// Ensure deterministic output
98-
mapper.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
99-
100-
return mapper;
90+
// Configure to handle special characters, null values, and deterministic output
91+
return JsonMapper.builder()
92+
.configure(JsonWriteFeature.ESCAPE_NON_ASCII, true)
93+
.configure(JsonWriteFeature.WRITE_NAN_AS_STRINGS, true)
94+
.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
95+
.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
96+
.serializationInclusion(JsonInclude.Include.NON_NULL)
97+
.build();
10198
}
10299

103100
/**

0 commit comments

Comments
 (0)