From b56e6313ca239167e8f8c8f69dd082d5b9874340 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Sat, 8 Mar 2008 02:35:19 +0000 Subject: [PATCH] Removed getElementNames(), not required anymore. --- .../org/springframework/xml/xsd/XsdSchema.java | 9 --------- .../xml/xsd/AbstractXsdSchemaTestCase.java | 17 ----------------- 2 files changed, 26 deletions(-) diff --git a/xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java b/xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java index 27376c86..f6510837 100644 --- a/xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java +++ b/xml/src/main/java/org/springframework/xml/xsd/XsdSchema.java @@ -16,7 +16,6 @@ package org.springframework.xml.xsd; -import javax.xml.namespace.QName; import javax.xml.transform.Source; /** @@ -35,14 +34,6 @@ public interface XsdSchema { */ String getTargetNamespace(); - /** - * Returns the qualified names of all top-level elements declared in the schema. This excludes elements declared as - * child of another element, simplyType, or complexType. - * - * @return the top-level element names - */ - QName[] getElementNames(); - /** * Returns the Source of the schema. * diff --git a/xml/src/test/resources/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java b/xml/src/test/resources/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java index dacc087d..3457bf67 100644 --- a/xml/src/test/resources/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java +++ b/xml/src/test/resources/org/springframework/xml/xsd/AbstractXsdSchemaTestCase.java @@ -16,10 +16,6 @@ package org.springframework.xml.xsd; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; -import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; @@ -54,9 +50,6 @@ public abstract class AbstractXsdSchemaTestCase extends XMLTestCase { XsdSchema single = createSchema(resource); String namespace = "http://www.springframework.org/spring-ws/single/schema"; assertEquals("Invalid target namespace", namespace, single.getTargetNamespace()); - QName[] elementNames = single.getElementNames(); - assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest"), new QName(namespace, "GetOrderResponse"), - new QName(namespace, "GetOrderFault")}, elementNames); resource = new ClassPathResource("single.xsd", AbstractXsdSchemaTestCase.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); @@ -70,8 +63,6 @@ public abstract class AbstractXsdSchemaTestCase extends XMLTestCase { XsdSchema including = createSchema(resource); String namespace = "http://www.springframework.org/spring-ws/include/schema"; assertEquals("Invalid target namespace", namespace, including.getTargetNamespace()); - QName[] elementNames = including.getElementNames(); - assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest")}, elementNames); resource = new ClassPathResource("including.xsd", AbstractXsdSchemaTestCase.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); @@ -85,8 +76,6 @@ public abstract class AbstractXsdSchemaTestCase extends XMLTestCase { XsdSchema importing = createSchema(resource); String namespace = "http://www.springframework.org/spring-ws/importing/schema"; assertEquals("Invalid target namespace", namespace, importing.getTargetNamespace()); - QName[] elementNames = importing.getElementNames(); - assertQNamesEqual(new QName[]{new QName(namespace, "GetOrderRequest")}, elementNames); resource = new ClassPathResource("importing.xsd", AbstractXsdSchemaTestCase.class); Document expected = documentBuilder.parse(SaxUtils.createInputSource(resource)); DOMResult domResult = new DOMResult(); @@ -95,11 +84,5 @@ public abstract class AbstractXsdSchemaTestCase extends XMLTestCase { assertXMLEqual("Invalid Source returned", expected, result); } - private void assertQNamesEqual(QName[] expected, QName[] result) { - Set expectedSet = new HashSet(Arrays.asList(expected)); - Set resultSet = new HashSet(Arrays.asList(result)); - assertEquals("Invalid QNames", expectedSet, resultSet); - } - protected abstract XsdSchema createSchema(Resource resource) throws Exception; }