Skip to content

Commit bba4904

Browse files
jkschneiderTim te Beek
and
Tim te Beek
authored
Resolve ide warnings (#118)
* Remove unused imports * Use stream() and Collectors.toMap to populate gav mavenModel map Removes unused local variable, with side effect in ListUtils.map Co-authored-by: Tim te Beek <[email protected]>
1 parent 4dfc53c commit bba4904

5 files changed

+18
-18
lines changed

src/main/java/org/openrewrite/java/migrate/AddSuppressionForIllegalReflectionWarningsPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.openrewrite.internal.StringUtils;
2323
import org.openrewrite.maven.AddPlugin;
2424
import org.openrewrite.maven.MavenIsoVisitor;
25-
import org.openrewrite.maven.MavenVisitor;
2625
import org.openrewrite.xml.XPathMatcher;
2726
import org.openrewrite.xml.tree.Xml;
2827

src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,19 @@
2222
import org.openrewrite.SourceFile;
2323
import org.openrewrite.internal.ListUtils;
2424
import org.openrewrite.internal.lang.Nullable;
25+
import org.openrewrite.java.migrate.MavenUtils;
2526
import org.openrewrite.maven.AddDependencyVisitor;
2627
import org.openrewrite.maven.RemoveDependency;
27-
import org.openrewrite.maven.tree.*;
28+
import org.openrewrite.maven.tree.GroupArtifactVersion;
29+
import org.openrewrite.maven.tree.MavenResolutionResult;
30+
import org.openrewrite.maven.tree.ResolvedDependency;
31+
import org.openrewrite.maven.tree.Scope;
2832

2933
import java.time.Duration;
30-
import java.util.HashMap;
3134
import java.util.List;
3235
import java.util.Map;
36+
import java.util.function.Function;
37+
import java.util.stream.Collectors;
3338

3439
import static org.openrewrite.java.migrate.MavenUtils.getMavenModel;
3540
import static org.openrewrite.java.migrate.MavenUtils.isMavenSource;
@@ -62,19 +67,19 @@ public Duration getEstimatedEffortPerOccurrence() {
6267
@Override
6368
protected List<SourceFile> visit(List<SourceFile> before, ExecutionContext ctx) {
6469
//remove legacy jaxws-ri library (in favor of the jakarta runtime)
65-
doNext(new RemoveDependency("com.sun.xml.ws", "jaxws-ri", null));
70+
doNext(new RemoveDependency(SUN_JAXWS_RUNTIME_GROUP, "jaxws-ri", null));
6671

6772
//Collect a map of gav coordinates to pom models for any maven files in the source set (other visitors may have
6873
//made changes to those models)
69-
Map<GroupArtifactVersion, MavenResolutionResult> gavToModel = new HashMap<>();
70-
List<SourceFile> sources = ListUtils.map(before, s -> {
71-
if (isMavenSource(s)) {
72-
MavenResolutionResult mavenModel = getMavenModel(s);
73-
gavToModel.put(new GroupArtifactVersion(mavenModel.getPom().getGroupId(),mavenModel.getPom().getArtifactId(), mavenModel.getPom().getVersion()), mavenModel);
74-
}
75-
return s;
76-
});
77-
74+
Map<GroupArtifactVersion, MavenResolutionResult> gavToModel = before.stream()
75+
.filter(MavenUtils::isMavenSource)
76+
.map(MavenUtils::getMavenModel)
77+
.collect(Collectors.toMap(
78+
mavenModel -> new GroupArtifactVersion(
79+
mavenModel.getPom().getGroupId(),
80+
mavenModel.getPom().getArtifactId(),
81+
mavenModel.getPom().getVersion()),
82+
Function.identity()));
7883
return ListUtils.map(before, s -> {
7984
if (isMavenSource(s)) {
8085
MavenResolutionResult mavenModel = getMavenModel(s);
@@ -107,8 +112,7 @@ protected List<SourceFile> visit(List<SourceFile> before, ExecutionContext ctx)
107112
* @return The highest scope of the given dependency or null if the dependency does not exist.
108113
*/
109114
@Nullable
110-
private Scope getTransitiveDependencyScope(MavenResolutionResult mavenModel, String groupId, String artifactId, Map<GroupArtifactVersion, MavenResolutionResult> gavToModels) {
111-
115+
private static Scope getTransitiveDependencyScope(MavenResolutionResult mavenModel, String groupId, String artifactId, Map<GroupArtifactVersion, MavenResolutionResult> gavToModels) {
112116
Scope maxScope = null;
113117
for (Map.Entry<Scope, List<ResolvedDependency>> entry : mavenModel.getDependencies().entrySet()) {
114118
for (ResolvedDependency dependency : entry.getValue()) {

src/main/java/org/openrewrite/java/migrate/javax/ReplaceJavaxJaxbWithJakarta.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.openrewrite.TreeVisitor;
2121
import org.openrewrite.maven.AddDependencyVisitor;
2222
import org.openrewrite.maven.MavenIsoVisitor;
23-
import org.openrewrite.maven.MavenVisitor;
2423
import org.openrewrite.maven.RemoveDependency;
2524
import org.openrewrite.xml.tree.Xml;
2625

src/main/java/org/openrewrite/java/migrate/javax/ReplaceJavaxJaxwsWithJakarta.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.openrewrite.TreeVisitor;
2121
import org.openrewrite.maven.AddDependencyVisitor;
2222
import org.openrewrite.maven.MavenIsoVisitor;
23-
import org.openrewrite.maven.MavenVisitor;
2423
import org.openrewrite.maven.RemoveDependency;
2524
import org.openrewrite.xml.tree.Xml;
2625

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.openrewrite.java.MethodMatcher;
2525
import org.openrewrite.java.search.UsesMethod;
2626
import org.openrewrite.java.tree.J;
27-
import org.openrewrite.java.tree.JavaType;
2827

2928
import java.time.Duration;
3029

0 commit comments

Comments
 (0)