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

Jump to bottom

AVRO-4042: [java] Precache ObjectMapper to avoid recreation #3123

Merged
merged 1 commit into from
Aug 29, 2024
Merged

AVRO-4042: [java] Precache ObjectMapper to avoid recreation #3123

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: 3 additions & 1 deletion lang/java/avro/src/main/java/org/apache/avro/SchemaBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@
*/
public class SchemaBuilder {

private static final ObjectMapper MAPPER = new ObjectMapper();

private SchemaBuilder() {
}

Expand Down Expand Up @@ -2734,7 +2736,7 @@ private static JsonNode toJsonNode(Object o) {
} else {
s = GenericData.get().toString(o);
}
return new ObjectMapper().readTree(s);
return MAPPER.readTree(s);
} catch (IOException e) {
throw new SchemaBuilderException(e);
}
Expand Down
22 changes: 15 additions & 7 deletions lang/java/avro/src/main/java/org/apache/avro/util/internal/JacksonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,18 @@
import com.fasterxml.jackson.databind.util.TokenBuffer;

public class JacksonUtils {
/**
* Object Mapper used for toJsonNode method.
*/
private static final ObjectMapper MAPPER = new ObjectMapper();

/**
* This object mapper uses a special variant that has different visibility
* rules, used in objectToMap method.
*/
private static final ObjectMapper OBJECT_TO_MAP_MAPPER = MAPPER.copy()
.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE)
.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);

private JacksonUtils() {
}
Expand All @@ -50,9 +62,9 @@ public static JsonNode toJsonNode(Object datum) {
return null;
}
try {
TokenBuffer generator = new TokenBuffer(new ObjectMapper(), false);
TokenBuffer generator = new TokenBuffer(MAPPER, false);
toJson(datum, generator);
return new ObjectMapper().readTree(generator.asParser());
return MAPPER.readTree(generator.asParser());
} catch (IOException e) {
throw new AvroRuntimeException(e);
}
Expand Down Expand Up @@ -194,10 +206,6 @@ public static Object toObject(JsonNode jsonNode, Schema schema) {
* @return Its Map representation
*/
public static Map objectToMap(Object datum) {
ObjectMapper mapper = new ObjectMapper();
// we only care about fields
mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
return mapper.convertValue(datum, Map.class);
return OBJECT_TO_MAP_MAPPER.convertValue(datum, Map.class);
}
}
Loading