Merge jakarta.web.beans and web.beans #7958
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
matthiasblaesing
added
Java
matthiasblaesing
added
the
ci:dev-build
This was referenced Nov 13, 2024
mbien
reviewed
Nov 22, 2024
enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/AnnotationUtil.java
Outdated
Show resolved
Hide resolved
mbien
added
tests
JavaDoc
mbien
approved these changes
Dec 2, 2024
There was a problem hiding this comment.
Looked through everything with a coffee and I think it should be fine.
left some comments but they aren't that important. List.of() is immutable and has the advantage that it makes followup List.copyOf()'s a no-op. It also doesn't allow null, so it would fail early.
...prise/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorBindingChecker.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/DecoratorObjectProvider.java
Outdated
Show resolved
Hide resolved
...rprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AnnotationObjectProvider.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AbstractObjectProvider.java
Outdated
Show resolved
Hide resolved
...prise/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorObjectProvider.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/NormalScopeChecker.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/QualifierChecker.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/ScopeChecker.java
Outdated
Show resolved
Hide resolved
enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypeChecker.java
Outdated
Show resolved
Hide resolved
...prise/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypedObjectProvider.java
Outdated
Show resolved
Hide resolved
Start: 85 passed, 45 failed - Add "Java SE Platforms and Libraries" as test dependency Status: 125 passed, 5 failed - Reference code uses wrong placement of annotations, method annotations come before the return type - There is not mention in the spec, that an @Injectable field may not be initialized Status: 130 passed
The jakarta.web.beans module was created as a copy of the web.beans module, just using the new namespaces after the death of JavaEE and the inception of JakartaEE. Other modules followed a different route, where the existing implementations were extended to support both the old and new XML/package namespaces. This becomes a problem, when it hits the UI as the user then does not know what to do (which template/menu entry to choose and "what the heck is JakartaEE and why is that not JavaEE anymore?!"). What is more codepaths are duplicated and fixes for one area are highly likely to be relevant for the other also. This change integrates the unittests from the jakarta.web.beans project, if they actually check jakarta* functions and modifies the codepaths, so that both namespaces are supported. Closes: apache#7918
Local run is clean, runtime is high, but seems reasonable (5:30min)
matthiasblaesing
force-pushed
the
merge_cdi2
branch
from
24e6f9b to
d31d18a
Compare
|
Squashed and rebased onto master, resolving the merge conflict. I removed the reference to I intent to merge this shortly when/if tests are green. |
|
|
|
@mbien thanks for having a look. No need to apologize, flaky tests are ugly. I ran the tests locally and apart from locale problems (since a few releases javac localizes messages) and the excessive runtime, everything seems to be ok. So I'll merge. |
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.
The jakarta.web.beans module was created as a copy of the web.beans
module, just using the new namespaces after the death of JavaEE and the
inception of JakartaEE. Other modules followed a different route, where
the existing implementations were extended to support both the old and
new XML/package namespaces.
This becomes a problem, when it hits the UI as the user then does not
know what to do (which template/menu entry to choose and "what the heck
is JakartaEE and why is that not JavaEE anymore?!"). What is more
codepaths are duplicated and fixes for one area are highly likely to be
relevant for the other also.
This change integrates the unittests from the jakarta.web.beans project,
if they actually check jakarta* functions and modifies the codepaths, so
that both namespaces are supported.
This PR also fixes and reenables the CI/CD integration of the web.beans tests.
Closes: #7918
Closes: #6875