From 69376e46685ef598aaad5e8fd823ccbd2c1c4bff Mon Sep 17 00:00:00 2001 From: Prathyush Reddy Lakkidi Date: Wed, 22 Nov 2023 23:56:41 -0600 Subject: [PATCH 1/3] fix flaky tests --- .../java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java index fa418c26cc1..bf38f6b0793 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java @@ -21,8 +21,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.stream.Collectors; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.QueryParam; @@ -45,7 +48,10 @@ public void extendedXmlJavaTypeAdapter() { } private void correctValueType(Class clazz) { - Field field = clazz.getDeclaredFields()[0]; + Field[] fields = clazz.getDeclaredFields(); + Field field = Arrays.stream(fields) + .filter(f -> !f.isSynthetic() && !Modifier.isFinal(f.getModifiers())) + .collect(Collectors.toList()).get(0); Annotation[] paramAnns = field.getDeclaredAnnotations(); Class valueType = JAXBUtils.getValueTypeFromAdapter(LocalDate.class, LocalDate.class, paramAnns); Assert.assertEquals(String.class, valueType); From c22c45f9d1c26c443ee925e5af591cf8904ce74c Mon Sep 17 00:00:00 2001 From: Prathyush Reddy Lakkidi Date: Sun, 10 Dec 2023 15:45:48 -0600 Subject: [PATCH 2/3] made the class static --- .../org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java index bf38f6b0793..0b1bdfb1bc7 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java @@ -21,11 +21,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.util.Arrays; -import java.util.stream.Collectors; import jakarta.validation.constraints.NotNull; import jakarta.ws.rs.QueryParam; @@ -49,15 +46,12 @@ public void extendedXmlJavaTypeAdapter() { private void correctValueType(Class clazz) { Field[] fields = clazz.getDeclaredFields(); - Field field = Arrays.stream(fields) - .filter(f -> !f.isSynthetic() && !Modifier.isFinal(f.getModifiers())) - .collect(Collectors.toList()).get(0); - Annotation[] paramAnns = field.getDeclaredAnnotations(); + Annotation[] paramAnns = fields[0].getDeclaredAnnotations(); Class valueType = JAXBUtils.getValueTypeFromAdapter(LocalDate.class, LocalDate.class, paramAnns); Assert.assertEquals(String.class, valueType); } - public class CustomerDetailsWithExtendedAdapter { + public static class CustomerDetailsWithExtendedAdapter { @NotNull @QueryParam("birthDate") @XmlJavaTypeAdapter(LocalDateXmlAdapter.class) @@ -72,7 +66,7 @@ public void setBirthDate(LocalDate birthDate) { } } - public class CustomerDetailsWithSimpleAdapter { + public static class CustomerDetailsWithSimpleAdapter { @NotNull @QueryParam("birthDate") @XmlJavaTypeAdapter(LocalDateAdapter.class) From 27da820ff0d217b84b109558c786ac821afbbbbf Mon Sep 17 00:00:00 2001 From: Prathyush Reddy Lakkidi Date: Sun, 10 Dec 2023 15:47:38 -0600 Subject: [PATCH 3/3] remove unnecessary changes --- .../test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java index 0b1bdfb1bc7..689acd58109 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXBUtilsTest.java @@ -45,8 +45,8 @@ public void extendedXmlJavaTypeAdapter() { } private void correctValueType(Class clazz) { - Field[] fields = clazz.getDeclaredFields(); - Annotation[] paramAnns = fields[0].getDeclaredAnnotations(); + Field field = clazz.getDeclaredFields()[0]; + Annotation[] paramAnns = field.getDeclaredAnnotations(); Class valueType = JAXBUtils.getValueTypeFromAdapter(LocalDate.class, LocalDate.class, paramAnns); Assert.assertEquals(String.class, valueType); }