Skip to content

Commit f87d1ad

Browse files
timtebeektimtebeek
committed
Revert "Optionally change String literals from ChangePackage and ChangeType (#5240)"
This reverts commit 72d79f9.
1 parent b484d84 commit f87d1ad

11 files changed

Lines changed: 111 additions & 279 deletions

File tree

‎rewrite-benchmarks/src/jmh/java/org/openrewrite/benchmarks/java/ChangeTypeBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static void main(String[] args) throws RunnerException {
4444

4545
@Benchmark
4646
public void changeType(JavaCompilationUnitState state) {
47-
new ChangeType("java.util.List", "java.util.Collection", null, null)
47+
new ChangeType("java.util.List", "java.util.Collection", null)
4848
.run(state.getSourceSet(), new InMemoryExecutionContext());
4949
}
5050
}

‎rewrite-groovy/src/test/java/org/openrewrite/groovy/ChangePackageAdaptabilityTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ChangePackageAdaptabilityTest implements RewriteTest {
3333

3434
@Override
3535
public void defaults(RecipeSpec spec) {
36-
spec.recipe(new ChangePackage("a.b", "x.y", false, null));
36+
spec.recipe(new ChangePackage("a.b", "x.y", false));
3737
}
3838

3939
@DocumentExample
@@ -103,7 +103,7 @@ class A {
103103
@Test
104104
void renamePackageRecursive() {
105105
rewriteRun(
106-
spec -> spec.recipe(new ChangePackage("org.foo", "org.foo.test", true, null)),
106+
spec -> spec.recipe(new ChangePackage("org.foo", "org.foo.test", true)),
107107
groovy(
108108
"""
109109
package org.foo.internal
@@ -127,7 +127,7 @@ class Test {
127127
@Test
128128
void changeDefinition() {
129129
rewriteRun(
130-
spec -> spec.recipe(new ChangePackage("org.foo", "x.y.z", false, null)),
130+
spec -> spec.recipe(new ChangePackage("org.foo", "x.y.z", false)),
131131
groovy(
132132
"""
133133
package org.foo

‎rewrite-groovy/src/test/java/org/openrewrite/groovy/ChangeTypeAdaptabilityTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ChangeTypeAdaptabilityTest implements RewriteTest {
3535

3636
@Override
3737
public void defaults(RecipeSpec spec) {
38-
spec.recipe(new ChangeType("a.b.Original", "x.y.Target", true, null));
38+
spec.recipe(new ChangeType("a.b.Original", "x.y.Target", true));
3939
}
4040

4141
@SuppressWarnings("GrPackage")
@@ -100,7 +100,7 @@ class A {
100100
@Test
101101
void changeDefinition() {
102102
rewriteRun(
103-
spec -> spec.recipe(new ChangeType("file", "newFile", false, null)),
103+
spec -> spec.recipe(new ChangeType("file", "newFile", false)),
104104
groovy(
105105
"""
106106
class file {
@@ -124,7 +124,7 @@ class newFile {
124124
@Test
125125
void changeTypeAttributionImplicitUsage() {
126126
rewriteRun(
127-
spec -> spec.recipe(new ChangeType("java.util.List", "java.util.ArrayList", false, null)),
127+
spec -> spec.recipe(new ChangeType("java.util.List", "java.util.ArrayList", false)),
128128
groovy(
129129
"""
130130
import java.util.Collections

‎rewrite-java-test/src/test/java/org/openrewrite/java/ChangePackageTest.java‎

Lines changed: 17 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ChangePackageTest implements RewriteTest {
3939

4040
@Override
4141
public void defaults(RecipeSpec spec) {
42-
spec.recipe(new ChangePackage("org.openrewrite", "org.openrewrite.test", null, null));
42+
spec.recipe(new ChangePackage("org.openrewrite", "org.openrewrite.test", null));
4343
}
4444

4545
@Language("java")
@@ -66,8 +66,7 @@ void renamePackageNonRecursive() {
6666
spec -> spec.recipe(new ChangePackage(
6767
"org.openrewrite",
6868
"org.openrewrite.test",
69-
false,
70-
null
69+
false
7170
)),
7271
java(
7372
"""
@@ -86,8 +85,7 @@ void renameUsingSimplePackageName() {
8685
spec -> spec.recipe(new ChangePackage(
8786
"org.openrewrite",
8887
"openrewrite",
89-
false,
90-
null
88+
false
9189
)),
9290
java(
9391
"""
@@ -355,8 +353,7 @@ void renamePackageRecursiveImported() {
355353
spec -> spec.recipe(new ChangePackage(
356354
"org.openrewrite",
357355
"org.openrewrite.test",
358-
true,
359-
null
356+
true
360357
)),
361358
java(
362359
"""
@@ -396,7 +393,6 @@ void renamePackageNullRecursiveImportedCheckStrictPackageMatch() {
396393
spec -> spec.recipe(new ChangePackage(
397394
"org.openrewrite.other",
398395
"org.openrewrite.test.other",
399-
null,
400396
null
401397
)),
402398
java(
@@ -455,8 +451,7 @@ void renamePackageImportedCheckStrictPackageMatch() {
455451
spec -> spec.recipe(new ChangePackage(
456452
"org.openrewrite.other",
457453
"org.openrewrite.test.other",
458-
false,
459-
null
454+
false
460455
)),
461456
java(
462457
"""
@@ -514,8 +509,7 @@ void renamePackageRecursiveImportedStrictPackageMatch() {
514509
spec -> spec.recipe(new ChangePackage(
515510
"org.openrewrite.other",
516511
"org.openrewrite.test.other",
517-
true,
518-
null
512+
true
519513
)),
520514
java(
521515
"""
@@ -1005,7 +999,6 @@ void moveToSubPackageRemoveImport() {
1005999
spec -> spec.recipe(new ChangePackage(
10061000
"com.acme.project",
10071001
"com.acme.product",
1008-
null,
10091002
null
10101003
)),
10111004
java(
@@ -1047,8 +1040,7 @@ void moveToSubPackageDoNotRemoveImport() {
10471040
spec -> spec.recipe(new ChangePackage(
10481041
"com.acme.project",
10491042
"com.acme.product",
1050-
true,
1051-
null
1043+
true
10521044
)),
10531045
java(
10541046
"""
@@ -1122,7 +1114,7 @@ void callWorker() {
11221114
@Test
11231115
void typeInNestedPackageInheritingFromTypeInBasePackage() {
11241116
rewriteRun(
1125-
spec -> spec.recipe(new ChangePackage("java.util", "util", null, null)),
1117+
spec -> spec.recipe(new ChangePackage("java.util", "util", null)),
11261118
java(
11271119
"""
11281120
import java.util.concurrent.ConcurrentHashMap;
@@ -1478,7 +1470,7 @@ void changeTypeWithInnerClass() {
14781470
spec -> spec.recipe(new ChangePackage(
14791471
"com.acme.product",
14801472
"com.acme.product.v2",
1481-
null, null
1473+
null
14821474
)),
14831475
java(
14841476
"""
@@ -1530,7 +1522,7 @@ public String work2() {
15301522
@Test
15311523
void updateImportPrefixWithEmptyPackage() {
15321524
rewriteRun(
1533-
spec -> spec.recipe(new ChangePackage("a.b", "", false, null)),
1525+
spec -> spec.recipe(new ChangePackage("a.b", "", false)),
15341526
java(
15351527
"""
15361528
package a.b;
@@ -1554,8 +1546,7 @@ void updateClassPrefixWithEmptyPackage() {
15541546
ChangePackage(
15551547
"a.b",
15561548
"",
1557-
false,
1558-
null
1549+
false
15591550
)),
15601551
java(
15611552
"""
@@ -1579,8 +1570,7 @@ void renameSingleSegmentPackage() {
15791570
ChangePackage(
15801571
"x",
15811572
"y",
1582-
false,
1583-
null
1573+
false
15841574
)),
15851575
java(
15861576
"""
@@ -1605,8 +1595,7 @@ void removePackage() {
16051595
ChangePackage(
16061596
"x.y.z",
16071597
"x",
1608-
false,
1609-
null
1598+
false
16101599
)),
16111600
java(
16121601
"""
@@ -1720,7 +1709,7 @@ public enum MyEnum {
17201709
@Test
17211710
void changePackageInSpringXml() {
17221711
rewriteRun(
1723-
spec -> spec.recipe(new ChangePackage("test.type", "test.test.type", true, null)),
1712+
spec -> spec.recipe(new ChangePackage("test.type", "test.test.type", true)),
17241713
xml(
17251714
"""
17261715
<?xml version="1.0" encoding="UTF-8"?>
@@ -1741,7 +1730,7 @@ void changePackageInSpringXml() {
17411730
@Test
17421731
void changeTypeInPropertiesFile() {
17431732
rewriteRun(
1744-
spec -> spec.recipe(new ChangePackage("java.lang", "java.cool", true, null)),
1733+
spec -> spec.recipe(new ChangePackage("java.lang", "java.cool", true)),
17451734
properties(
17461735
"""
17471736
a.property=java.lang.String
@@ -1760,7 +1749,7 @@ void changeTypeInPropertiesFile() {
17601749
@Test
17611750
void changePackageInYaml() {
17621751
rewriteRun(
1763-
spec -> spec.recipe(new ChangePackage("java.lang", "java.cool", true, null)),
1752+
spec -> spec.recipe(new ChangePackage("java.lang", "java.cool", true)),
17641753
yaml(
17651754
"""
17661755
root:
@@ -1779,50 +1768,10 @@ void changePackageInYaml() {
17791768
);
17801769
}
17811770

1782-
@Test
1783-
void changePackageInLiteral() {
1784-
rewriteRun(
1785-
spec -> spec.recipe(new ChangePackage("javax.type", "jakarta.type", true, true)),
1786-
java(
1787-
"""
1788-
class Test {
1789-
String ref = "javax.type.A";
1790-
String extendedRef = "there is a type reference here -> javax.type.A <- hopefully it only replaces that";
1791-
}
1792-
""",
1793-
"""
1794-
class Test {
1795-
String ref = "jakarta.type.A";
1796-
String extendedRef = "there is a type reference here -> jakarta.type.A <- hopefully it only replaces that";
1797-
}
1798-
"""
1799-
)
1800-
);
1801-
}
1802-
1803-
@Test
1804-
void changePackageInLiteralTrueButNoLiteral() {
1805-
rewriteRun(
1806-
spec -> spec.recipe(new ChangePackage("test.type", "test.test.type", true, true)),
1807-
java(
1808-
"""
1809-
package test.type;
1810-
class Test {
1811-
}
1812-
""",
1813-
"""
1814-
package test.test.type;
1815-
class Test {
1816-
}
1817-
"""
1818-
)
1819-
);
1820-
}
1821-
18221771
@Test
18231772
void changeNonRecursivePackageInYamlKey() {
18241773
rewriteRun(
1825-
spec -> spec.recipe(new ChangePackage("org.apache.http", "org.apache.hc.core5.http", false, null)),
1774+
spec -> spec.recipe(new ChangePackage("org.apache.http", "org.apache.hc.core5.http", false)),
18261775
yaml(
18271776
"""
18281777
logging:

0 commit comments

Comments
 (0)
⚡