From 4ccf795ee0d8c3d7bccea782e5ebbe17dfc3e43f Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 2 Jan 2024 23:34:50 +0800 Subject: [PATCH] fix test --- .../core/annotation/AnnotatedElementUtil.java | 10 ++--- .../HierarchicalAnnotatedElements.java | 6 +-- .../HierarchicalAnnotatedElementTest.java | 44 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java index cbc9e094e..90f4d7906 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotatedElementUtil.java @@ -537,9 +537,9 @@ public class AnnotatedElementUtil { return emptyElement(); } if (resolved) { - return HierarchicalAnnotatedElements.create(element, (es, e) -> getResolvedMetaElementCache(e)); + return HierarchicalAnnotatedElements.of(element, (es, e) -> getResolvedMetaElementCache(e)); } - return HierarchicalAnnotatedElements.create(element, (es, e) -> getMetaElementCache(e)); + return HierarchicalAnnotatedElements.of(element, (es, e) -> getMetaElementCache(e)); } /** @@ -560,9 +560,9 @@ public class AnnotatedElementUtil { return emptyElement(); } if (resolved) { - return HierarchicalAnnotatedElements.create(element, (es, e) -> getResolvedRepeatableMetaElementCache(e)); + return HierarchicalAnnotatedElements.of(element, (es, e) -> getResolvedRepeatableMetaElementCache(e)); } - return HierarchicalAnnotatedElements.create(element, (es, e) -> getRepeatableMetaElementCache(e)); + return HierarchicalAnnotatedElements.of(element, (es, e) -> getRepeatableMetaElementCache(e)); } /** @@ -575,7 +575,7 @@ public class AnnotatedElementUtil { */ public static AnnotatedElement toHierarchyElement(final AnnotatedElement element) { return ObjUtil.defaultIfNull( - element, ele -> HierarchicalAnnotatedElements.create(ele, (es, e) -> e), emptyElement() + element, ele -> HierarchicalAnnotatedElements.of(ele, (es, e) -> e), emptyElement() ); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java index ca8c9b5aa..de904a7d7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/elements/HierarchicalAnnotatedElements.java @@ -88,8 +88,8 @@ public class HierarchicalAnnotatedElements implements AnnotatedElement, Iterable * @return {@code HierarchicalAnnotatedElements}实例， * 当{@code element}也是一个{@code HierarchicalAnnotatedElements}时，返回{@code element}本身 */ - public static HierarchicalAnnotatedElements create(final AnnotatedElement element) { - return create(element, (es, e) -> e); + public static HierarchicalAnnotatedElements of(final AnnotatedElement element) { + return of(element, (es, e) -> e); } /** @@ -100,7 +100,7 @@ public class HierarchicalAnnotatedElements implements AnnotatedElement, Iterable * @return {@code HierarchicalAnnotatedElements}实例， * 当{@code element}也是一个{@code HierarchicalAnnotatedElements}时，返回{@code element}本身 */ - public static HierarchicalAnnotatedElements create( + public static HierarchicalAnnotatedElements of( final AnnotatedElement element, final BiFunction, AnnotatedElement, AnnotatedElement> elementFactory) { return element instanceof HierarchicalAnnotatedElements ? diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java index 6f2fa1b94..65d3a6499 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/annotation/HierarchicalAnnotatedElementTest.java @@ -36,54 +36,54 @@ public class HierarchicalAnnotatedElementTest { @Test public void testCreateFromMethod() { final Method method1 = Foo.class.getDeclaredMethod("method"); - HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(method1); + HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(method1); Assertions.assertEquals(3, elements.getElementMappings().size()); final Method method2 = Foo.class.getDeclaredMethod("method2"); - elements = HierarchicalAnnotatedElements.create(method2); + elements = HierarchicalAnnotatedElements.of(method2); Assertions.assertEquals(1, elements.getElementMappings().size()); } @Test public void testCreate() { - HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); Assertions.assertNotNull(elements); Assertions.assertEquals(3, elements.getElementMappings().size()); - elements = HierarchicalAnnotatedElements.create(Foo.class, ELEMENT_MAPPING_FACTORY); + elements = HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY); Assertions.assertNotNull(elements); Assertions.assertEquals(3, elements.getElementMappings().size()); - Assertions.assertEquals(elements, HierarchicalAnnotatedElements.create(elements, ELEMENT_MAPPING_FACTORY)); + Assertions.assertEquals(elements, HierarchicalAnnotatedElements.of(elements, ELEMENT_MAPPING_FACTORY)); } @Test public void testEquals() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class, ELEMENT_MAPPING_FACTORY); - Assertions.assertEquals(elements, HierarchicalAnnotatedElements.create(Foo.class, ELEMENT_MAPPING_FACTORY)); - Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.create(Super.class, ELEMENT_MAPPING_FACTORY)); - Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.create(Foo.class, (es, e) -> e)); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY); + Assertions.assertEquals(elements, HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY)); + Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.of(Super.class, ELEMENT_MAPPING_FACTORY)); + Assertions.assertNotEquals(elements, HierarchicalAnnotatedElements.of(Foo.class, (es, e) -> e)); Assertions.assertNotEquals(elements, null); } @Test public void testHashCode() { - final int hashCode = HierarchicalAnnotatedElements.create(Foo.class, ELEMENT_MAPPING_FACTORY).hashCode(); - Assertions.assertEquals(hashCode, HierarchicalAnnotatedElements.create(Foo.class, ELEMENT_MAPPING_FACTORY).hashCode()); - Assertions.assertNotEquals(hashCode, HierarchicalAnnotatedElements.create(Super.class, ELEMENT_MAPPING_FACTORY).hashCode()); - Assertions.assertNotEquals(hashCode, HierarchicalAnnotatedElements.create(Foo.class, (es, e) -> e).hashCode()); + final int hashCode = HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY).hashCode(); + Assertions.assertEquals(hashCode, HierarchicalAnnotatedElements.of(Foo.class, ELEMENT_MAPPING_FACTORY).hashCode()); + Assertions.assertNotEquals(hashCode, HierarchicalAnnotatedElements.of(Super.class, ELEMENT_MAPPING_FACTORY).hashCode()); + Assertions.assertNotEquals(hashCode, HierarchicalAnnotatedElements.of(Foo.class, (es, e) -> e).hashCode()); } @Test public void testGetElement() { final AnnotatedElement element = Foo.class; - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(element, ELEMENT_MAPPING_FACTORY); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(element, ELEMENT_MAPPING_FACTORY); Assertions.assertSame(element, elements.getElement()); } @Test public void testIsAnnotationPresent() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); Assertions.assertTrue(elements.isAnnotationPresent(Annotation1.class)); Assertions.assertTrue(elements.isAnnotationPresent(Annotation2.class)); Assertions.assertTrue(elements.isAnnotationPresent(Annotation3.class)); @@ -91,7 +91,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetAnnotations() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); final Annotation2 annotation2 = Super.class.getAnnotation(Annotation2.class); @@ -103,7 +103,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetAnnotation() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); Assertions.assertEquals(annotation1, elements.getAnnotation(Annotation1.class)); @@ -117,7 +117,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetAnnotationsByType() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); Assertions.assertArrayEquals(new Annotation[]{ annotation1 }, elements.getAnnotationsByType(Annotation1.class)); @@ -131,7 +131,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetDeclaredAnnotationsByType() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); Assertions.assertArrayEquals(new Annotation[]{ annotation1 }, elements.getDeclaredAnnotationsByType(Annotation1.class)); @@ -145,7 +145,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetDeclaredAnnotation() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); Assertions.assertEquals(annotation1, elements.getDeclaredAnnotation(Annotation1.class)); @@ -159,7 +159,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testGetDeclaredAnnotations() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Annotation1 annotation1 = Foo.class.getAnnotation(Annotation1.class); final Annotation2 annotation2 = Super.class.getAnnotation(Annotation2.class); @@ -171,7 +171,7 @@ public class HierarchicalAnnotatedElementTest { @Test public void testIterator() { - final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.create(Foo.class); + final HierarchicalAnnotatedElements elements = HierarchicalAnnotatedElements.of(Foo.class); final Iterator iterator = elements.iterator(); Assertions.assertNotNull(iterator);