Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 35 additions & 12 deletions src/main/java/org/openrewrite/java/dependencies/AddDependency.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
*/
package org.openrewrite.java.dependencies;

import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.maven.tree.Scope;

import java.util.concurrent.atomic.AtomicReference;

@EqualsAndHashCode(callSuper = false)
@Value
public class AddDependency extends ScanningRecipe<AddDependency.Accumulator> {
Expand Down Expand Up @@ -141,10 +145,13 @@ public Accumulator getInitialValue(ExecutionContext ctx) {
@Override
public TreeVisitor<?, ExecutionContext> getScanner(Accumulator acc) {
return new TreeVisitor<Tree, ExecutionContext>() {
final TreeVisitor<?, ExecutionContext> gradleAddDep = gradleAddDep().getScanner(acc.gradleAccumulator);
final TreeVisitor<?, ExecutionContext> mavenAddDep = mavenAddDep().getScanner(acc.mavenAccumulator);

@Override
public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
gradleAddDep().getScanner(acc.gradleAccumulator).visit(tree, ctx);
mavenAddDep().getScanner(acc.mavenAccumulator).visit(tree, ctx);
gradleAddDep.visit(tree, ctx);
mavenAddDep.visit(tree, ctx);
return tree;
}
};
Expand Down Expand Up @@ -184,20 +191,36 @@ public static class Accumulator {
org.openrewrite.maven.AddDependency.Scanned mavenAccumulator;
}

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.gradle.AddDependency> gradleDelegate = new AtomicReference<>();

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.maven.AddDependency> mavenDelegate = new AtomicReference<>();

private org.openrewrite.gradle.AddDependency gradleAddDep() {
String configurationName = null;
if(configuration != null) {
configurationName = configuration;
} else if(scope != null) {
configurationName = Scope.asGradleConfigurationName(Scope.fromName(scope));
org.openrewrite.gradle.AddDependency recipe = gradleDelegate.get();
if (recipe == null) {
String configurationName = null;
if(configuration != null) {
configurationName = configuration;
} else if(scope != null) {
configurationName = Scope.asGradleConfigurationName(Scope.fromName(scope));
}
recipe = new org.openrewrite.gradle.AddDependency(groupId, artifactId, version, versionPattern,
configurationName, onlyIfUsing, classifier, extension, familyPattern, acceptTransitive);
gradleDelegate.set(recipe);
}
return new org.openrewrite.gradle.AddDependency(groupId, artifactId, version, versionPattern,
configurationName, onlyIfUsing, classifier, extension, familyPattern, acceptTransitive);
return recipe;
}

private org.openrewrite.maven.AddDependency mavenAddDep() {
return new org.openrewrite.maven.AddDependency(groupId, artifactId, version != null ? version : "latest.release",
versionPattern, scope, releasesOnly, onlyIfUsing, type, classifier, optional, familyPattern,
acceptTransitive);
org.openrewrite.maven.AddDependency recipe = mavenDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.maven.AddDependency(groupId, artifactId, version != null ? version : "latest.release",
versionPattern, scope, releasesOnly, onlyIfUsing, type, classifier, optional, familyPattern,
acceptTransitive);
mavenDelegate.set(recipe);
}
return recipe;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
*/
package org.openrewrite.java.dependencies;

import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;

import java.util.concurrent.atomic.AtomicReference;

import static java.util.Objects.requireNonNull;

@EqualsAndHashCode(callSuper = false)
Expand Down Expand Up @@ -152,16 +155,32 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
};
}

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId> mavenDelegate = new AtomicReference<>();

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.gradle.ChangeDependency> gradleDelegate = new AtomicReference<>();

org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId getMavenChangeDependency() {
return new org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId(
oldGroupId, oldArtifactId, newGroupId, newArtifactId,
newVersion, versionPattern, overrideManagedVersion, changeManagedDependency);
org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId recipe = mavenDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId(
oldGroupId, oldArtifactId, newGroupId, newArtifactId,
newVersion, versionPattern, overrideManagedVersion, changeManagedDependency);
mavenDelegate.set(recipe);
}
return recipe;
}

