Skip to content

Resolve ide warnings #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 21, 2022
Merged

Resolve ide warnings #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a02874
Remove unused imports
Aug 21, 2022
4b0500a
Use stream() and Collectors.toMap to populate gav mavenModel map
Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...n/java/org/openrewrite/java/migrate/AddSuppressionForIllegalReflectionWarningsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.openrewrite.internal.StringUtils;
import org.openrewrite.maven.AddPlugin;
import org.openrewrite.maven.MavenIsoVisitor;
import org.openrewrite.maven.MavenVisitor;
import org.openrewrite.xml.XPathMatcher;
import org.openrewrite.xml.tree.Xml;

Expand Down
32 changes: 18 additions & 14 deletions src/main/java/org/openrewrite/java/migrate/javax/AddJaxwsRuntime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,19 @@
import org.openrewrite.SourceFile;
import org.openrewrite.internal.ListUtils;
import org.openrewrite.internal.lang.Nullable;
import org.openrewrite.java.migrate.MavenUtils;
import org.openrewrite.maven.AddDependencyVisitor;
import org.openrewrite.maven.RemoveDependency;
import org.openrewrite.maven.tree.*;
import org.openrewrite.maven.tree.GroupArtifactVersion;
import org.openrewrite.maven.tree.MavenResolutionResult;
import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.maven.tree.Scope;

import java.time.Duration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

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

//Collect a map of gav coordinates to pom models for any maven files in the source set (other visitors may have
//made changes to those models)
Map<GroupArtifactVersion, MavenResolutionResult> gavToModel = new HashMap<>();
List<SourceFile> sources = ListUtils.map(before, s -> {
if (isMavenSource(s)) {
MavenResolutionResult mavenModel = getMavenModel(s);
gavToModel.put(new GroupArtifactVersion(mavenModel.getPom().getGroupId(),mavenModel.getPom().getArtifactId(), mavenModel.getPom().getVersion()), mavenModel);
}
return s;
});

Map<GroupArtifactVersion, MavenResolutionResult> gavToModel = before.stream()
.filter(MavenUtils::isMavenSource)
.map(MavenUtils::getMavenModel)
.collect(Collectors.toMap(
mavenModel -> new GroupArtifactVersion(
mavenModel.getPom().getGroupId(),
mavenModel.getPom().getArtifactId(),
mavenModel.getPom().getVersion()),
Function.identity()));
return ListUtils.map(before, s -> {
if (isMavenSource(s)) {
MavenResolutionResult mavenModel = getMavenModel(s);
Expand Down Expand Up @@ -107,8 +112,7 @@ protected List<SourceFile> visit(List<SourceFile> before, ExecutionContext ctx)
* @return The highest scope of the given dependency or null if the dependency does not exist.
*/
@Nullable
private Scope getTransitiveDependencyScope(MavenResolutionResult mavenModel, String groupId, String artifactId, Map<GroupArtifactVersion, MavenResolutionResult> gavToModels) {

private static Scope getTransitiveDependencyScope(MavenResolutionResult mavenModel, String groupId, String artifactId, Map<GroupArtifactVersion, MavenResolutionResult> gavToModels) {
Scope maxScope = null;
for (Map.Entry<Scope, List<ResolvedDependency>> entry : mavenModel.getDependencies().entrySet()) {
for (ResolvedDependency dependency : entry.getValue()) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/openrewrite/java/migrate/javax/ReplaceJavaxJaxbWithJakarta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.openrewrite.TreeVisitor;
import org.openrewrite.maven.AddDependencyVisitor;
import org.openrewrite.maven.MavenIsoVisitor;
import org.openrewrite.maven.MavenVisitor;
import org.openrewrite.maven.RemoveDependency;
import org.openrewrite.xml.tree.Xml;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/openrewrite/java/migrate/javax/ReplaceJavaxJaxwsWithJakarta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.openrewrite.TreeVisitor;
import org.openrewrite.maven.AddDependencyVisitor;
import org.openrewrite.maven.MavenIsoVisitor;
import org.openrewrite.maven.MavenVisitor;
import org.openrewrite.maven.RemoveDependency;
import org.openrewrite.xml.tree.Xml;

Expand Down
1 change: 0 additions & 1 deletion ...java/org/openrewrite/java/migrate/logging/MigrateGetLoggingMXBeanToGetPlatformMXBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.openrewrite.java.MethodMatcher;
import org.openrewrite.java.search.UsesMethod;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JavaType;

import java.time.Duration;

Expand Down