Cleanup and simplify implementation

#433

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/AbstractTestRuleAdapter.java

@@ -19,8 +19,8 @@ public abstract class AbstractTestRuleAdapter implements GenericBeforeAndAfterAd
 
 	protected final TestRule target;
 
-	public AbstractTestRuleAdapter(TestRule target) {
-		this.target = target;
+	public AbstractTestRuleAdapter(RuleAnnotatedMember annotatedMember) {
+		this.target = annotatedMember.getTestRuleInstance();
 	}
 
 	protected void executeMethod(String name, TestRule externalResource) {

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/AbstractTestRuleSupport.java

@@ -24,13 +24,10 @@
 abstract class AbstractTestRuleSupport implements BeforeEachCallback, AfterEachCallback {
 
 	private final Class<Rule> annotationType = Rule.class;
-
-	private final Class<? extends TestRule> ruleType;
+	private final Class<? extends TestRule> ruleType = TestRule.class;
 	private final Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator;
 
-	protected AbstractTestRuleSupport(Class<? extends TestRule> ruleType,
-			Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
-		this.ruleType = ruleType;
+	protected AbstractTestRuleSupport(Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
 		this.adapterGenerator = adapterGenerator;
 	}
 

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/ExternalResourceAdapter.java

@@ -10,12 +10,10 @@
 
 package org.junit.jupiter.engine.vintage.rulesupport;
 
-import org.junit.rules.TestRule;
-
 public class ExternalResourceAdapter extends AbstractTestRuleAdapter {
 
-	public ExternalResourceAdapter(TestRule target) {
-		super(target);
+	public ExternalResourceAdapter(RuleAnnotatedMember annotatedMember) {
+		super(annotatedMember);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/ExternalResourceSupport.java

@@ -15,16 +15,13 @@
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.TestExtensionContext;
-import org.junit.rules.TestRule;
 
 public class ExternalResourceSupport implements BeforeEachCallback, AfterEachCallback {
 
-	private final Class<? extends TestRule> ruleType = TestRule.class;
-	private final Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator = annotatedMember -> new ExternalResourceAdapter(
-		annotatedMember.getTestRuleInstance());
+	private final Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator = ExternalResourceAdapter::new;
 
-	private AbstractTestRuleSupport fieldSupport = new TestRuleFieldSupport(ruleType, adapterGenerator);
-	private AbstractTestRuleSupport methodSupport = new TestRuleMethodSupport(ruleType, adapterGenerator);
+	private final AbstractTestRuleSupport fieldSupport = new TestRuleFieldSupport(this.adapterGenerator);
+	private final AbstractTestRuleSupport methodSupport = new TestRuleMethodSupport(this.adapterGenerator);
 
 	@Override
 	public void beforeEach(TestExtensionContext context) throws Exception {

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/RuleAnnotatedField.java

@@ -12,14 +12,11 @@
 
 import java.lang.reflect.Field;
 
-import org.junit.jupiter.api.extension.TestExtensionContext;
 import org.junit.rules.TestRule;
 
 class RuleAnnotatedField extends AbstractRuleAnnotatedMember {
 
-	RuleAnnotatedField(TestExtensionContext context, Field testRuleField) {
-		Object testInstance = context.getTestInstance();
-
+	RuleAnnotatedField(Object testInstance, Field testRuleField) {
 		try {
 			this.testRuleInstance = (TestRule) testRuleField.get(testInstance);
 		}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/RuleAnnotatedMethod.java

@@ -12,15 +12,12 @@
 
 import java.lang.reflect.Method;
 
-import org.junit.jupiter.api.extension.TestExtensionContext;
 import org.junit.platform.commons.util.ReflectionUtils;
 import org.junit.rules.TestRule;
 
 class RuleAnnotatedMethod extends AbstractRuleAnnotatedMember {
 
-	RuleAnnotatedMethod(TestExtensionContext context, Method member) {
-		Object testInstance = context.getTestInstance();
-
+	RuleAnnotatedMethod(Object testInstance, Method member) {
 		//no args
 		this.testRuleInstance = (TestRule) ReflectionUtils.invokeMethod(member, testInstance);
 	}

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/TestRuleFieldSupport.java

@@ -20,18 +20,16 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.extension.TestExtensionContext;
-import org.junit.rules.TestRule;
 
 class TestRuleFieldSupport extends AbstractTestRuleSupport {
 
-	TestRuleFieldSupport(Class<? extends TestRule> ruleType,
-			Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
-		super(ruleType, adapterGenerator);
+	TestRuleFieldSupport(Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
+		super(adapterGenerator);
 	}
 
 	@Override
 	protected RuleAnnotatedMember createRuleAnnotatedMember(TestExtensionContext context, Member member) {
-		return new RuleAnnotatedField(context, (Field) member);
+		return new RuleAnnotatedField(context.getTestInstance(), (Field) member);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/TestRuleMethodSupport.java

@@ -20,18 +20,16 @@
 
 import org.junit.jupiter.api.extension.TestExtensionContext;
 import org.junit.platform.commons.util.AnnotationUtils;
-import org.junit.rules.TestRule;
 
 class TestRuleMethodSupport extends AbstractTestRuleSupport {
 
-	TestRuleMethodSupport(Class<? extends TestRule> ruleType,
-			Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
-		super(ruleType, adapterGenerator);
+	TestRuleMethodSupport(Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator) {
+		super(adapterGenerator);
 	}
 
 	@Override
 	protected RuleAnnotatedMember createRuleAnnotatedMember(TestExtensionContext context, Member member) {
-		return new RuleAnnotatedMethod(context, (Method) member);
+		return new RuleAnnotatedMethod(context.getTestInstance(), (Method) member);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/VerifierAdapter.java

@@ -10,12 +10,10 @@
 
 package org.junit.jupiter.engine.vintage.rulesupport;
 
-import org.junit.rules.TestRule;
-
 public class VerifierAdapter extends AbstractTestRuleAdapter {
 
-	public VerifierAdapter(TestRule target) {
-		super(target);
+	public VerifierAdapter(RuleAnnotatedMember annotatedMember) {
+		super(annotatedMember);
 	}
 
 	@Override

junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/vintage/rulesupport/VerifierSupport.java

@@ -14,16 +14,13 @@
 
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.TestExtensionContext;
-import org.junit.rules.TestRule;
 
 public class VerifierSupport implements AfterEachCallback {
 
-	private final Class<? extends TestRule> ruleType = TestRule.class;
-	private final Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator = annotatedMember -> new VerifierAdapter(
-		annotatedMember.getTestRuleInstance());
+	private final Function<RuleAnnotatedMember, AbstractTestRuleAdapter> adapterGenerator = VerifierAdapter::new;
 
-	private AbstractTestRuleSupport fieldSupport = new TestRuleFieldSupport(ruleType, adapterGenerator);
-	private AbstractTestRuleSupport methodSupport = new TestRuleMethodSupport(ruleType, adapterGenerator);
+	private AbstractTestRuleSupport fieldSupport = new TestRuleFieldSupport(this.adapterGenerator);
+	private AbstractTestRuleSupport methodSupport = new TestRuleMethodSupport(this.adapterGenerator);
 
 	@Override
 	public void afterEach(TestExtensionContext context) throws Exception {