org.openrewrite.gradle.ChangeDependency getGradleChangeDependency() {
return new org.openrewrite.gradle.ChangeDependency(
oldGroupId, oldArtifactId, newGroupId, newArtifactId,
newVersion, versionPattern, overrideManagedVersion, true);
org.openrewrite.gradle.ChangeDependency recipe = gradleDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.gradle.ChangeDependency(
oldGroupId, oldArtifactId, newGroupId, newArtifactId,
newVersion, versionPattern, overrideManagedVersion, true);
gradleDelegate.set(recipe);
}
return recipe;
}

@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.openrewrite.java.dependencies;

import lombok.AccessLevel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
Expand All @@ -23,6 +24,7 @@
import org.openrewrite.*;

import java.util.List;
import java.util.concurrent.atomic.AtomicReference;

import static java.util.Objects.requireNonNull;

Expand Down Expand Up @@ -139,12 +141,28 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
};
}

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.maven.UpgradeDependencyVersion> mavenDelegate = new AtomicReference<>();

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.gradle.UpgradeDependencyVersion> gradleDelegate = new AtomicReference<>();

org.openrewrite.maven.UpgradeDependencyVersion getUpgradeMavenDependencyVersion() {
return new org.openrewrite.maven.UpgradeDependencyVersion(groupId, artifactId, newVersion, versionPattern, overrideManagedVersion, retainVersions);
org.openrewrite.maven.UpgradeDependencyVersion recipe = mavenDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.maven.UpgradeDependencyVersion(groupId, artifactId, newVersion, versionPattern, overrideManagedVersion, retainVersions);
mavenDelegate.set(recipe);
}
return recipe;
}

public org.openrewrite.gradle.UpgradeDependencyVersion getUpgradeGradleDependencyVersion() {
return new org.openrewrite.gradle.UpgradeDependencyVersion(groupId, artifactId, newVersion, versionPattern);
org.openrewrite.gradle.UpgradeDependencyVersion recipe = gradleDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.gradle.UpgradeDependencyVersion(groupId, artifactId, newVersion, versionPattern);
gradleDelegate.set(recipe);
}
return recipe;
}

@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,16 @@
*/
package org.openrewrite.java.dependencies;

import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.maven.AddManagedDependency;

import java.util.concurrent.atomic.AtomicReference;

@EqualsAndHashCode(callSuper = false)
@Value
public class UpgradeTransitiveDependencyVersion extends ScanningRecipe<UpgradeTransitiveDependencyVersion.Accumulator> {
Expand Down Expand Up @@ -154,11 +158,27 @@ public boolean isAcceptable(SourceFile sourceFile, ExecutionContext ctx) {
};
}

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.gradle.UpgradeTransitiveDependencyVersion> gradleDelegate = new AtomicReference<>();

@Getter(AccessLevel.NONE)
private final transient AtomicReference<org.openrewrite.maven.UpgradeTransitiveDependencyVersion> mavenDelegate = new AtomicReference<>();

private org.openrewrite.gradle.UpgradeTransitiveDependencyVersion getGradleUpgradeTransitive() {
return new org.openrewrite.gradle.UpgradeTransitiveDependencyVersion(groupId, artifactId, version, versionPattern, because, null);
org.openrewrite.gradle.UpgradeTransitiveDependencyVersion recipe = gradleDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.gradle.UpgradeTransitiveDependencyVersion(groupId, artifactId, version, versionPattern, because, null);
gradleDelegate.set(recipe);
}
return recipe;
}

private org.openrewrite.maven.UpgradeTransitiveDependencyVersion getMavenUpgradeTransitive() {
return new org.openrewrite.maven.UpgradeTransitiveDependencyVersion(groupId, artifactId, version, scope, type, classifier, versionPattern, releasesOnly, onlyIfUsing, addToRootPom, because);
org.openrewrite.maven.UpgradeTransitiveDependencyVersion recipe = mavenDelegate.get();
if (recipe == null) {
recipe = new org.openrewrite.maven.UpgradeTransitiveDependencyVersion(groupId, artifactId, version, scope, type, classifier, versionPattern, releasesOnly, onlyIfUsing, addToRootPom, because);
mavenDelegate.set(recipe);
}
return recipe;
}
}
Loading