From fc6af3337d746d28fcf3e664bd8ea828cb6413fe Mon Sep 17 00:00:00 2001
From: Rick Ossendrijver <rick.ossendrijver@gmail.com>
Date: Fri, 13 Jan 2023 12:58:23 +0100
Subject: [PATCH] Extract and improve method

---
 .../JUnitFactoryMethodDeclaration.java           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitFactoryMethodDeclaration.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitFactoryMethodDeclaration.java
index 705819de..92cb800f 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitFactoryMethodDeclaration.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/bugpatterns/JUnitFactoryMethodDeclaration.java
@@ -67,7 +67,6 @@ import tech.picnic.errorprone.bugpatterns.util.MoreJUnitMatchers;
     tags = STYLE)
 public final class JUnitFactoryMethodDeclaration extends BugChecker implements MethodTreeMatcher {
   private static final long serialVersionUID = 1L;
-
   private static final Matcher<MethodTree> HAS_UNMODIFIABLE_SIGNATURE =
       anyOf(
           annotations(AT_LEAST_ONE, isType("java.lang.Override")),
@@ -167,13 +166,7 @@ public final class JUnitFactoryMethodDeclaration extends BugChecker implements M
 
   private ImmutableList<Description> getReturnStatementCommentFixes(
       MethodTree testMethod, MethodTree factoryMethod, VisitorState state) {
-    ImmutableList<String> parameterNames =
-        testMethod.getParameters().stream()
-            .map(VariableTree::getName)
-            .map(Object::toString)
-            .collect(toImmutableList());
-
-    String expectedComment = parameterNames.stream().collect(joining(", ", "/* { ", " } */"));
+    String expectedComment = createCommentContainingParameters(testMethod);
 
     List<? extends StatementTree> statements = factoryMethod.getBody().getStatements();
 
@@ -201,6 +194,13 @@ public final class JUnitFactoryMethodDeclaration extends BugChecker implements M
         .collect(toImmutableList());
   }
 
+  private static String createCommentContainingParameters(MethodTree testMethod) {
+    return testMethod.getParameters().stream()
+        .map(VariableTree::getName)
+        .map(Object::toString)
+        .collect(joining(", ", "/* { ", " } */"));
+  }
+
   private static boolean hasExpectedComment(
       MethodTree factoryMethod,
       String expectedComment,