-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into jakarta-ee-recipe-cleanup
- Loading branch information
Showing
8 changed files
with
725 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
src/main/java/org/openrewrite/java/migrate/javax/AddDefaultConstructorToEntityClass.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright 2024 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java.migrate.javax; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import org.openrewrite.*; | ||
| import org.openrewrite.java.JavaIsoVisitor; | ||
| import org.openrewrite.java.JavaTemplate; | ||
| import org.openrewrite.java.search.FindAnnotations; | ||
| import org.openrewrite.java.search.UsesType; | ||
| import org.openrewrite.java.tree.J; | ||
|
|
||
| import java.util.Comparator; | ||
|
|
||
| @EqualsAndHashCode(callSuper = false) | ||
| public class AddDefaultConstructorToEntityClass extends Recipe { | ||
| @Override | ||
| public String getDisplayName() { | ||
| return "`@Entity` objects with constructors must also have a default constructor"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return "When a Java Persistence API (JPA) entity class has a constructor with arguments, the class must also " + | ||
| "have a default, no-argument constructor. The OpenJPA implementation automatically generates the " + | ||
| "no-argument constructor, but the EclipseLink implementation does not."; | ||
| } | ||
|
|
||
| @Override | ||
| public TreeVisitor<?, ExecutionContext> getVisitor() { | ||
| return Preconditions.check( | ||
| Preconditions.or( | ||
| new UsesType<>("javax.persistence.Entity", true), | ||
| new UsesType<>("javax.persistence.MappedSuperclass", true)), | ||
| new JavaIsoVisitor<ExecutionContext>() { | ||
| @Override | ||
| public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) { | ||
| // Exit if class not annotated with either @Entity or @MappedSuperclass | ||
| if (FindAnnotations.find(classDecl, "javax.persistence.Entity").isEmpty() | ||
| && FindAnnotations.find(classDecl, "javax.persistence.MappedSuperclass").isEmpty()) { | ||
| return classDecl; | ||
| } | ||
|
|
||
| // Exit if class already has default no-arg constructor | ||
| if (classDecl.getBody().getStatements().stream() | ||
| .filter(statement -> statement instanceof J.MethodDeclaration) | ||
| .map(J.MethodDeclaration.class::cast) | ||
| .filter(J.MethodDeclaration::isConstructor) | ||
| .anyMatch(constructor -> constructor.getParameters().get(0) instanceof J.Empty)) { | ||
| return classDecl; | ||
| } | ||
|
|
||
| // Add default constructor with empty body | ||
| return classDecl.withBody(JavaTemplate.builder("public #{}(){}") | ||
| .contextSensitive() | ||
| .build() | ||
| .apply(new Cursor(getCursor(), classDecl.getBody()), | ||
| classDecl.getBody().getCoordinates().firstStatement(), | ||
| classDecl.getSimpleName() | ||
| ) | ||
| ); | ||
| } | ||
| } | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
136 changes: 136 additions & 0 deletions
136
src/test/java/org/openrewrite/java/migrate/AddMissingMethodImplementationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /* | ||
| * Copyright 2024 the original author or authors. | ||
| * <p> | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * <p> | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * <p> | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.openrewrite.java.migrate; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.openrewrite.DocumentExample; | ||
| import org.openrewrite.Issue; | ||
| import org.openrewrite.test.RecipeSpec; | ||
| import org.openrewrite.test.RewriteTest; | ||
|
|
||
| import static org.openrewrite.java.Assertions.java; | ||
| import static org.openrewrite.java.Assertions.javaVersion; | ||
|
|
||
| class AddMissingMethodImplementationTest implements RewriteTest { | ||
|
|
||
| @Override | ||
| public void defaults(RecipeSpec spec) { | ||
| spec.recipe( | ||
| new AddMissingMethodImplementation("I1", "*..* m1()", | ||
| "public void m1() { System.out.println(\"m1\"); }")) | ||
| .allSources(src -> src.markers(javaVersion(21))); | ||
| } | ||
|
|
||
| @Test | ||
| @Issue("https://github.com/openrewrite/rewrite-migrate-java/issues/459") | ||
| void skipInterfaces() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| interface I2 extends I1 {} | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void skipAbstractClasses() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| abstract class AC2 implements I1 {} | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @DocumentExample | ||
| @Test | ||
| void happyPath() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| class C2 implements I1 {} | ||
| """, | ||
| """ | ||
| interface I1 {} | ||
| class C2 implements I1 { | ||
| public void m1() { | ||
| System.out.println("m1"); | ||
| }} | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void methodExists() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| class C2 implements I1 { | ||
| public void m1() { | ||
| System.out.println("m1"); | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void methodExistsDiffImpl() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| class C2 implements I1 { | ||
| public void m1() { | ||
| System.out.println("m1 diff"); | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| void methodExistsDiffSignature() { | ||
| //language=java | ||
| rewriteRun( | ||
| java( | ||
| """ | ||
| interface I1 {} | ||
| class C2 implements I1 { | ||
| protected void m1() { | ||
| System.out.println("m1"); | ||
| } | ||
| } | ||
| """ | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.