JavaEE to Quarkus 2 Declarative Migration Recipe #73

ShatanikB · 2024-02-04T05:05:40Z

What's changed?

Added a declarative recipe to migrate Java EE to Quarkus 2. Started with adding Quarkus BOM, Quarkus extension dependencies, removed JEE dependencies, converted some EJB annotations to CDI (Stateful, Stateless and Singleton), changed JPA annotations to work with Quarkus

What's your motivation?

Contributing to #72

Anything in particular you'd like reviewers to focus on?

General feedback on Best practices I might be missing

Anyone you would like to review specifically?

@timtebeek

Any additional context

Trying to keep it declarative. Will add imperative recipes if required.

Checklist

~~[ ] I've added unit tests to cover both positive and negative cases~~
No because composite recipe. Have tested on real applications
I've read and applied the recipe conventions and best practices
I've used the IntelliJ IDEA auto-formatter on affected files

timtebeek · 2024-02-04T10:02:28Z

Great start @ShatanikB ! Good to hear these recipes already work for you on real applications.

My suggestion for maintainability going forward is that we move your declarative recipes into a separate javaee-to-quarkus.yml file, such that it's clear from the filename what the scope is. Perhaps it would also be good to split the sinlgle large declarative recipe into two: one for the Maven & dependency changes, and another for the Java code changes. That makes it easier to reuse a part of those changes elsewhere. Your JavaEEtoQuarkus2Migration recipe can then call both of those recipes.

I've also added a test just now because that triggers some of the validations we do through our test framework. I'll work on getting the unit tests to pass on main, as those seem to have broken due to a change upstream.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

…s YML

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

src/test/java/org/openrewrite/quarkus/quarkus2/JavaEEtoQuarkus2CodeTranformationsTest.java

…2CodeTranformationsTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

timtebeek

Thanks both! From what I'm seeing this is ready for review and merge.

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

gsmet · 2024-02-06T10:44:01Z

Just a note that I will have a look this week.

ShatanikB · 2024-02-06T23:51:55Z

Sorry for the newbie mistakes. For some reason, it shows that @ammachado is committing changes instead of me.

timtebeek · 2024-02-07T00:13:01Z

Sorry for the newbie mistakes. For some reason, it shows that @ammachado is committing changes instead of me.

Those commits are quite confusing indeed; could you check both your user home ~/.gitconfig and repository .git/config to see if there's any [user] blocks that contain the wrong configuration values?

…s Maven only right now. Added a TODO for Gradle

ShatanikB · 2024-02-07T01:13:08Z

Those commits are quite confusing indeed; could you check both your user home ~/.gitconfig and repository .git/config to see if there's any [user] blocks that contain the wrong configuration values?

Thanks again. My user was not configured at all on codespaces. Fixed it.

gsmet

Sorry for the delay, time is scarce on my side these days.

I added some comments but it looks good overall.

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

gsmet · 2024-02-15T09:54:34Z

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

+  - org.openrewrite.java.dependencies.AddDependency:
+      groupId: io.quarkus
+      artifactId: quarkus-undertow


I'm not sure I would add this one except if the application is explicitly using servlet.

Especially since having undertow around changes the behavior of Quarkus.

Now this can probably be done as a follow-up.

Added undertow to be able to use the 'SessionScoped' annotation as per this . Making the assumption that @javax.ejb.Stateful should be mapped to @javax.enterprise.context.SessionScoped in CDI

gsmet · 2024-02-15T09:54:55Z

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

+  - org.openrewrite.java.dependencies.AddDependency:
+      groupId: io.quarkus
+      artifactId: quarkus-hibernate-orm
+  - org.openrewrite.java.dependencies.AddDependency:
+      groupId: io.quarkus
+      artifactId: quarkus-jdbc-h2


Same here, I don't think I would add these two except if the application makes use of persistence.

Now this can probably be done as a follow-up.

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

...st/java/org/openrewrite/quarkus/quarkus2/JavaEEtoQuarkus2MavenDependenciesMigrationTest.java

ammachado · 2024-02-16T02:05:36Z

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml

+displayName: Migrate JavaEE Maven Dependencies to Quarkus 2
+description: Upgrade Standard JavaEE dependencies to Quarkus 2 dependencies.


