Skip to content

Fix bugs regarding substitution groups and content extensions using xs:all #54

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.

Sign up for GitHub

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

Open
cobizobi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bugs regarding substitution groups and content extensions using xs:all #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b209f67
fix exception for substituted elements without specified type
cobizobi May 18, 2024
b312067
fix ClassCastException for XmlSchemaAll occuring in extensions
cobizobi May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion xmlschema-walker/src/main/java/org/apache/ws/commons/schema/walker/XmlSchemaScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,15 @@ private void walk(boolean isMixed, XmlSchemaContent content) {
} else {
XmlSchemaSequence seq = new XmlSchemaSequence();
seq.getItems().add((XmlSchemaSequenceMember)baseParticle);
seq.getItems().add((XmlSchemaSequenceMember)ext.getParticle());
// we cannot cast a SchemaAll instance to SequenceMember
if (ext.getParticle() instanceof XmlSchemaAll) {
XmlSchemaAll all = (XmlSchemaAll) ext.getParticle();
for (XmlSchemaAllMember allMember : all.getItems()) {
seq.getItems().add((XmlSchemaSequenceMember) allMember);
}
} else {
seq.getItems().add((XmlSchemaSequenceMember) ext.getParticle());
}
child = seq;
}

Expand Down
25 changes: 18 additions & 7 deletions xmlschema-walker/src/main/java/org/apache/ws/commons/schema/walker/XmlSchemaWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,7 @@ public void walk(XmlSchemaElement element) {
element.setMaxOccurs(XmlSchemaParticle.DEFAULT_MAX_OCCURS);
}

XmlSchemaType schemaType = element.getSchemaType();
if (schemaType == null) {
final QName typeQName = element.getSchemaTypeName();
if (typeQName != null) {
schemaType = schemasByNamespace.getTypeByName(typeQName);
}
}
XmlSchemaType schemaType = getSchemaTypeOfElement(element);

if (schemaType != null) {
XmlSchemaScope scope = null;
Expand Down Expand Up @@ -582,4 +576,21 @@ private static QName getElementQName(XmlSchemaElement element) {
return element.getQName();
}
}


private XmlSchemaType getSchemaTypeOfElement(XmlSchemaElement element) {
XmlSchemaType schemaType = element.getSchemaType();
if (schemaType == null) {
final QName typeQName = element.getSchemaTypeName();
if (typeQName != null) {
schemaType = schemasByNamespace.getTypeByName(typeQName);
} else {
final QName substitutionGroupQName = element.getSubstitutionGroup();
if (substitutionGroupQName != null) {
schemaType = getSchemaTypeOfElement(schemasByNamespace.getElementByName(substitutionGroupQName));
}
}
}
return schemaType;
}
}