Skip to content

Commit ff51d5b

Browse files
committed
Polish. Updated MigrateHttpURLConnectionHttpServerErrorToHttpInternalError with type cache changes. Removed unused imports in MigrateLoggerGlobalToGetGlobal. Updated tests.
1 parent 6e3bacf commit ff51d5b

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

src/main/java/org/openrewrite/java/migrate/logging/MigrateLoggerGlobalToGetGlobal.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,12 @@
1717

1818
import org.openrewrite.ExecutionContext;
1919
import org.openrewrite.Recipe;
20-
import org.openrewrite.Tree;
2120
import org.openrewrite.TreeVisitor;
22-
import org.openrewrite.java.JavaParser;
2321
import org.openrewrite.java.JavaTemplate;
2422
import org.openrewrite.java.JavaVisitor;
2523
import org.openrewrite.java.search.UsesType;
2624
import org.openrewrite.java.tree.J;
27-
import org.openrewrite.java.tree.JContainer;
28-
import org.openrewrite.java.tree.JRightPadded;
2925
import org.openrewrite.java.tree.TypeUtils;
30-
import org.openrewrite.marker.Markers;
31-
32-
import java.util.Collections;
3326

3427
public class MigrateLoggerGlobalToGetGlobal extends Recipe {
3528
@Override

src/main/java/org/openrewrite/java/migrate/net/MigrateHttpURLConnectionHttpServerErrorToHttpInternalError.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
4949
private static class MigrateHttpURLConnectionHttpServerErrorToHttpInternalErrorVisitor extends JavaIsoVisitor<ExecutionContext> {
5050
@Override
5151
public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionContext ctx) {
52-
doAfterVisit(new ChangeFieldName<>(JavaType.Class.build("java.net.HttpURLConnection"), "HTTP_SERVER_ERROR", "HTTP_INTERNAL_ERROR"));
52+
doAfterVisit(new ChangeFieldName<>("java.net.HttpURLConnection", "HTTP_SERVER_ERROR", "HTTP_INTERNAL_ERROR"));
5353
return super.visitCompilationUnit(cu, ctx);
5454
}
5555

5656
@Override
5757
public J.Identifier visitIdentifier(J.Identifier identifier, ExecutionContext ctx) {
5858
if ("HTTP_SERVER_ERROR".equals(identifier.getSimpleName())) {
59-
if (identifier.getFieldType() instanceof JavaType.Variable) {
60-
JavaType.FullyQualified fq = TypeUtils.asFullyQualified(((JavaType.Variable) identifier.getFieldType()).getOwner());
59+
if (identifier.getFieldType() != null) {
60+
JavaType.FullyQualified fq = TypeUtils.asFullyQualified(identifier.getFieldType().getOwner());
6161
if (fq != null && "java.net.HttpURLConnection".equals(fq.getFullyQualifiedName())) {
6262
identifier = identifier.withName("HTTP_INTERNAL_ERROR");
6363
}

src/test/kotlin/org/openrewrite/java/migrate/guava/NoGuavaImmutableListOfTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class NoGuavaImmutableListOfTest : JavaRecipeTest {
261261
import java.util.List;
262262
263263
public class A {
264-
List<String, String> list;
264+
List<String> list;
265265
public A(List<String> list) {
266266
this.list = list;
267267
}

src/test/kotlin/org/openrewrite/java/migrate/guava/NoGuavaImmutableSetOfTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class NoGuavaImmutableSetOfTest : JavaRecipeTest {
261261
import java.util.Set;
262262
263263
public class A {
264-
Set<String, String> set;
264+
Set<String> set;
265265
public A(Set<String> set) {
266266
this.set = set;
267267
}

0 commit comments

Comments
 (0)