I have a recipe locally that does exactly this (and most part of the dependency handling of this recipe). It adds the Camel Extensions for Quarkus, and the output is closer to what quarkus init generates. I can contribute it on a separate PR (but I need openrewrite/rewrite#4006 merged before that).

#4006 is now merged if you'd like to open that other PR @ammachado

Hi @ammachado Did you have a PR for similar functionality ?

timtebeek

Great work here @ShatanikB ! I've refreshed your PR with a couple of new insights since it was opened, and added small steps like removing the maven-war-plugin. Hope you agree,

It took longer than I'd wanted to see this through, as I had left space for additional review. But enough time has passed now that we'll just continue to work on the main branch if anything new feedback arrives, since you've been patient enough to get this merged.

Thanks to all involved; hope this helps drive adoption towards Quarkus from Java EE 7, and from there onwards to Quarkus 3+.

* JavaEE to Quarkus 2 Declarative Migration Recipe * Add JavaEEtoQuarkus2MigrationTest and verify pom changes * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Split Recipe to Maven Dependencies Upgrade YML and Code Tranformations YML * Updated Tests * Remove recipe from quarkus.yml * Merge all three JavaEEtoQuarkus2 recipes into one file * Update src/test/java/org/openrewrite/quarkus/quarkus2/JavaEEtoQuarkus2CodeTranformationsTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Updated Dependency Migration Description to reflect that this migrates Maven only right now. Added a TODO for Gradle * Updated dependency versions and tests * Move recipes and reformat tests * Break up dependency & maven recipes; expect to remove war plugin * Bump failsafe and surefire plugin versions --------- Co-authored-by: Adriano Machado <[email protected]> Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: Tim te Beek <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

ammachado and others added 2 commits February 4, 2024 04:43

JavaEE to Quarkus 2 Declarative Migration Recipe

d645b00

Add JavaEEtoQuarkus2MigrationTest and verify pom changes

d1451f4

timtebeek assigned ShatanikB Feb 4, 2024

timtebeek added the recipe label Feb 4, 2024

timtebeek added 2 commits February 4, 2024 13:22

Merge branch 'main' into main

475857e

Merge branch 'main' into main

f61e285

This comment was marked as outdated.

Sign in to view

timtebeek and others added 5 commits February 5, 2024 13:02

Apply suggestions from code review

2065265

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Merge branch 'main' into main

6743def

Split Recipe to Maven Dependencies Upgrade YML and Code Tranformation…

88efbda

…s YML

Updated Tests

c31622f

Remove recipe from quarkus.yml

60cc5e1

timtebeek reviewed Feb 6, 2024

View reviewed changes

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml Outdated Show resolved Hide resolved

Merge all three JavaEEtoQuarkus2 recipes into one file

8d5c734

github-actions bot reviewed Feb 6, 2024

View reviewed changes

src/test/java/org/openrewrite/quarkus/quarkus2/JavaEEtoQuarkus2CodeTranformationsTest.java Outdated Show resolved Hide resolved

Update src/test/java/org/openrewrite/quarkus/quarkus2/JavaEEtoQuarkus…

af2b54f

…2CodeTranformationsTest.java Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

timtebeek marked this pull request as ready for review February 6, 2024 10:39

timtebeek approved these changes Feb 6, 2024

View reviewed changes

timtebeek reviewed Feb 6, 2024

View reviewed changes

src/main/resources/META-INF/rewrite/javaee-to-quarkus.yml Outdated Show resolved Hide resolved

Updated Dependency Migration Description to reflect that this migrate…

9509f27

…s Maven only right now. Added a TODO for Gradle

ShatanikB force-pushed the main branch from f1d36cc to 9509f27 Compare February 7, 2024 01:10

Merge branch 'main' into main

1867feb

timtebeek requested a review from gsmet February 12, 2024 18:26

gsmet reviewed Feb 15, 2024

View reviewed changes

ammachado reviewed Feb 16, 2024

View reviewed changes

Merge branch 'main' into main

421ff81

timtebeek self-requested a review April 14, 2024 20:15

ShatanikB and others added 9 commits April 24, 2024 07:17

Merge "main" into "main"

0ade672

Updated dependency versions and tests

12e8a53

Merge branch 'main' into main

a509c5a

Merge branch 'main' into main

57b3683

Merge branch 'main' into main

8f9d4a5

Move recipes and reformat tests

23ef2d3

Merge branch 'main' into main

ca1d498

Break up dependency & maven recipes; expect to remove war plugin

f1cb466

Bump failsafe and surefire plugin versions

b25b2de

timtebeek approved these changes Jul 12, 2024

View reviewed changes

timtebeek merged commit 26bedfe into openrewrite:main Jul 12, 2024
2 checks passed

timtebeek mentioned this pull request Jul 12, 2024

Java EE to Quarkus 2 Migration Recipe Request #72

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JavaEE to Quarkus 2 Declarative Migration Recipe #73

JavaEE to Quarkus 2 Declarative Migration Recipe #73

ShatanikB commented Feb 4, 2024 •

edited by timtebeek

Loading

timtebeek commented Feb 4, 2024

This comment was marked as outdated.

timtebeek left a comment

gsmet commented Feb 6, 2024

ShatanikB commented Feb 6, 2024

timtebeek commented Feb 7, 2024

ShatanikB commented Feb 7, 2024

gsmet left a comment

gsmet Feb 15, 2024

ShatanikB Feb 20, 2024

gsmet Feb 15, 2024

ammachado Feb 16, 2024

jkschneider Mar 18, 2024

ShatanikB Mar 28, 2024

timtebeek left a comment

		displayName: Migrate JavaEE Maven Dependencies to Quarkus 2
		description: Upgrade Standard JavaEE dependencies to Quarkus 2 dependencies.

JavaEE to Quarkus 2 Declarative Migration Recipe #73

JavaEE to Quarkus 2 Declarative Migration Recipe #73

Conversation

ShatanikB commented Feb 4, 2024 • edited by timtebeek Loading

What's changed?

What's your motivation?

Anything in particular you'd like reviewers to focus on?

Anyone you would like to review specifically?

Any additional context

Checklist

timtebeek commented Feb 4, 2024

This comment was marked as outdated.

timtebeek left a comment

Choose a reason for hiding this comment

gsmet commented Feb 6, 2024

ShatanikB commented Feb 6, 2024

timtebeek commented Feb 7, 2024

ShatanikB commented Feb 7, 2024

gsmet left a comment

Choose a reason for hiding this comment

gsmet Feb 15, 2024

Choose a reason for hiding this comment

ShatanikB Feb 20, 2024

Choose a reason for hiding this comment

gsmet Feb 15, 2024

Choose a reason for hiding this comment

ammachado Feb 16, 2024

Choose a reason for hiding this comment

jkschneider Mar 18, 2024

Choose a reason for hiding this comment

ShatanikB Mar 28, 2024

Choose a reason for hiding this comment

timtebeek left a comment

Choose a reason for hiding this comment

ShatanikB commented Feb 4, 2024 •

edited by timtebeek

Loading