-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Disable validation of JAXBContext by default #32105
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
|
@@ -316,35 +316,19 @@ FilteredJaxbClassesToBeBoundBuildItem filterBoundClasses( | |
|
||
@BuildStep | ||
@Record(ExecutionTime.STATIC_INIT) | ||
void validateDefaultJaxbContext( | ||
void bindClassesToJaxbContext( | ||
JaxbConfig config, | ||
FilteredJaxbClassesToBeBoundBuildItem filteredClassesToBeBound, | ||
SynthesisFinishedBuildItem beanContainerState, | ||
JaxbContextConfigRecorder jaxbContextConfig /* Force the build time container to invoke this method */) { | ||
|
||
if (config.validateJaxbContext) { | ||
final BeanResolver beanResolver = beanContainerState.getBeanResolver(); | ||
final Set<BeanInfo> beans = beanResolver | ||
.resolveBeans(Type.create(DotName.createSimple(JAXBContext.class), org.jboss.jandex.Type.Kind.CLASS)); | ||
if (!beans.isEmpty()) { | ||
jaxbContextConfig.addClassesToBeBound(filteredClassesToBeBound.getClasses()); | ||
final BeanInfo bean = beanResolver.resolveAmbiguity(beans); | ||
if (bean.isDefaultBean()) { | ||
/* | ||
* Validate the default JAXB context at build time and fail early. | ||
* Do this only if the user application actually requires the default JAXBContext bean | ||
*/ | ||
try { | ||
JAXBContext.newInstance(filteredClassesToBeBound.getClasses().toArray(new Class[0])); | ||
} catch (JAXBException e) { | ||
/* | ||
* Producing a ValidationErrorBuildItem would perhaps be more natural here, | ||
* but doing so causes a cycle between this and reactive JAXB extension | ||
* Throwing from here works well too | ||
*/ | ||
throw new DeploymentException("Failed to create or validate the default JAXBContext", e); | ||
} | ||
} | ||
final BeanResolver beanResolver = beanContainerState.getBeanResolver(); | ||
final Set<BeanInfo> beans = beanResolver | ||
.resolveBeans(Type.create(DotName.createSimple(JAXBContext.class), org.jboss.jandex.Type.Kind.CLASS)); | ||
if (!beans.isEmpty()) { | ||
jaxbContextConfig.addClassesToBeBound(filteredClassesToBeBound.getClasses()); | ||
if (config.validateJaxbContext) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These changes fix the issue where the classes were not bound if the validation of the jaxb context was disabled. |
||
validateJaxbContext(filteredClassesToBeBound, beanResolver, beans); | ||
} | ||
} | ||
} | ||
|
@@ -354,6 +338,27 @@ void registerProduces(BuildProducer<AdditionalBeanBuildItem> additionalBeans) { | |
additionalBeans.produce(new AdditionalBeanBuildItem(JaxbContextProducer.class)); | ||
} | ||
|
||
private void validateJaxbContext(FilteredJaxbClassesToBeBoundBuildItem filteredClassesToBeBound, BeanResolver beanResolver, | ||
Set<BeanInfo> beans) { | ||
final BeanInfo bean = beanResolver.resolveAmbiguity(beans); | ||
if (bean.isDefaultBean()) { | ||
/* | ||
* Validate the default JAXB context at build time and fail early. | ||
* Do this only if the user application actually requires the default JAXBContext bean | ||
*/ | ||
try { | ||
JAXBContext.newInstance(filteredClassesToBeBound.getClasses().toArray(new Class[0])); | ||
} catch (JAXBException e) { | ||
/* | ||
* Producing a ValidationErrorBuildItem would perhaps be more natural here, | ||
* but doing so causes a cycle between this and reactive JAXB extension | ||
* Throwing from here works well too | ||
*/ | ||
throw new DeploymentException("Failed to create or validate the default JAXBContext", e); | ||
} | ||
} | ||
} | ||
|
||
private void handleJaxbFile(Path p, BuildProducer<NativeImageResourceBuildItem> resource, | ||
BuildProducer<ReflectiveClassBuildItem> reflectiveClass, | ||
List<String> classesToBeBound) { | ||
|
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
1 change: 1 addition & 0 deletions
1
extensions/jaxb/deployment/src/test/resources/application-enable-validation.properties
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 @@ | ||
quarkus.jaxb.validate-jaxb-context=true |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is necessary because some tests rely on English wording.