You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2021/04/08 15:20:27 UTC
[cxf] branch master updated: squash! [CXF-8450] Changes visibility
of internal methods in JAXBDataBinding to permit extensions as necessary
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 218b67b squash! [CXF-8450] Changes visibility of internal methods in JAXBDataBinding to permit extensions as necessary
new 4a8d90e Merge pull request #770 from WoodenAndrew/CXF-8450
218b67b is described below
commit 218b67ba930a3664ed4a2934a34006d7102f2785
Author: Mantas Gridinas <ma...@storebrand.no>
AuthorDate: Wed Apr 7 10:38:35 2021 +0300
squash! [CXF-8450] Changes visibility of internal methods in JAXBDataBinding to permit extensions as necessary
Checks the built in schemas via method rather than directly
---
.../main/java/org/apache/cxf/jaxb/JAXBDataBinding.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 6632c14..a66e9bf 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -248,7 +248,11 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
this();
setContext(context);
}
-
+
+ protected boolean getQualifiedSchemas() {
+ return qualifiedSchemas;
+ }
+
public JAXBContext getContext() {
return context;
}
@@ -386,7 +390,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
try {
for (DOMResult r : generateJaxbSchemas()) {
DOMSource src = new DOMSource(r.getNode(), r.getSystemId());
- if (BUILT_IN_SCHEMAS.containsValue(r)) {
+ if (isInBuiltInSchemas(r)) {
bi.add(src);
} else {
schemas.add(src);
@@ -423,7 +427,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
}
- private void justCheckForJAXBAnnotations(ServiceInfo serviceInfo) {
+ protected void justCheckForJAXBAnnotations(ServiceInfo serviceInfo) {
for (MessageInfo mi: serviceInfo.getMessages().values()) {
for (MessagePartInfo mpi : mi.getMessageParts()) {
checkForJAXBAnnotations(mpi, serviceInfo.getXmlSchemaCollection(), serviceInfo.getTargetNamespace());
@@ -444,7 +448,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
}
- private String getNamespaceToUse(Service service) {
+ protected String getNamespaceToUse(Service service) {
if ("true".equals(service.get("org.apache.cxf.databinding.namespace"))) {
return null;
}
@@ -812,6 +816,10 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
objectFactory);
}
+ public static boolean isInBuiltInSchemas(DOMResult schema) {
+ return BUILT_IN_SCHEMAS.containsValue(schema);
+ }
+
private static Field getElField(String partName, final Class<?> wrapperType) {
String fieldName = JAXBUtils.nameToIdentifier(partName, JAXBUtils.IdentifierType.VARIABLE);
Field[] fields = ReflectionUtil.getDeclaredFields(wrapperType);