@@ -169,20 +169,26 @@ private static Fix suggestFix(
169169 MethodInvocationTree tree , String preferredMethodName , VisitorState state ) {
170170 ExpressionTree expr = tree .getMethodSelect ();
171171 return switch (expr ) {
172- case IdentifierTree identifierTree -> {
173- SuggestedFix .Builder fix = SuggestedFix .builder ();
174- String replacement =
175- SuggestedFixes .qualifyStaticImport (
176- Comparator .class .getCanonicalName () + '.' + preferredMethodName , fix , state );
177- yield fix .replace (expr , replacement ).build ();
178- }
172+ case IdentifierTree identifier -> replaceIdentifier (preferredMethodName , state , expr );
179173 case MemberSelectTree memberSelect ->
180- SuggestedFix .replace (
181- memberSelect ,
182- SourceCode .treeToString (memberSelect .getExpression (), state )
183- + '.'
184- + preferredMethodName );
174+ replaceMemberSelect (preferredMethodName , state , memberSelect );
185175 default -> throw new VerifyException ("Unexpected type of expression: " + expr .getKind ());
186176 };
187177 }
178+
179+ private static SuggestedFix replaceMemberSelect (
180+ String preferredMethodName , VisitorState state , MemberSelectTree memberSelect ) {
181+ return SuggestedFix .replace (
182+ memberSelect ,
183+ SourceCode .treeToString (memberSelect .getExpression (), state ) + '.' + preferredMethodName );
184+ }
185+
186+ private static SuggestedFix replaceIdentifier (
187+ String preferredMethodName , VisitorState state , ExpressionTree expr ) {
188+ SuggestedFix .Builder fix = SuggestedFix .builder ();
189+ String replacement =
190+ SuggestedFixes .qualifyStaticImport (
191+ Comparator .class .getCanonicalName () + '.' + preferredMethodName , fix , state );
192+ return fix .replace (expr , replacement ).build ();
193+ }
188194}
0 commit comments