From 6fca479dc0c9bee4624baad5a7f84bf44090e86c Mon Sep 17 00:00:00 2001 From: Charles Date: Sun, 21 Nov 2021 15:36:31 -0600 Subject: [PATCH] fix flaky test --- .../data/gemfire/repository/sample/Person.java | 2 ++ .../serialization/json/JSONRegionAdviceIntegrationTests.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java index 49bb737b2..c8eb3848f 100644 --- a/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java +++ b/src/test/java/org/springframework/data/gemfire/repository/sample/Person.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.PersistenceConstructor; import org.springframework.data.annotation.Transient; @@ -34,6 +35,7 @@ */ @Region("simple") @JsonIgnoreProperties("name") +@JsonPropertyOrder({"address", "firstname", "id", "lastname"}) public class Person implements Serializable { private static final long serialVersionUID = 508843183613325255L; diff --git a/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java b/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java index 89e5d49a7..c3e56cd33 100644 --- a/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java +++ b/src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java @@ -27,8 +27,10 @@ import javax.annotation.Resource; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationConfig; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.SelectResults; @@ -78,7 +80,8 @@ public void setup() { private static String toJson(Object bean) { try { - return new ObjectMapper().writeValueAsString(bean); + ObjectMapper mapper = new ObjectMapper().configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); + return mapper.writeValueAsString(bean); } catch (JsonProcessingException cause) { throw newIllegalArgumentException(cause, "Failed to convert object (%1$s) into JSON", bean);