Skip to content

Commit b56e631

Browse files
committed
Removed getElementNames(), not required anymore.
1 parent 0453bb4 commit b56e631

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.xml.xsd;
1818

19-
import javax.xml.namespace.QName;
2019
import javax.xml.transform.Source;
2120

2221
/**
@@ -35,14 +34,6 @@ public interface XsdSchema {
3534
*/
3635
String getTargetNamespace();
3736

38-
/**
39-
* Returns the qualified names of all top-level elements declared in the schema. This excludes elements declared as
40-
* child of another <code>element</code>, <code>simplyType</code>, or <code>complexType</code>.
41-
*
42-
* @return the top-level element names
43-
*/
44-
QName[] getElementNames();
45-
4637
/**
4738
* Returns the <code>Source</code> of the schema.
4839
*

xml/src/test/resources/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
package org.springframework.xml.xsd;
1818

19-
import java.util.Arrays;
20-
import java.util.HashSet;
21-
import java.util.Set;
22-
import javax.xml.namespace.QName;
2319
import javax.xml.parsers.DocumentBuilder;
2420
import javax.xml.parsers.DocumentBuilderFactory;
2521
import javax.xml.transform.Transformer;
@@ -54,9 +50,6 @@ public void testSingle() throws Exception {
5450
XsdSchema single = createSchema(resource);
5551
String namespace = "http://www.springframework.org/spring-ws/single/schema";
5652
assertEquals("Invalid target namespace", namespace, single.getTargetNamespace());
57-
QName[] elementNames = single.getElementNames();
58-
assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest"), new QName(namespace, "GetOrderResponse"),
59-
new QName(namespace, "GetOrderFault")}, elementNames);
6053
resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class);
6154
Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource));
6255
DOMResult domResult = new DOMResult();
@@ -70,8 +63,6 @@ public void testIncludes() throws Exception {
7063
XsdSchema including = createSchema(resource);
7164
String namespace = "http://www.springframework.org/spring-ws/include/schema";
7265
assertEquals("Invalid target namespace", namespace, including.getTargetNamespace());
73-
QName[] elementNames = including.getElementNames();
74-
assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest")}, elementNames);
7566
resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTestCase.class);
7667
Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource));
7768
DOMResult domResult = new DOMResult();
@@ -85,8 +76,6 @@ public void testImports() throws Exception {
8576
XsdSchema importing = createSchema(resource);
8677
String namespace = "http://www.springframework.org/spring-ws/importing/schema";
8778
assertEquals("Invalid target namespace", namespace, importing.getTargetNamespace());
88-
QName[] elementNames = importing.getElementNames();
89-
assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest")}, elementNames);
9079
resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTestCase.class);
9180
Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource));
9281
DOMResult domResult = new DOMResult();
@@ -95,11 +84,5 @@ public void testImports() throws Exception {
9584
assertXMLEqual("Invalid Source returned", expected, result);
9685
}
9786

98-
private void assertQNamesEqual(QName[] expected, QName[] result) {
99-
Set expectedSet = new HashSet(Arrays.asList(expected));
100-
Set resultSet = new HashSet(Arrays.asList(result));
101-
assertEquals("Invalid QNames", expectedSet, resultSet);
102-
}
103-
10487
protected abstract XsdSchema createSchema(Resource resource) throws Exception;
10588
}

0 commit comments

Comments
 (0)