Skip to content

Commit 1388ca4

Browse files
timtebeektimtebeek
committed
Apply formatter
1 parent 25464eb commit 1388ca4

File tree

6 files changed

+47
-45
lines changed

6 files changed

+47
-45
lines changed

‎src/main/java/org/openrewrite/java/migrate/guava/AbstractNoGuavaImmutableOf.java‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@
1515
*/
1616
package org.openrewrite.java.migrate.guava;
1717

18-
import java.time.Duration;
1918
import org.jspecify.annotations.Nullable;
20-
import org.openrewrite.ExecutionContext;
21-
import org.openrewrite.Option;
22-
import org.openrewrite.Preconditions;
23-
import org.openrewrite.Recipe;
24-
import org.openrewrite.Tree;
25-
import org.openrewrite.TreeVisitor;
19+
import org.openrewrite.*;
2620
import org.openrewrite.internal.ListUtils;
2721
import org.openrewrite.java.JavaTemplate;
2822
import org.openrewrite.java.JavaVisitor;
@@ -31,26 +25,30 @@
3125
import org.openrewrite.java.search.UsesType;
3226
import org.openrewrite.java.tree.*;
3327
import org.openrewrite.marker.Markers;
28+
29+
import java.time.Duration;
3430
import java.util.ArrayList;
31+
import java.util.List;
3532

3633
import static java.util.Collections.emptyList;
37-
import java.util.List;
3834

3935
abstract class AbstractNoGuavaImmutableOf extends Recipe {
4036

4137
private final String guavaType;
4238
private final String javaType;
4339

4440
@Option(displayName = "Whether to convert return type (the default value is false).",
45-
description = "converting the return type from Guava Type to Java Type " +
46-
"The default value is false.",
47-
example = "true",
48-
required = false)
41+
description = "converting the return type from Guava Type to Java Type " +
42+
"The default value is false.",
43+
example = "true",
44+
required = false)
4945
boolean isAbleToConvertReturnType;
46+
5047
AbstractNoGuavaImmutableOf(String guavaType, String javaType) {
5148
this.guavaType = guavaType;
5249
this.javaType = javaType;
5350
}
51+
5452
AbstractNoGuavaImmutableOf(String guavaType, String javaType, boolean isAbleToConvertReturnType) {
5553
this.guavaType = guavaType;
5654
this.javaType = javaType;
@@ -175,13 +173,13 @@ private boolean isParentTypeDownCast(MethodCall immutableMethod) {
175173
@Override
176174
public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
177175
J.VariableDeclarations mv = (J.VariableDeclarations) super.visitVariableDeclarations(multiVariable, ctx);
178-
if(!isAbleToConvertReturnType) {
176+
if (!isAbleToConvertReturnType) {
179177
return mv;
180178
}
181179
if (multiVariable != mv && TypeUtils.isOfClassType(mv.getType(), guavaType)) {
182180
JavaType newType = JavaType.buildType(javaType);
183181
mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
184-
null : createNewTypeExpression(mv.getTypeExpression(), newType));
182+
null : createNewTypeExpression(mv.getTypeExpression(), newType));
185183

186184
mv = mv.withVariables(ListUtils.map(mv.getVariables(), variable -> {
187185
JavaType.FullyQualified varType = TypeUtils.asFullyQualified(variable.getType());
@@ -200,25 +198,25 @@ private TypeTree createNewTypeExpression(TypeTree typeTree, JavaType newType) {
200198
J.ParameterizedType parameterizedType = (J.ParameterizedType) typeTree;
201199
List<JRightPadded<Expression>> jRightPaddedList = new ArrayList<>();
202200
parameterizedType.getTypeParameters().forEach(
203-
expression -> {
204-
if (expression instanceof J.ParameterizedType && TypeUtils.isOfClassType(expression.getType(), guavaType)) {
205-
jRightPaddedList.add(JRightPadded.build(((J.ParameterizedType) createNewTypeExpression((TypeTree) expression, newType))));
206-
} else {
207-
jRightPaddedList.add(JRightPadded.build(expression));
208-
}
209-
});
201+
expression -> {
202+
if (expression instanceof J.ParameterizedType && TypeUtils.isOfClassType(expression.getType(), guavaType)) {
203+
jRightPaddedList.add(JRightPadded.build(((J.ParameterizedType) createNewTypeExpression((TypeTree) expression, newType))));
204+
} else {
205+
jRightPaddedList.add(JRightPadded.build(expression));
206+
}
207+
});
210208
NameTree clazz = new J.Identifier(
211-
Tree.randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), getShortType(javaType), null, null);
209+
Tree.randomId(), Space.EMPTY, Markers.EMPTY, emptyList(), getShortType(javaType), null, null);
212210
return parameterizedType.withClazz(clazz).withType(newType).getPadding().withTypeParameters(JContainer.build(jRightPaddedList));
213211
}
214212
return new J.Identifier(
215-
typeTree.getId(),
216-
typeTree.getPrefix(),
217-
Markers.EMPTY,
218-
emptyList(),
219-
getShortType(javaType),
220-
newType,
221-
null
213+
typeTree.getId(),
214+
typeTree.getPrefix(),
215+
Markers.EMPTY,
216+
emptyList(),
217+
getShortType(javaType),
218+
newType,
219+
null
222220
);
223221
}
224222

‎src/main/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOf.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class NoGuavaImmutableMapOf extends AbstractNoGuavaImmutableOf {
1919
public NoGuavaImmutableMapOf() {
2020
super("com.google.common.collect.ImmutableMap", "java.util.Map");
2121
}
22+
2223
public NoGuavaImmutableMapOf(boolean isAbleToConvertReturnType) {
2324
super("com.google.common.collect.ImmutableMap", "java.util.Map", isAbleToConvertReturnType);
2425
}

‎src/main/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOf.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class NoGuavaImmutableSetOf extends AbstractNoGuavaImmutableOf {
1919
public NoGuavaImmutableSetOf() {
2020
super("com.google.common.collect.ImmutableSet", "java.util.Set");
2121
}
22+
2223
public NoGuavaImmutableSetOf(boolean isAbleToConvertReturnType) {
2324
super("com.google.common.collect.ImmutableSet", "java.util.Set", isAbleToConvertReturnType);
2425
}

‎src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ class A {
603603
)
604604
);
605605
}
606+
606607
@Test
607608
void doChangeNestedListsWithVariableType() {
608609
//language=java

‎src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableMapOfTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Copyright 2021 the original author or authors.
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -519,6 +519,7 @@ class Test {
519519
)
520520
);
521521
}
522+
522523
@Test
523524
void doChangeNestedMaps() {
524525
//language=java

‎src/test/java/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -553,23 +553,23 @@ void doChangeAssignToImmutableSet() {
553553
rewriteRun(
554554
spec -> spec.recipe(new NoGuavaImmutableSetOf(true)),
555555
version(
556-
java(
557-
"""
558-
import com.google.common.collect.ImmutableSet;
556+
java(
557+
"""
558+
import com.google.common.collect.ImmutableSet;
559559
560-
class Test {
561-
ImmutableSet<String> m = ImmutableSet.of();
562-
}
563-
""",
564-
"""
565-
import java.util.Set;
560+
class Test {
561+
ImmutableSet<String> m = ImmutableSet.of();
562+
}
563+
""",
564+
"""
565+
import java.util.Set;
566566
567-
class Test {
568-
Set<String> m = Set.of();
569-
}
570-
"""
571-
),
572-
11)
567+
class Test {
568+
Set<String> m = Set.of();
569+
}
570+
"""
571+
),
572+
11)
573573
);
574574
}
575575

0 commit comments

Comments
 (0)