From 43df829aeef59d65b951a1eff3daf3c6fadbaee1 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@bloomberg.net>
Date: Fri, 31 Dec 2021 09:23:05 +0000
Subject: [PATCH] code review feedback: reduce scope of the 'unchecked cast'
 warning fix a.k.a. @SuppressWarnings('unchecked')

---
 src/main/java/org/junit/runners/model/FrameworkMember.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/junit/runners/model/FrameworkMember.java b/src/main/java/org/junit/runners/model/FrameworkMember.java
index 3409a7f1c184..cfa3ed8492b2 100644
--- a/src/main/java/org/junit/runners/model/FrameworkMember.java
+++ b/src/main/java/org/junit/runners/model/FrameworkMember.java
@@ -12,7 +12,6 @@ public abstract class FrameworkMember<T extends FrameworkMember<T>> implements
         Annotatable {
     abstract boolean isShadowedBy(T otherMember);
 
-    @SuppressWarnings("unchecked")
     T handlePossibleBridgeMethod(List<T> members) {
         for (int i = members.size() - 1; i >=0; i--) {
             T otherMember = members.get(i);
@@ -31,7 +30,11 @@ T handlePossibleBridgeMethod(List<T> members) {
             }
         }
         // No shadow or bridge method found. The caller should add *this* member.
-        return (T) this;
+        FrameworkMember<? extends T> thisMember = this;
+        @SuppressWarnings("unchecked")
+        T result = (T) thisMember;
+
+        return result;
     }
 
     abstract boolean isBridgeMethod();