Skip to content

Commit 6766243

Browse files
committed
Drop Guava dependency from LombokUtils
1 parent 8376783 commit 6766243

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

src/main/java/org/openrewrite/java/migrate/lombok/LombokUtils.java

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,13 @@
1515
*/
1616
package org.openrewrite.java.migrate.lombok;
1717

18-
import com.google.common.collect.ImmutableMap;
1918
import lombok.AccessLevel;
2019
import org.jspecify.annotations.Nullable;
2120
import org.openrewrite.internal.StringUtils;
2221
import org.openrewrite.java.tree.Expression;
2322
import org.openrewrite.java.tree.J;
2423
import org.openrewrite.java.tree.JavaType;
2524

26-
import java.util.Collection;
27-
import java.util.Map;
28-
2925
import static lombok.AccessLevel.*;
3026
import static org.openrewrite.java.tree.J.Modifier.Type.*;
3127

@@ -87,17 +83,15 @@ private static String deriveGetterMethodName(@Nullable JavaType type, String fie
8783
return "get" + StringUtils.capitalize(fieldName);
8884
}
8985

90-
static AccessLevel getAccessLevel(Collection<J.Modifier> modifiers) {
91-
Map<J.Modifier.Type, AccessLevel> map = ImmutableMap.<J.Modifier.Type, AccessLevel>builder()
92-
.put(Public, PUBLIC)
93-
.put(Protected, PROTECTED)
94-
.put(Private, PRIVATE)
95-
.build();
96-
97-
return modifiers.stream()
98-
.map(modifier -> map.getOrDefault(modifier.getType(), AccessLevel.NONE))
99-
.filter(a -> a != AccessLevel.NONE)
100-
.findAny().orElse(AccessLevel.PACKAGE);
86+
static AccessLevel getAccessLevel(J.MethodDeclaration modifiers) {
87+
if (modifiers.hasModifier(Public)) {
88+
return PUBLIC;
89+
} else if (modifiers.hasModifier(Protected)) {
90+
return PROTECTED;
91+
} else if (modifiers.hasModifier(Private)) {
92+
return PRIVATE;
93+
}
94+
return PACKAGE;
10195
}
10296

10397
}

src/main/java/org/openrewrite/java/migrate/lombok/UseLombokGetter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
7272
((J.Identifier) returnExpression).getFieldType() != null) {
7373
doAfterVisit(new FieldAnnotator(
7474
((J.Identifier) returnExpression).getFieldType(),
75-
LombokUtils.getAccessLevel(method.getModifiers())));
75+
LombokUtils.getAccessLevel(method)));
7676
return null;
7777
} else if (returnExpression instanceof J.FieldAccess &&
7878
((J.FieldAccess) returnExpression).getName().getFieldType() != null) {
7979
doAfterVisit(new FieldAnnotator(
8080
((J.FieldAccess) returnExpression).getName().getFieldType(),
81-
LombokUtils.getAccessLevel(method.getModifiers())));
81+
LombokUtils.getAccessLevel(method)));
8282
return null;
8383
}
8484
}

0 commit comments

Comments
 (0)