jpoje-gtri commented on a change in pull request #543: [CXF-8025]: Fix Wrapper
Style for multilevel xsd:extension elements
URL: https://github.com/apache/cxf/pull/543#discussion_r292537103
##########
File path:
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ProcessorUtil.java
##########
@@ -368,32 +366,46 @@ public static Node cloneNode(Document document, Node
node, boolean deep) throws
XmlSchemaSequence seq = (XmlSchemaSequence)type.getParticle();
- qnames.addAll(createWrappedElements(seq));
+ List<WrapperElement> qnames = createWrappedElements(seq);
//If it's extension
if (seq == null && type.getContentModel() != null) {
+ qnames.addAll(createWrappedElementsFromExtension(schema, type));
+ }
- XmlSchemaContent xmlSchemaConent =
type.getContentModel().getContent();
- if (xmlSchemaConent instanceof XmlSchemaComplexContentExtension) {
- XmlSchemaComplexContentExtension extension =
(XmlSchemaComplexContentExtension)type
- .getContentModel().getContent();
- QName baseTypeName = extension.getBaseTypeName();
- XmlSchemaType schemaType = schema.getTypeByQName(baseTypeName);
- if (schemaType instanceof XmlSchemaComplexType) {
- XmlSchemaComplexType complexType =
(XmlSchemaComplexType)schemaType;
- if (complexType.getParticle() instanceof
XmlSchemaSequence) {
- seq = (XmlSchemaSequence)complexType.getParticle();
- qnames.addAll(createWrappedElements(seq));
- }
- }
+ return qnames;
+ }
- if (extension.getParticle() instanceof XmlSchemaSequence) {
- XmlSchemaSequence xmlSchemaSeq =
(XmlSchemaSequence)extension.getParticle();
- qnames.addAll(createWrappedElements(xmlSchemaSeq));
- }
+ private static List<WrapperElement>
createWrappedElementsFromExtension(SchemaCollection schema,
+
XmlSchemaComplexType type) {
+ List<WrapperElement> qnames = new ArrayList<>();
+
+ XmlSchemaContent schemaContent = type.getContentModel().getContent();
+ if (!(schemaContent instanceof XmlSchemaComplexContentExtension)) {
+ return qnames;
+ }
+
+ XmlSchemaComplexContentExtension extension =
(XmlSchemaComplexContentExtension)schemaContent;
+ QName baseTypeName = extension.getBaseTypeName();
+ XmlSchemaType baseType = schema.getTypeByQName(baseTypeName);
+
+ if (baseType instanceof XmlSchemaComplexType) {
+ XmlSchemaComplexType complexBaseType =
(XmlSchemaComplexType)baseType;
+
+ if (complexBaseType.getParticle() == null &&
complexBaseType.getContentModel() != null) {
+ // continue up the extension ladder
+ qnames.addAll(createWrappedElementsFromExtension(schema,
complexBaseType));
Review comment:
Just wanted to drop a note that I have not forgotten about this, it is just
going to be a while before I can circle back and knock it out.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
