From 45064f7904d58264bcf1c3ae7368c7731006f215 Mon Sep 17 00:00:00 2001
From: Kevin Cooney <kcooney@users.noreply.github.com>
Date: Sun, 16 Apr 2017 01:06:36 -0700
Subject: [PATCH] Fix minor style issues

---
 .../java/org/junit/runners/Parameterized.java  |  6 +++---
 .../BlockJUnit4ClassRunnerWithParameters.java  | 18 ++++++++++--------
 .../running/classes/ParameterizedTestTest.java |  6 +++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/junit/runners/Parameterized.java b/src/main/java/org/junit/runners/Parameterized.java
index 667e3219b209..121c954daa9f 100644
--- a/src/main/java/org/junit/runners/Parameterized.java
+++ b/src/main/java/org/junit/runners/Parameterized.java
@@ -275,9 +275,9 @@ protected void collectInitializationErrors(List<Throwable> errors) {
         validatePublicStaticVoidMethods(Parameterized.AfterParam.class, errors);
     }
 
-    private void validatePublicStaticVoidMethods(Class<? extends Annotation> annotation,
-                                                 List<Throwable> errors) {
-        final List<FrameworkMethod> methods = getTestClass().getAnnotatedMethods(annotation);
+    private void validatePublicStaticVoidMethods(
+            Class<? extends Annotation> annotation, List<Throwable> errors) {
+        List<FrameworkMethod> methods = getTestClass().getAnnotatedMethods(annotation);
         for (FrameworkMethod eachTestMethod : methods) {
             eachTestMethod.validatePublicVoid(true, errors);
         }
diff --git a/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java b/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java
index f28a43cb8a4a..b842ee0666a4 100644
--- a/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java
+++ b/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java
@@ -137,7 +137,7 @@ protected void validateFields(List<Throwable> errors) {
     }
 
     @Override
-    protected Statement classBlock(final RunNotifier notifier) {
+    protected Statement classBlock(RunNotifier notifier) {
         Statement statement = childrenInvoker(notifier);
         statement = withBeforeParams(statement);
         statement = withAfterParams(statement);
@@ -145,7 +145,7 @@ protected Statement classBlock(final RunNotifier notifier) {
     }
 
     private Statement withBeforeParams(Statement statement) {
-        final List<FrameworkMethod> befores = getTestClass()
+        List<FrameworkMethod> befores = getTestClass()
                 .getAnnotatedMethods(Parameterized.BeforeParam.class);
         return befores.isEmpty() ? statement : new RunBeforeParams(statement, befores);
     }
@@ -162,15 +162,16 @@ private class RunBeforeParams extends Statement {
         @Override
         public void evaluate() throws Throwable {
             for (FrameworkMethod before : befores) {
-                final int paramCount = before.getMethod().getParameterTypes().length;
-                before.invokeExplosively(null, paramCount == 0 ? (Object[]) null : parameters);
+                int paramCount = before.getMethod().getParameterTypes().length;
+                before.invokeExplosively(
+                        null, paramCount == 0 ? (Object[]) null : parameters);
             }
             next.evaluate();
         }
     }
 
     private Statement withAfterParams(Statement statement) {
-        final List<FrameworkMethod> afters = getTestClass()
+        List<FrameworkMethod> afters = getTestClass()
                 .getAnnotatedMethods(Parameterized.AfterParam.class);
         return afters.isEmpty() ? statement : new RunAfterParams(statement, afters);
     }
@@ -186,7 +187,7 @@ private class RunAfterParams extends Statement {
 
         @Override
         public void evaluate() throws Throwable {
-            final List<Throwable> errors = new ArrayList<Throwable>();
+            List<Throwable> errors = new ArrayList<Throwable>();
             try {
                 next.evaluate();
             } catch (Throwable e) {
@@ -194,8 +195,9 @@ public void evaluate() throws Throwable {
             } finally {
                 for (FrameworkMethod each : afters) {
                     try {
-                        final int paramCount = each.getMethod().getParameterTypes().length;
-                        each.invokeExplosively(null, paramCount == 0 ? (Object[]) null : parameters);
+                        int paramCount = each.getMethod().getParameterTypes().length;
+                        each.invokeExplosively(
+                                null, paramCount == 0 ? (Object[]) null : parameters);
                     } catch (Throwable e) {
                         errors.add(e);
                     }
diff --git a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java
index 5ada119031c9..c96c998869e8 100644
--- a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java
+++ b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java
@@ -309,7 +309,7 @@ public void second() {
     @Test
     public void beforeParamAndAfterParamAreRun() {
         fLog = "";
-        final Result result = JUnitCore.runClasses(BeforeParamAndAfterParam.class);
+        Result result = JUnitCore.runClasses(BeforeParamAndAfterParam.class);
         assertEquals(0, result.getFailureCount());
         assertEquals("beforeClass before(A) first(A) second(A) afterParam "
                 + "before(B) first(B) second(B) afterParam afterClass ", fLog);
@@ -341,7 +341,7 @@ public void test() {
     @Test
     public void beforeParamAndAfterParamValidation() {
         fLog = "";
-        final Result result = JUnitCore.runClasses(BeforeParamAndAfterParamError.class);
+        Result result = JUnitCore.runClasses(BeforeParamAndAfterParamError.class);
         assertEquals(1, result.getFailureCount());
         assertThat(result.getFailures().get(0).getMessage(), containsString("beforeParam() should be static"));
         assertThat(result.getFailures().get(0).getMessage(), containsString("afterParam() should be public"));
@@ -581,4 +581,4 @@ public void usesParametersRunnerFactoryThatWasSpecifiedByAnnotationInSuperClass(
                 UseParameterizedFactoryTest.class,
                 "Called ExceptionThrowingRunnerFactory.");
     }
-}
\ No newline at end of file
+}