Skip to content

Commit b2fc70e

Browse files
steve-aom-elliottsteve-aom-elliott
authored
Small renames and changing bom to pom in tests (#6565)
1 parent 67cd777 commit b2fc70e

4 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactId.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
147147

148148
@Override
149149
public Xml visitDocument(Xml.Document document, ExecutionContext ctx) {
150-
isNewDependencyPresent = checkIfNewDependencyPresents(newGroupId, newArtifactId, newVersion);
150+
isNewDependencyPresent = checkIfNewDependencyPresent(newGroupId, newArtifactId, newVersion);
151151
if (!oldGroupId.contains("*") && !oldArtifactId.contains("*") &&
152152
(changeManagedDependency == null || changeManagedDependency)) {
153153
doAfterVisit(new ChangeManagedDependencyGroupIdAndArtifactId(
@@ -192,7 +192,7 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
192192
Scope scope = scopeTag.map(xml -> Scope.fromName(xml.getValue().orElse("compile"))).orElse(Scope.Compile);
193193
Optional<Xml.Tag> versionTag = t.getChild("version");
194194

195-
boolean configuredToOverrideManageVersion = overrideManagedVersion != null && overrideManagedVersion; // False by default
195+
boolean configuredToOverrideManagedVersion = overrideManagedVersion != null && overrideManagedVersion; // False by default
196196
boolean configuredToChangeManagedDependency = changeManagedDependency == null || changeManagedDependency; // True by default
197197

198198
boolean versionTagPresent = versionTag.isPresent();
@@ -201,13 +201,13 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
201201
boolean newDependencyManaged = isOldDependencyTag && isDependencyManaged(scope, groupId, artifactId);
202202
if (versionTagPresent) {
203203
// If the previous dependency had a version but the new artifact is managed, removed the version tag.
204-
if (!configuredToOverrideManageVersion && newDependencyManaged || (oldDependencyManaged && configuredToChangeManagedDependency)) {
204+
if (!configuredToOverrideManagedVersion && newDependencyManaged || (oldDependencyManaged && configuredToChangeManagedDependency)) {
205205
t = (Xml.Tag) new RemoveContentVisitor<>(versionTag.get(), false, true).visit(t, ctx);
206206
} else {
207207
// Otherwise, change the version to the new value.
208208
t = changeChildTagValue(t, "version", resolvedNewVersion, ctx);
209209
}
210-
} else if (configuredToOverrideManageVersion || !newDependencyManaged) {
210+
} else if (configuredToOverrideManagedVersion || !newDependencyManaged) {
211211
//If the version is not present, add the version if we are explicitly overriding a managed version or if no managed version exists.
212212
Xml.Tag newVersionTag = Xml.Tag.build("<version>" + resolvedNewVersion + "</version>");
213213
//noinspection ConstantConditions
@@ -227,7 +227,7 @@ public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
227227
return t;
228228
}
229229

230-
private boolean checkIfNewDependencyPresents(@Nullable String groupId, @Nullable String artifactId, @Nullable String version) {
230+
private boolean checkIfNewDependencyPresent(@Nullable String groupId, @Nullable String artifactId, @Nullable String version) {
231231
if ((groupId == null) || (artifactId == null)) {
232232
return false;
233233
}

‎rewrite-maven/src/main/java/org/openrewrite/maven/ChangeManagedDependencyGroupIdAndArtifactId.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
128128

129129
@Override
130130
public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
131-
isNewDependencyPresent = checkIfNewDependencyPresents(newGroupId, newArtifactId, newVersion);
131+
isNewDependencyPresent = checkIfNewDependencyPresent(newGroupId, newArtifactId, newVersion);
132132
return super.visitDocument(document, ctx);
133133
}
134134

@@ -171,7 +171,7 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
171171
return t;
172172
}
173173

174-
private boolean checkIfNewDependencyPresents(@Nullable String groupId, @Nullable String artifactId, @Nullable String version) {
174+
private boolean checkIfNewDependencyPresent(@Nullable String groupId, @Nullable String artifactId, @Nullable String version) {
175175
if ((groupId == null) || (artifactId == null)) {
176176
return false;
177177
}

‎rewrite-maven/src/test/java/org/openrewrite/maven/ChangeDependencyGroupIdAndArtifactIdTest.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,8 @@ void changeManagedDependencyArtifactId() {
538538
null,
539539
"swagger-annotations-jakarta",
540540
null,
541-
null)),
541+
null
542+
)),
542543
pomXml(
543544
"""
544545
<project>
@@ -587,7 +588,8 @@ void changeManagedDependencyGroupIdAndArtifactIdAndVersion() {
587588
"jakarta.activation",
588589
"jakarta.activation-api",
589590
"1.2.x",
590-
null)),
591+
null
592+
)),
591593
pomXml(
592594
"""
593595
<project>
@@ -725,7 +727,7 @@ void overrideManagedDependency() {
725727
"javax.activation-api",
726728
"jakarta.activation",
727729
"jakarta.activation-api",
728-
"1.2.2",
730+
"1.2.1",
729731
null,
730732
true,
731733
false
@@ -753,7 +755,7 @@ void overrideManagedDependency() {
753755
<dependency>
754756
<groupId>jakarta.activation</groupId>
755757
<artifactId>jakarta.activation-api</artifactId>
756-
<version>1.2.1</version>
758+
<version>1.2.2</version>
757759
</dependency>
758760
</dependencies>
759761
</dependencyManagement>
@@ -769,7 +771,7 @@ void overrideManagedDependency() {
769771
<dependency>
770772
<groupId>jakarta.activation</groupId>
771773
<artifactId>jakarta.activation-api</artifactId>
772-
<version>1.2.2</version>
774+
<version>1.2.1</version>
773775
</dependency>
774776
</dependencies>
775777
<dependencyManagement>
@@ -782,7 +784,7 @@ void overrideManagedDependency() {
782784
<dependency>
783785
<groupId>jakarta.activation</groupId>
784786
<artifactId>jakarta.activation-api</artifactId>
785-
<version>1.2.1</version>
787+
<version>1.2.2</version>
786788
</dependency>
787789
</dependencies>
788790
</dependencyManagement>
@@ -793,7 +795,7 @@ void overrideManagedDependency() {
793795
}
794796

795797
@Test
796-
void managedToUnmanaged() {
798+
void updatesManagedAndDirect() {
797799
rewriteRun(
798800
spec -> spec.recipe(new ChangeDependencyGroupIdAndArtifactId(
799801
"javax.activation",
@@ -939,7 +941,7 @@ void managedToUnmanagedExternalizedDepMgmt() {
939941
<groupId>org.springframework.cloud</groupId>
940942
<artifactId>spring-cloud-dependencies</artifactId>
941943
<version>2021.0.0</version>
942-
<type>bom</type>
944+
<type>pom</type>
943945
<scope>import</scope>
944946
</dependency>
945947
</dependencies>
@@ -963,7 +965,7 @@ void managedToUnmanagedExternalizedDepMgmt() {
963965
<groupId>org.springframework.cloud</groupId>
964966
<artifactId>spring-cloud-dependencies</artifactId>
965967
<version>2021.0.0</version>
966-
<type>bom</type>
968+
<type>pom</type>
967969
<scope>import</scope>
968970
</dependency>
969971
</dependencies>
@@ -1196,7 +1198,7 @@ void unmanagedToManagedExternalizedDepMgmt() {
11961198
<groupId>org.springframework.cloud</groupId>
11971199
<artifactId>spring-cloud-dependencies</artifactId>
11981200
<version>2021.0.0</version>
1199-
<type>bom</type>
1201+
<type>pom</type>
12001202
<scope>import</scope>
12011203
</dependency>
12021204
</dependencies>
@@ -1221,7 +1223,7 @@ void unmanagedToManagedExternalizedDepMgmt() {
12211223
<groupId>org.springframework.cloud</groupId>
12221224
<artifactId>spring-cloud-dependencies</artifactId>
12231225
<version>2021.0.0</version>
1224-
<type>bom</type>
1226+
<type>pom</type>
12251227
<scope>import</scope>
12261228
</dependency>
12271229
</dependencies>

‎rewrite-maven/src/test/java/org/openrewrite/maven/RemoveManagedDependencyTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ void removeBomImport() {
240240
<artifactId>micrometer-bom</artifactId>
241241
<version>1.9.9</version>
242242
<scope>import</scope>
243-
<type>bom</type>
243+
<type>pom</type>
244244
</dependency>
245245
</dependencies>
246246
</dependencyManagement>

0 commit comments

Comments
 (0)
⚡