From 49865104e861266937f2db20157e6b724e5b3b87 Mon Sep 17 00:00:00 2001 From: Priyanka Awatramani Date: Sun, 11 Dec 2022 04:11:10 -0600 Subject: [PATCH 1/3] Issue-724 Fixed Flaky Tests --- src/main/java/com/twilio/jwt/taskrouter/Policy.java | 6 ++---- src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/twilio/jwt/taskrouter/Policy.java b/src/main/java/com/twilio/jwt/taskrouter/Policy.java index 9420e5a855..78c5423f85 100644 --- a/src/main/java/com/twilio/jwt/taskrouter/Policy.java +++ b/src/main/java/com/twilio/jwt/taskrouter/Policy.java @@ -1,9 +1,6 @@ package com.twilio.jwt.taskrouter; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.ObjectMapper; import com.twilio.http.HttpMethod; @@ -17,6 +14,7 @@ @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) +@JsonPropertyOrder({"allowed","method","postFilter","queryFilter","url"}) @ToString public class Policy { diff --git a/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java b/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java index 186326abe2..30f62950c7 100644 --- a/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java +++ b/src/test/java/com/twilio/jwt/taskrouter/PolicyTest.java @@ -27,7 +27,7 @@ public void testToJson() throws IOException { .build(); Assert.assertEquals( - "{\"url\":\"http://localhost\",\"method\":\"GET\",\"query_filter\":{\"foo\":{\"required\":true}},\"post_filter\":{},\"allow\":true}", + "{\"allow\":true,\"method\":\"GET\",\"post_filter\":{},\"query_filter\":{\"foo\":{\"required\":true}},\"url\":\"http://localhost\"}", p.toJson()); } From a437410ca170623e2e636997f384b3f9252dd3be Mon Sep 17 00:00:00 2001 From: Priyanka Awatramani Date: Sun, 11 Dec 2022 04:14:08 -0600 Subject: [PATCH 2/3] Issue-724 Fixed Flaky Tests --- src/main/java/com/twilio/jwt/taskrouter/Policy.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/twilio/jwt/taskrouter/Policy.java b/src/main/java/com/twilio/jwt/taskrouter/Policy.java index 78c5423f85..0712007a1c 100644 --- a/src/main/java/com/twilio/jwt/taskrouter/Policy.java +++ b/src/main/java/com/twilio/jwt/taskrouter/Policy.java @@ -1,6 +1,10 @@ package com.twilio.jwt.taskrouter; -import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.ObjectMapper; import com.twilio.http.HttpMethod; From 08725b7877614825e8d43372229ec2f32870d8a5 Mon Sep 17 00:00:00 2001 From: Priyanka Awatramani Date: Mon, 12 Dec 2022 17:23:07 -0600 Subject: [PATCH 3/3] Changed to JSONPropertyOrder(alphabetic = true) --- src/main/java/com/twilio/jwt/taskrouter/Policy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/twilio/jwt/taskrouter/Policy.java b/src/main/java/com/twilio/jwt/taskrouter/Policy.java index 0712007a1c..d7969eb28a 100644 --- a/src/main/java/com/twilio/jwt/taskrouter/Policy.java +++ b/src/main/java/com/twilio/jwt/taskrouter/Policy.java @@ -18,7 +18,7 @@ @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -@JsonPropertyOrder({"allowed","method","postFilter","queryFilter","url"}) +@JsonPropertyOrder(alphabetic = true) @ToString public class Policy {