Skip to content

Commit 6789157

Browse files
timtebeektimtebeek
authored
Merge branch 'main' into lombok/normalize-setter
2 parents 1024a1e + 6d7ba9f commit 6789157

40 files changed

+1987
-389
lines changed

‎LICENSE/apache-license-v2.txt‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

LICENSE.md renamed to LICENSE/moderne-source-available-license.md

File renamed without changes.

‎README.md‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,25 @@
1-
![Logo](https://github.com/openrewrite/rewrite/raw/main/doc/logo-oss.png)
2-
3-
### Migrate to later Java versions. Automatically.
4-
1+
<p align="center">
2+
<a href="https://docs.openrewrite.org">
3+
<picture>
4+
<source media="(prefers-color-scheme: dark)" srcset="https://github.com/openrewrite/rewrite/raw/main/doc/logo-oss-dark.svg">
5+
<source media="(prefers-color-scheme: light)" srcset="https://github.com/openrewrite/rewrite/raw/main/doc/logo-oss-light.svg">
6+
<img alt="OpenRewrite Logo" src="https://github.com/openrewrite/rewrite/raw/main/doc/logo-oss-light.svg" width='600px'>
7+
</picture>
8+
</a>
9+
</p>
10+
11+
<div align="center">
12+
<h1>rewrite-migrate-java</h1>
13+
</div>
14+
15+
<div align="center">
16+
17+
<!-- Keep the gap above this line, otherwise they won't render correctly! -->
518
[![ci](https://github.com/openrewrite/rewrite-migrate-java/actions/workflows/ci.yml/badge.svg)](https://github.com/openrewrite/rewrite-migrate-java/actions/workflows/ci.yml)
619
[![Maven Central](https://img.shields.io/maven-central/v/org.openrewrite.recipe/rewrite-migrate-java.svg)](https://mvnrepository.com/artifact/org.openrewrite.recipe/rewrite-migrate-java)
720
[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.openrewrite.org/scans)
21+
[![Contributing Guide](https://img.shields.io/badge/Contributing-Guide-informational)](https://github.com/openrewrite/.github/blob/main/CONTRIBUTING.md)
22+
</div>
823

924
### What is this?
1025

‎build.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ dependencies {
3535
runtimeOnly("org.openrewrite:rewrite-java-17")
3636
runtimeOnly("org.openrewrite:rewrite-java-21")
3737

38+
runtimeOnly("tech.picnic.error-prone-support:error-prone-contrib:latest.release:recipes")
39+
3840
testImplementation("org.junit.jupiter:junit-jupiter-api:latest.release")
3941
testImplementation("org.junit.jupiter:junit-jupiter-params:latest.release")
4042
testImplementation("org.junit-pioneer:junit-pioneer:2.0.0")
@@ -54,8 +56,13 @@ dependencies {
5456
testRuntimeOnly("com.fasterxml.jackson.datatype:jackson-datatype-jsr353")
5557
testRuntimeOnly("com.fasterxml.jackson.core:jackson-core")
5658
testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
59+
testRuntimeOnly("com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider")
60+
testRuntimeOnly("com.fasterxml.jackson.module:jackson-module-jaxb-annotations")
61+
testRuntimeOnly("commons-logging:commons-logging:1.3.2")
62+
testRuntimeOnly("org.apache.logging.log4j:log4j-api:2.23.1")
5763
testRuntimeOnly("org.apache.johnzon:johnzon-core:1.2.18")
5864
testRuntimeOnly("org.codehaus.groovy:groovy:latest.release")
65+
testRuntimeOnly("org.jboss.logging:jboss-logging:3.6.0.Final")
5966
testRuntimeOnly("jakarta.annotation:jakarta.annotation-api:2.1.1")
6067
testRuntimeOnly("org.springframework:spring-core:6.1.13")
6168
testRuntimeOnly("com.google.code.findbugs:jsr305:3.0.2")

‎src/main/java/org/openrewrite/java/migrate/ChangeMethodInvocationReturnType.java‎

Lines changed: 9 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,19 @@
1717

1818
import lombok.EqualsAndHashCode;
1919
import lombok.Value;
20-
import org.openrewrite.ExecutionContext;
2120
import org.openrewrite.Option;
2221
import org.openrewrite.Recipe;
23-
import org.openrewrite.TreeVisitor;
24-
import org.openrewrite.internal.ListUtils;
25-
import org.openrewrite.java.JavaIsoVisitor;
26-
import org.openrewrite.java.MethodMatcher;
27-
import org.openrewrite.java.tree.J;
28-
import org.openrewrite.java.tree.JavaType;
29-
import org.openrewrite.java.tree.TypeUtils;
30-
import org.openrewrite.marker.Markers;
3122

32-
import static java.util.Collections.emptyList;
23+
import java.util.List;
3324

25+
import static java.util.Collections.singletonList;
26+
27+
/**
28+
* @deprecated in favor of {@link org.openrewrite.java.ChangeMethodInvocationReturnType}.
29+
*/
3430
@Value
3531
@EqualsAndHashCode(callSuper = false)
32+
@Deprecated
3633
public class ChangeMethodInvocationReturnType extends Recipe {
3734

3835
@Option(displayName = "Method pattern",
@@ -56,63 +53,7 @@ public String getDescription() {
5653
}
5754

5855
@Override
59-
public TreeVisitor<?, ExecutionContext> getVisitor() {
60-
return new JavaIsoVisitor<ExecutionContext>() {
61-
private final MethodMatcher methodMatcher = new MethodMatcher(methodPattern, false);
62-
63-
private boolean methodUpdated;
64-
65-
@Override
66-
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
67-
J.MethodInvocation m = super.visitMethodInvocation(method, ctx);
68-
JavaType.Method type = m.getMethodType();
69-
if (methodMatcher.matches(method) && type != null && !newReturnType.equals(type.getReturnType().toString())) {
70-
type = type.withReturnType(JavaType.buildType(newReturnType));
71-
m = m.withMethodType(type);
72-
if (m.getName().getType() != null) {
73-
m = m.withName(m.getName().withType(type));
74-
}
75-
methodUpdated = true;
76-
}
77-
return m;
78-
}
79-
80-
@Override
81-
public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
82-
methodUpdated = false;
83-
JavaType.FullyQualified originalType = multiVariable.getTypeAsFullyQualified();
84-
J.VariableDeclarations mv = super.visitVariableDeclarations(multiVariable, ctx);
85-
86-
if (methodUpdated) {
87-
JavaType newType = JavaType.buildType(newReturnType);
88-
JavaType.FullyQualified newFieldType = TypeUtils.asFullyQualified(newType);
89-
90-
maybeAddImport(newFieldType);
91-
maybeRemoveImport(originalType);
92-
93-
mv = mv.withTypeExpression(mv.getTypeExpression() == null ?
94-
null :
95-
new J.Identifier(mv.getTypeExpression().getId(),
96-
mv.getTypeExpression().getPrefix(),
97-
Markers.EMPTY,
98-
emptyList(),
99-
newReturnType.substring(newReturnType.lastIndexOf('.') + 1),
100-
newType,
101-
null
102-
)
103-
);
104-
105-
mv = mv.withVariables(ListUtils.map(mv.getVariables(), var -> {
106-
JavaType.FullyQualified varType = TypeUtils.asFullyQualified(var.getType());
107-
if (varType != null && !varType.equals(newType)) {
108-
return var.withType(newType).withName(var.getName().withType(newType));
109-
}
110-
return var;
111-
}));
112-
}
113-
114-
return mv;
115-
}
116-
};
56+
public List<Recipe> getRecipeList() {
57+
return singletonList(new org.openrewrite.java.ChangeMethodInvocationReturnType(methodPattern, newReturnType));
11758
}
11859
}

‎src/main/java/org/openrewrite/java/migrate/ReplaceStringLiteralValue.java‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@
2020
import lombok.EqualsAndHashCode;
2121
import lombok.Value;
2222
import org.jspecify.annotations.NonNull;
23-
import org.openrewrite.ExecutionContext;
2423
import org.openrewrite.Option;
2524
import org.openrewrite.Recipe;
26-
import org.openrewrite.TreeVisitor;
27-
import org.openrewrite.java.JavaIsoVisitor;
28-
import org.openrewrite.java.tree.J;
29-
import org.openrewrite.java.tree.JavaType;
3025

26+
import java.util.List;
27+
28+
import static java.util.Collections.singletonList;
29+
30+
/**
31+
* @deprecated in favor of {@link org.openrewrite.java.ReplaceStringLiteralValue}.
32+
*/
3133
@Value
3234
@EqualsAndHashCode(callSuper = false)
35+
@Deprecated
3336
public class ReplaceStringLiteralValue extends Recipe {
3437

3538
@Option(displayName = "Old literal `String` value",
@@ -61,19 +64,7 @@ public String getDescription() {
6164
}
6265

6366
@Override
64-
public TreeVisitor<?, ExecutionContext> getVisitor() {
65-
return new JavaIsoVisitor<ExecutionContext>() {
66-
@Override
67-
public J.Literal visitLiteral(J.Literal literal, ExecutionContext ctx) {
68-
J.Literal l = super.visitLiteral(literal, ctx);
69-
if (l.getType() != JavaType.Primitive.String || !oldLiteralValue.equals(literal.getValue())) {
70-
return l;
71-
}
72-
return literal
73-
.withValue(newLiteralValue)
74-
.withValueSource('"' + newLiteralValue + '"');
75-
}
76-
};
67+
public List<Recipe> getRecipeList() {
68+
return singletonList(new org.openrewrite.java.ReplaceStringLiteralValue(oldLiteralValue, newLiteralValue));
7769
}
78-
7970
}

0 commit comments

Comments
 (0)