Skip to content
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

json: update jackson to 2.16.1 #59

Merged
merged 2 commits into from
Jan 10, 2024
Merged

json: update jackson to 2.16.1 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d102f78
json: update jackson to 2.16.1
Kent-Kuan Dec 28, 2023
d7d0d43
Merge branch 'master' into json
neowu Jan 10, 2024
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
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ subprojects {

val elasticVersion = "8.11.1"
val kafkaVersion = "3.6.1"
val jacksonVersion = "2.15.3"
val jacksonVersion = "2.16.1"
val junitVersion = "5.10.1"
val mockitoVersion = "5.8.0"
val assertjVersion = "3.25.1"
Expand Down
12 changes: 7 additions & 5 deletions core-ng/src/main/java/core/framework/internal/json/JSONAnnotationIntrospector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.AnnotationIntrospector;
import com.fasterxml.jackson.databind.PropertyName;
import com.fasterxml.jackson.databind.cfg.MapperConfig;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
import core.framework.api.json.Property;

import java.io.Serial;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;

Expand All @@ -29,12 +31,12 @@ public PropertyName findNameForSerialization(Annotated annotated) {
}

@Override
public String[] findEnumValues(Class<?> enumType, Enum<?>[] enumValues, String[] names) {
public String[] findEnumValues(MapperConfig<?> config, AnnotatedClass annotatedClass, Enum<?>[] enumValues, String[] names) {
Map<String, String> mappings = null;
for (Field field : enumType.getDeclaredFields()) {
if (!field.isEnumConstant()) continue;
for (AnnotatedField field : annotatedClass.fields()) {
if (!field.getAnnotated().isEnumConstant()) continue;

Property enumValue = field.getDeclaredAnnotation(Property.class);
Property enumValue = field.getAnnotation(Property.class);
if (enumValue == null) continue;

String value = enumValue.name();
Expand Down
Loading