Make server-side components use only Jakarta EE #7837
Merged
Conversation
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
In the past we allowed using either Java 8 or 11+ to test Nessie services. Some time ago, Nessie started to require Java 11 for all services. This change is a consequence of the former two changes and removes dependencies to `javax.*` (Java EE), favoring `jakarta.*` (Jakarta EE). Most code changes are pretty boring: * Remove `javax.*` annotations * Remove dependencies from the build scripts * `JerseyServer` in the compatibility tests has the only "real" code change
dimas-b
reviewed
Dec 13, 2023
...tibility/jersey/src/main/java/org/projectnessie/tools/compatibility/jersey/JerseyServer.java
Outdated
Show resolved
Hide resolved
adutra
reviewed
Dec 14, 2023
| @@ -172,20 +174,24 @@ private static void withClass( | |||
|
|
|||
| private static void withJavaxClass( | |||
There was a problem hiding this comment.
Since we are moving towards jakarta and eventually javax will go away, it would be easier to understand if we inverted the logic:
withJakartaClass(
"org.projectnessie.services.restjakarta.ContentKeyParamConverterProvider",
config::register,
true);
private static void withJakartaClass(
String jakartaClassName, Consumer<Class<?>> whenClassExists, boolean mandatory) {
Iterator<String> classNames =
List.of(jakartaClassName, jakartaClassName.replace("restjakarta.", "restjavax."))
.iterator();
// ...There was a problem hiding this comment.
Are we sure we need this replacement: javaxClassName.replace("restjavax.", "rest.") ? I removed it, and the build passed.
There was a problem hiding this comment.
Some older Nessie versions required it (a while ago). Maybe no longer needed.
dimas-b
approved these changes
Dec 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the past we allowed using either Java 8 or 11+ to test Nessie services. Some time ago, Nessie started to require Java 11 for all services. This change is a consequence of the former two changes and removes dependencies to
javax.*(Java EE), favoringjakarta.*(Jakarta EE).Most code changes are pretty boring:
javax.*annotationsJerseyServerin the compatibility tests has the only "real" code change