From 659271cf61780e8bc96409322b0dd588cbbfd205 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 6 Apr 2026 16:48:50 +0200 Subject: [PATCH] Fix BridgeMethodResolverTests.findBridgedMethodInHierarchy() in Eclipse (cherry picked from commit bfbfe4a572d63cf517c3b48a3b23c564a9a028b8) --- .../springframework/core/BridgeMethodResolverTests.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java index 115a558f2f0..7b5ccd5bcdd 100644 --- a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java @@ -74,7 +74,12 @@ class BridgeMethodResolverTests { assertThat(bridgedMethod.isBridge()).isFalse(); assertThat(bridgedMethod.getName()).isEqualTo("add"); assertThat(bridgedMethod.getParameterCount()).isEqualTo(1); - assertThat(bridgedMethod.getParameterTypes()[0]).isEqualTo(Date.class); + if (IdeUtils.runningInEclipse()) { + assertThat(bridgedMethod.getParameterTypes()).containsOnly(Serializable.class); + } + else { + assertThat(bridgedMethod.getParameterTypes()).containsOnly(Date.class); + } } @Test @@ -491,10 +496,12 @@ class BridgeMethodResolverTests { interface DefaultMethods extends InterfaceMethods { + @Override default Integer getValue() { return 0; } + @Override default Integer[] getValues() { return new Integer[0]; }