Skip to content

Prepare for Jackson 3.2 #874

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

Open
snazy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prepare for Jackson 3.2 #874

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
4 changes: 1 addition & 3 deletions jackson3/src/main/java/org/projectnessie/cel/types/jackson3/Jackson3Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import tools.jackson.databind.cfg.SerializationContexts;
import tools.jackson.databind.json.JsonMapper;
import tools.jackson.databind.ser.SerializationContextExt;
import tools.jackson.databind.ser.jdk.EnumSerializer;
import tools.jackson.databind.type.TypeFactory;

/**
Expand Down Expand Up @@ -173,10 +172,9 @@ JacksonEnumDescription enumDescription(Class<?> clazz) {
}

private JacksonEnumDescription computeEnumDescription(Class<?> clazz) {
ValueSerializer<?> ser = serializationContextExt.findValueSerializer(clazz);
JavaType javaType = typeFactory.constructType(clazz);

JacksonEnumDescription enumDesc = new JacksonEnumDescription(javaType, (EnumSerializer) ser);
JacksonEnumDescription enumDesc = new JacksonEnumDescription(javaType);
enumMap.put(clazz, enumDesc);

enumDesc.buildValues().forEach(v -> enumValues.put(v.fullyQualifiedName(), v));
Expand Down
10 changes: 7 additions & 3 deletions jackson3/src/main/java/org/projectnessie/cel/types/jackson3/JacksonEnumDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,25 @@
*/
package org.projectnessie.cel.types.jackson3;

import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.projectnessie.cel.common.types.pb.Checked;
import tools.jackson.databind.JavaType;
import tools.jackson.databind.ser.jdk.EnumSerializer;

final class JacksonEnumDescription {

private final String name;
private final com.google.api.expr.v1alpha1.Type pbType;
private final List<Enum<?>> enumValues;

JacksonEnumDescription(JavaType javaType, EnumSerializer ser) {
JacksonEnumDescription(JavaType javaType) {
this.name = javaType.getRawClass().getName().replace('$', '.');
this.enumValues = ser.getEnumValues().enums();
this.enumValues =
Arrays.stream(javaType.getRawClass().getEnumConstants())
.map(enumValue -> (Enum<?>) enumValue)
.collect(Collectors.toList());
this.pbType = Checked.checkedInt;
}

Expand Down