Skip to content

Commit 34f209d

Browse files
committed
Address review comments
1 parent c700472 commit 34f209d

2 files changed

Lines changed: 10 additions & 14 deletions

File tree

hudi-common/src/main/java/org/apache/hudi/common/util/JsonUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
package org.apache.hudi.common.util;
2121

2222
import com.fasterxml.jackson.annotation.JsonAutoDetect;
23+
import com.fasterxml.jackson.annotation.PropertyAccessor;
2324
import com.fasterxml.jackson.databind.DeserializationFeature;
2425
import com.fasterxml.jackson.databind.ObjectMapper;
2526

@@ -30,12 +31,11 @@ public class JsonUtils {
3031
MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
3132
// We need to exclude custom getters, setters and creators which can use member fields
3233
// to derive new fields, so that they are not included in the serialization
33-
MAPPER.setVisibility(
34-
MAPPER.getSerializationConfig().getDefaultVisibilityChecker()
35-
.withFieldVisibility(JsonAutoDetect.Visibility.ANY)
36-
.withGetterVisibility(JsonAutoDetect.Visibility.NONE)
37-
.withSetterVisibility(JsonAutoDetect.Visibility.NONE)
38-
.withCreatorVisibility(JsonAutoDetect.Visibility.NONE));
34+
MAPPER.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
35+
MAPPER.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE);
36+
MAPPER.setVisibility(PropertyAccessor.IS_GETTER, JsonAutoDetect.Visibility.NONE);
37+
MAPPER.setVisibility(PropertyAccessor.SETTER, JsonAutoDetect.Visibility.NONE);
38+
MAPPER.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.NONE);
3939
}
4040

4141
public static ObjectMapper getObjectMapper() {

hudi-common/src/test/java/org/apache/hudi/common/model/TestHoodieCommitMetadata.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
package org.apache.hudi.common.model;
2020

2121
import org.apache.hudi.common.testutils.HoodieTestUtils;
22+
import org.apache.hudi.common.util.CollectionUtils;
2223
import org.apache.hudi.common.util.FileIOUtils;
2324
import org.apache.hudi.common.util.JsonUtils;
2425

2526
import org.junit.jupiter.api.Test;
2627

2728
import java.io.IOException;
28-
import java.util.ArrayList;
2929
import java.util.Arrays;
30-
import java.util.Iterator;
3130
import java.util.List;
3231
import java.util.stream.Collectors;
3332

@@ -47,12 +46,9 @@ public static void verifyMetadataFieldNames(
4746
HoodieCommitMetadata commitMetadata, List<String> expectedFieldNameList)
4847
throws IOException {
4948
String serializedCommitMetadata = commitMetadata.toJsonString();
50-
Iterator<String> fieldNameIterator = JsonUtils.getObjectMapper()
51-
.readTree(serializedCommitMetadata).fieldNames();
52-
List<String> actualFieldNameList = new ArrayList<>();
53-
while (fieldNameIterator.hasNext()) {
54-
actualFieldNameList.add(fieldNameIterator.next());
55-
}
49+
List<String> actualFieldNameList = CollectionUtils.toStream(
50+
JsonUtils.getObjectMapper().readTree(serializedCommitMetadata).fieldNames())
51+
.collect(Collectors.toList());
5652
assertEquals(
5753
expectedFieldNameList.stream().sorted().collect(Collectors.toList()),
5854
actualFieldNameList.stream().sorted().collect(Collectors.toList())

0 commit comments

Comments
 (0)