Skip to content

[fit] 优化序列化器逻辑 #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeCasterX merged 1 commit into from
Apr 30, 2025
Merged

[fit] 优化序列化器逻辑 #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...-plugin/src/main/java/modelengine/fel/maven/complie/plugin/UrlClassLoaderInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import static modelengine.fit.serialization.json.jackson.JacksonObjectSerializer.DEFAULT_DATE_FORMAT;
import static modelengine.fit.serialization.json.jackson.JacksonObjectSerializer.DEFAULT_DATE_TIME_FORMAT;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

import modelengine.fel.maven.complie.util.JsonUtils;
import modelengine.fel.tool.ToolSchema;
import modelengine.fel.tool.info.entity.ToolJsonEntity;
import modelengine.fit.serialization.json.jackson.JacksonObjectSerializer;
Expand All @@ -28,7 +28,6 @@
import java.nio.file.Paths;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream;

/**
Expand Down Expand Up @@ -80,7 +79,9 @@ public void outputToolManifest(String outputDirectory, ToolJsonEntity toolJsonEn
DEFAULT_DATE_FORMAT,
"Asia/Shanghai"
);
serializer.getMapper().writerWithDefaultPrettyPrinter().writeValue(jsonFile, toolJsonEntity);
ObjectMapper objectMapper = serializer.getMapper().copy();
objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
objectMapper.writerWithDefaultPrettyPrinter().writeValue(jsonFile, toolJsonEntity);
log.info("Write tool json successfully. [file={}]", jsonFile.getName());
}
}
4 changes: 1 addition & 3 deletions ...son/src/main/java/modelengine/fit/serialization/json/jackson/JacksonObjectSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import static modelengine.fitframework.inspection.Validation.notNull;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonFactoryBuilder;
import com.fasterxml.jackson.core.JsonGenerator;
Expand Down Expand Up @@ -84,8 +83,7 @@ public JacksonObjectSerializer(@Value("${date-time-format}") String dateTimeForm
.maxStringLength(Integer.MAX_VALUE)
.build()).build()).configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.setAnnotationIntrospector(new FitAnnotationIntrospector())
.setVisibility(visibilityChecker)
.setSerializationInclusion(JsonInclude.Include.NON_NULL);
.setVisibility(visibilityChecker);
SimpleModule module = new SimpleModule();
module.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(dateTimeFormat));
module.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(dateTimeFormat));
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/modelengine/fit/serialization/json/jackson/JacksonObjectSerializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ void givenAliasJsonThenDeserializeOk() {
@Test
@DisplayName("当存在别名时，序列化成功")
void givenAliasObjectThenSerializeOk() {
String expect = "{\"first_name\":\"foo\"}";
String expect = "{\"lastName\":null,\"first_name\":\"foo\",\"person_name\":null}";
PersonAlias personAlias = new PersonAlias();
personAlias.firstName("foo");
assertThat(this.jsonSerializer.serialize(personAlias)).isEqualTo(expect);
Expand All @@ -229,7 +229,7 @@ void givenJsonPropertyThenDeserializeOriginOk() {
@Test
@DisplayName("当使用原生注解，存在别名时，序列化成功")
void givenJsonPropertyThenSerializeOriginOk() {
String expect = "{\"lastName\":\"bar\"}";
String expect = "{\"lastName\":\"bar\",\"first_name\":null,\"person_name\":null}";
PersonAlias personAlias = new PersonAlias();
personAlias.lastName("bar");
assertThat(this.jsonSerializer.serialize(personAlias)).isEqualTo(expect);
Expand Down