Author: jim.ma Date: 2013-04-08 01:10:01 -0400 (Mon, 08 Apr 2013) New Revision: 17460 Modified: spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java Log: [JBWS-3524]:Update spi Modified: spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java =================================================================== --- spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2013-04-08 03:01:19 UTC (rev 17459) +++ spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/JBossWebservicesFactory.java 2013-04-08 05:10:01 UTC (rev 17460) @@ -83,7 +83,7 @@ * @param root virtual file root * @return JBossWebservicesMetaData or <code>null</code> if it cannot be found */ - public static JBossWebservicesMetaData loadFromVFSRoot(final UnifiedVirtualFile root) { + public JBossWebservicesMetaData loadFromVFSRoot(final UnifiedVirtualFile root) { JBossWebservicesMetaData webservices = null; UnifiedVirtualFile wsdd = root.findChildFailSafe("META-INF/jboss-webservices.xml"); @@ -101,7 +101,7 @@ return webservices; } - public static JBossWebservicesMetaData load(final URL wsddUrl) { + public JBossWebservicesMetaData load(final URL wsddUrl) { InputStream is = null; try { is = wsddUrl.openStream(); @@ -118,11 +118,11 @@ } } - public static JBossWebservicesMetaData parse(final InputStream is) { + public JBossWebservicesMetaData parse(final InputStream is) { return parse(is, null); } - public static JBossWebservicesMetaData parse(final InputStream is, final URL descriptorURL) { + public JBossWebservicesMetaData parse(final InputStream is, final URL descriptorURL) { try { final XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(is); return parse(xmlr, descriptorURL); @@ -131,11 +131,11 @@ } } - public static JBossWebservicesMetaData parse(final XMLStreamReader reader) throws XMLStreamException { + public JBossWebservicesMetaData parse(final XMLStreamReader reader) throws XMLStreamException { return parse(reader, null); } - private static JBossWebservicesMetaData parse(final XMLStreamReader reader, final URL descriptorURL) + private JBossWebservicesMetaData parse(final XMLStreamReader reader, final URL descriptorURL) throws XMLStreamException { int iterate; try { @@ -154,8 +154,7 @@ if (match(reader, JBOSSEE_NS, WEBSERVICES)) { String nsUri = reader.getNamespaceURI(); - JBossWebservicesFactory factory = new JBossWebservicesFactory(descriptorURL); - metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + metadata = parseWebservices(reader, nsUri, descriptorURL); } else { throw MESSAGES.unexpectedElement(descriptorURL != null ? descriptorURL.toString() : "jboss-webservices.xml", reader.getLocalName()); } @@ -178,11 +177,11 @@ } case XMLStreamConstants.START_ELEMENT: { if (match(reader, nsUri, CONTEXT_ROOT)) { - metadata.setContextRoot(elementAsString(reader)); + metadata.setContextRoot(getElementText(reader)); } else if (match(reader, nsUri, CONFIG_NAME)) { - metadata.setConfigName(elementAsString(reader)); + metadata.setConfigName(getElementText(reader)); } else if (match(reader, nsUri, CONFIG_FILE)) { - metadata.setConfigFile(elementAsString(reader)); + metadata.setConfigFile(getElementText(reader)); } else if (match(reader, nsUri, PROPERTY)) { parseProperty(reader, nsUri, metadata); } else if (match(reader, nsUri, PORT_COMPONENT)) { @@ -211,15 +210,15 @@ } case XMLStreamConstants.START_ELEMENT: { if (match(reader, nsUri, EJB_NAME)) { - pc.setEjbName(elementAsString(reader)); + pc.setEjbName(getElementText(reader)); } else if (match(reader, nsUri, PORT_COMPONENT_NAME)) { - pc.setPortComponentName(elementAsString(reader)); + pc.setPortComponentName(getElementText(reader)); } else if (match(reader, nsUri, PORT_COMPONENT_URI)) { - pc.setPortComponentURI(elementAsString(reader)); + pc.setPortComponentURI(getElementText(reader)); } else if (match(reader, nsUri, AUTH_METHOD)) { - pc.setAuthMethod(elementAsString(reader)); + pc.setAuthMethod(getElementText(reader)); } else if (match(reader, nsUri, TRANSPORT_GUARANTEE)) { - pc.setTransportGuarantee(elementAsString(reader)); + pc.setTransportGuarantee(getElementText(reader)); } else if (match(reader, nsUri, SECURE_WSDL_ACCESS)) { pc.setSecureWSDLAccess(elementAsBoolean(reader)); } else { @@ -245,9 +244,9 @@ } case XMLStreamConstants.START_ELEMENT: { if (match(reader, nsUri, WEBSERVICE_DESCRIPTION_NAME)) { - description.setWebserviceDescriptionName(elementAsString(reader)); + description.setWebserviceDescriptionName(getElementText(reader)); } else if (match(reader, nsUri, WSDL_PUBLISH_LOCATION)) { - description.setWsdlPublishLocation(elementAsString(reader)); + description.setWsdlPublishLocation(getElementText(reader)); } else { throw MESSAGES.unexpectedElement(getDescriptorForLogs(), reader.getLocalName()); } @@ -282,10 +281,10 @@ } case XMLStreamConstants.START_ELEMENT : { if (match(reader, nsUri, NAME)) { - name = elementAsString(reader); + name = getElementText(reader); } else if (match(reader, nsUri, VALUE)) { - value = elementAsString(reader); + value = getElementText(reader); } else { @@ -297,6 +296,10 @@ throw MESSAGES.reachedEndOfXMLDocUnexpectedly(getDescriptorForLogs()); } + protected String getElementText(XMLStreamReader reader) throws XMLStreamException { + return elementAsString(reader); + } + private String getDescriptorForLogs() { return descriptorURL != null ? descriptorURL.toString() : "jboss-webservices.xml"; } Modified: spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2013-04-08 03:01:19 UTC (rev 17459) +++ spi/branches/jbossws-spi-2.1.x/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2013-04-08 05:10:01 UTC (rev 17460) @@ -92,7 +92,7 @@ * @param root virtual file root * @return WebservicesMetaData or <code>null</code> if it cannot be found */ - public static WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root) + public WebservicesMetaData loadFromVFSRoot(UnifiedVirtualFile root) { WebservicesMetaData webservices = null; @@ -113,7 +113,7 @@ return webservices; } - public static WebservicesMetaData load(URL wsddUrl) + public WebservicesMetaData load(URL wsddUrl) { InputStream is = null; try @@ -136,12 +136,12 @@ } } - public static WebservicesMetaData parse(InputStream is) + public WebservicesMetaData parse(InputStream is) { return parse(is, null); } - public static WebservicesMetaData parse(InputStream is, URL descriptorURL) + public WebservicesMetaData parse(InputStream is, URL descriptorURL) { try { @@ -154,12 +154,12 @@ } } - public static WebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException + public WebservicesMetaData parse(XMLStreamReader reader) throws XMLStreamException { return parse(reader, null); } - private static WebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException + private WebservicesMetaData parse(XMLStreamReader reader, URL descriptorURL) throws XMLStreamException { int iterate; try @@ -183,8 +183,7 @@ if (match(reader, JAVAEE_NS, WEBSERVICES) || match(reader, J2EE_NS, WEBSERVICES)) { String nsUri = reader.getNamespaceURI(); - WebservicesFactory factory = new WebservicesFactory(descriptorURL); - metadata = factory.parseWebservices(reader, nsUri, descriptorURL); + metadata = parseWebservices(reader, nsUri, descriptorURL); } else { @@ -217,7 +216,7 @@ metadata.addWebserviceDescription(parseWebserviceDescription(reader, nsUri, metadata)); } else if (match(reader, nsUri, "description") || match(reader, nsUri, "display-name")) { //skip to parse - elementAsString(reader); + getElementText(reader); } else if (match(reader, nsUri, "icon")) { //skip icon while (reader.hasNext() && !(reader.nextTag() == XMLStreamConstants.END_ELEMENT && match(reader, nsUri, "icon"))) { @@ -254,13 +253,13 @@ } case XMLStreamConstants.START_ELEMENT : { if (match(reader, nsUri, WEBSERVICE_DESCRIPTION_NAME)) { - description.setWebserviceDescriptionName(elementAsString(reader)); + description.setWebserviceDescriptionName(getElementText(reader)); } else if (match(reader, nsUri, WSDL_FILE)) { - description.setWsdlFile(elementAsString(reader)); + description.setWsdlFile(getElementText(reader)); } else if (match(reader, nsUri, JAXRPC_MAPPING_FILE)) { - description.setJaxrpcMappingFile(elementAsString(reader)); + description.setJaxrpcMappingFile(getElementText(reader)); } else if (match(reader, nsUri, PORT_COMPONENT)) { description.addPortComponent(parsePortComponent(reader, nsUri, description)); @@ -294,11 +293,11 @@ } case XMLStreamConstants.START_ELEMENT : { if (match(reader, nsUri, PORT_COMPONENT_NAME)) { - pc.setPortComponentName(elementAsString(reader)); + pc.setPortComponentName(getElementText(reader)); } else if (match(reader, nsUri, "description") || match(reader, nsUri, "display-name")) { //skip to parse - elementAsString(reader); + getElementText(reader); } else if (match(reader, nsUri, "icon")) { //skip icon while (reader.hasNext() && !(reader.nextTag() == XMLStreamConstants.END_ELEMENT && match(reader, nsUri, "icon"))) { @@ -324,10 +323,10 @@ parseRespectBinding(reader, nsUri, pc); } else if (match(reader, nsUri, PROTOCOL_BINDING)) { - pc.setProtocolBinding(elementAsString(reader)); + pc.setProtocolBinding(getElementText(reader)); } else if (match(reader, nsUri, SERVICE_ENDPOINT_INTERFACE)) { - pc.setServiceEndpointInterface(elementAsString(reader)); + pc.setServiceEndpointInterface(getElementText(reader)); } else if (match(reader, nsUri, SERVICE_IMPL_BEAN)) { parseServiceImplBean(reader, nsUri, pc); @@ -348,6 +347,10 @@ throw MESSAGES.reachedEndOfXMLDocUnexpectedly(getDescriptorForLogs()); } + protected String getElementText(XMLStreamReader reader) throws XMLStreamException { + return elementAsString(reader); + } + private void parseAddressing(XMLStreamReader reader, String nsUri, PortComponentMetaData pc) throws XMLStreamException { while (reader.hasNext()) @@ -372,7 +375,7 @@ pc.setAddressingRequired(elementAsBoolean(reader)); } else if (match(reader, nsUri, ADDRESSING_RESPONSES)) { - pc.setAddressingResponses(elementAsString(reader)); + pc.setAddressingResponses(getElementText(reader)); } else { @@ -432,10 +435,10 @@ } case XMLStreamConstants.START_ELEMENT : { if (match(reader, nsUri, SERVLET_LINK)) { - pc.setServletLink(elementAsString(reader)); + pc.setServletLink(getElementText(reader)); } else if (match(reader, nsUri, EJB_LINK)) { - pc.setEjbLink(elementAsString(reader)); + pc.setEjbLink(getElementText(reader)); } else { Modified: spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java =================================================================== --- spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java 2013-04-08 03:01:19 UTC (rev 17459) +++ spi/branches/jbossws-spi-2.1.x/src/test/java/org/jboss/test/wsf/spi/metadata/webservices/WebServiceFactoryTestCase.java 2013-04-08 05:10:01 UTC (rev 17460) @@ -53,7 +53,7 @@ File file = new File("src/test/resources/metadata/webservices/test-webservices.xml"); InputStream is = new FileInputStream(file); URL url = file.toURI().toURL(); - WebservicesMetaData metadata = WebservicesFactory.parse(is, url); + WebservicesMetaData metadata = new WebservicesFactory(url).parse(is, url); assertEquals(url, metadata.getDescriptorURL()); assertEquals(2, metadata.getWebserviceDescriptions().length); testDescription1(metadata.getWebserviceDescriptions()[0], metadata);