Fix a bunch more TODO's
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcb6385a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcb6385a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcb6385a Branch: refs/heads/master Commit: bcb6385a095dcaaf8390ecfc33e9e22b9149daad Parents: c8ca71a Author: Daniel Kulp <[email protected]> Authored: Wed Aug 16 12:37:45 2017 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Aug 16 14:22:17 2017 -0400 ---------------------------------------------------------------------- .../apache/cxf/common/util/Base64Utility.java | 3 +- .../cxf/common/xmlschema/XmlSchemaUtils.java | 1 - .../security/DefaultSecurityContext.java | 2 - .../staxutils/transform/InTransformReader.java | 1 - .../ws/addressing/EndpointReferenceUtils.java | 5 - .../java2js/processor/JavaToJSProcessor.java | 2 - .../generator/wsdl11/BeanGenerator.java | 7 +- .../processor/JavaToWSDLProcessor.java | 2 - .../processor/JavaToProcessorTest.java | 2 - .../internal/jaxws/JaxwsServiceBuilderTest.java | 25 +- .../internal/jaxws/expected/cxf188.wsdl | 32 +++ .../jaxws/expected/doc_wrapped_bare.wsdl | 285 +++++++++++++++++++ .../jaxws/expected/rpc_lit_service_no_anno.wsdl | 34 +++ .../internal/jaxws/expected/rpc_on_method.wsdl | 34 +++ .../cxf/tools/wsdlto/WSDLToJavaContainer.java | 3 - .../customization/JAXWSBindingSerializer.java | 43 --- .../generators/AbstractJAXWSGenerator.java | 4 +- .../generators/HandlerConfigGenerator.java | 10 - .../frontend/jaxws/generators/SEIGenerator.java | 1 - .../processor/internal/ServiceProcessor.java | 2 +- .../jaxws/wsdl11/JAXWSDefinitionBuilder.java | 2 - .../misc/processor/XSDToWSDLProcessor.java | 3 - 22 files changed, 406 insertions(+), 97 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java index 0096358..77c9410 100644 --- a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java +++ b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java @@ -188,8 +188,7 @@ public final class Base64Utility { public static byte[] decode(String id, boolean urlSafe) throws Base64Exception { if (urlSafe) { - //TODO: optimize further - id = id.replace("-", "+").replace('_', '/'); + id = id.replace('-', '+').replace('_', '/'); switch (id.length() % 4) { case 0: break; http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java index 6418921..aa19c97 100644 --- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java +++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java @@ -233,7 +233,6 @@ public final class XmlSchemaUtils { return null; } - //TODO: the anyAttribute case. XmlSchemaComplexContentExtension ext = (XmlSchemaComplexContentExtension)content; return ext.getAttributes(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java index 225298e..055718b 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java +++ b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java @@ -32,8 +32,6 @@ import org.apache.cxf.security.LoginSecurityContext; * SecurityContext which implements isUserInRole using the * following approach : skip the first Subject principal, and then checks * Groups the principal is a member of - * - * TODO : consider moving this class into a rt-core-security module */ public class DefaultSecurityContext implements LoginSecurityContext { http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java index aee34fd..440d669 100644 --- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java +++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java @@ -432,7 +432,6 @@ public class InTransformReader extends DepthXMLStreamReader { return null; } checkAttributeIndexRange(-1); - //TODO need reverse lookup return super.getAttributeValue(namespace, localName); } http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java index 7deed31..9a3f2c3 100644 --- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java +++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java @@ -490,10 +490,6 @@ public final class EndpointReferenceUtils { if (null == wsdlLocation) { return null; } - - //TODO The wsdlLocation inserted should be a valid URI - //before doing a split. So temporarily return the string - //return wsdlLocation.split(" "); return wsdlLocation; } @@ -715,7 +711,6 @@ public final class EndpointReferenceUtils { EndpointReferenceType reference = new EndpointReferenceType(); reference.setMetadata(new MetadataType()); setServiceAndPortName(reference, serviceName, portName); - //TODO To Ensure it is a valid URI syntax. setWSDLLocation(reference, wsdlUrl.toString()); return reference; http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java index 61f78a9..4520ddb 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java @@ -155,8 +155,6 @@ public class JavaToJSProcessor implements Processor { if (clz.getInterfaces().length == 1) { context.put(ToolConstants.SEI_CLASS, clz.getInterfaces()[0].getName()); } - // TODO: if it is simple frontend, and the impl class implements - // multiple interfaces context.put(ToolConstants.GEN_FROM_SEI, Boolean.FALSE); } builderFactory.setServiceClass(clz); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java index f00adc1..3df2ee2 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/BeanGenerator.java @@ -88,12 +88,7 @@ public class BeanGenerator extends AbstractGenerator<File> { for (File file : generatedFiles) { files.add(file.getAbsolutePath()); } - if (!compiler.compileFiles(files.toArray(new String[files.size()]))) { - // TODO - compile issue - } - - - + compiler.compileFiles(files.toArray(new String[files.size()])); } catch (Exception e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java index 13e8ea9..21d15b2 100644 --- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java +++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java @@ -188,8 +188,6 @@ public class JavaToWSDLProcessor implements Processor { if (clz.getInterfaces().length == 1) { context.put(ToolConstants.SEI_CLASS, clz.getInterfaces()[0].getName()); } - //TODO: if it is simple frontend, and the impl class implments - //multiple interfaces context.put(ToolConstants.GEN_FROM_SEI, Boolean.FALSE); } builderFactory.setServiceClass(clz); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java index fcd6f8e..9609478 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java @@ -145,7 +145,6 @@ public class JavaToProcessorTest extends ProcessorTestBase { } @Test - // TODO the generated wsdl has two faultDetail elements public void testSOAP12() throws Exception { env.put(ToolConstants.CFG_CLASSNAME, "org.apache.hello_world_soap12_http.Greeter"); env.put(ToolConstants.CFG_SOAP12, "soap12"); @@ -473,7 +472,6 @@ public class JavaToProcessorTest extends ProcessorTestBase { } @Test - // TODO: should suppor the XmlMimeType annotation in the SEI public void testMimeTypeInSEI() throws Exception { env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/send_image.wsdl"); env.put(ToolConstants.CFG_CLASSNAME, org.apache.cxf.tools.fortest.ImageSender.class.getName()); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java index 8ba7212..ba7b697 100644 --- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java +++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/JaxwsServiceBuilderTest.java @@ -40,7 +40,6 @@ import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.hello_world_rpclit.javato.GreeterRPCLit; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; public class JaxwsServiceBuilderTest extends ProcessorTestBase { @@ -200,8 +199,6 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { assertWsdlEquals(new File(expectedFile), file); } - - // TODO assertFileEquals @Test public void testDocWrapparBare() throws Exception { builder.setServiceClass(org.apache.hello_world_doc_wrapped_bare.Greeter.class); @@ -213,9 +210,11 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { assertNotNull(output); generator.generate(file); assertTrue(output.exists()); + + URI expectedFile = this.getClass().getResource("expected/doc_wrapped_bare.wsdl").toURI(); + assertWsdlEquals(new File(expectedFile), file); } - // TODO assertFileEquals @Test public void testRPCWithoutParentBindingAnnotation() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.Hello.class); @@ -226,11 +225,12 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { assertNotNull(output); generator.generate(file); assertTrue(output.exists()); + + URI expectedFile = this.getClass().getResource("expected/rpc_lit_service_no_anno.wsdl").toURI(); + assertWsdlEquals(new File(expectedFile), file); } - // TODO: SOAPBinding can not on method with RPC style @Test - @Ignore("RuntimeException: org.apache.cxf.interceptor.Fault: Method [sayHi] pro") public void testSOAPBindingRPCOnMethod() throws Exception { builder.setServiceClass(org.apache.cxf.tools.fortest.withannotation.rpc.HelloWrongAnnotation.class); ServiceInfo service = builder.createService(); @@ -240,6 +240,9 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { assertNotNull(output); generator.generate(file); assertTrue(output.exists()); + + URI expectedFile = this.getClass().getResource("expected/rpc_on_method.wsdl").toURI(); + assertWsdlEquals(new File(expectedFile), file); } @Test @@ -273,7 +276,6 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { assertWsdlEquals(new File(expectedFile), output); } - // TODO: assertFileEquals @Test public void testCXF188() throws Exception { Class<?> clz = AnnotationUtil.loadClass("org.apache.cxf.tools.fortest.cxf188.Demo", getClass() @@ -282,10 +284,13 @@ public class JaxwsServiceBuilderTest extends ProcessorTestBase { ServiceInfo service = builder.createService(); generator.setServiceModel(service); - File file = getOutputFile("cxf188.wsdl"); + File output = getOutputFile("cxf188.wsdl"); assertNotNull(output); - generator.generate(file); - assertTrue(output.exists()); + generator.generate(output); + assertTrue(output.exists()); + + URI expectedFile = this.getClass().getResource("expected/cxf188.wsdl").toURI(); + assertWsdlEquals(new File(expectedFile), output); } @Test http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/cxf188.wsdl ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/cxf188.wsdl b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/cxf188.wsdl new file mode 100644 index 0000000..a65090a --- /dev/null +++ b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/cxf188.wsdl @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="DemoService" targetNamespace="http://apache.org/cxf"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://apache.org/cxf"; xmlns:ns1="http://schemas.xmlsoap.org/soap/http"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";> + <wsdl:message name="sayHi"> + </wsdl:message> + <wsdl:message name="sayHiResponse"> + </wsdl:message> + <wsdl:portType name="Demo"> + <wsdl:operation name="sayHi"> + <wsdl:input name="sayHi" message="tns:sayHi"> + </wsdl:input> + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="DemoServiceSoapBinding" type="tns:Demo"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHi"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="sayHi"> + <soap:body use="literal" namespace="http://apache.org/cxf"/> + </wsdl:input> + <wsdl:output name="sayHiResponse"> + <soap:body use="literal" namespace="http://apache.org/cxf"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="DemoService"> + <wsdl:port name="DemoPort" binding="tns:DemoServiceSoapBinding"> + <soap:address location="http://localhost:9090"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/doc_wrapped_bare.wsdl ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/doc_wrapped_bare.wsdl b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/doc_wrapped_bare.wsdl new file mode 100644 index 0000000..3b24610 --- /dev/null +++ b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/doc_wrapped_bare.wsdl @@ -0,0 +1,285 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/hello_world_doc_wrapped_bare"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://apache.org/hello_world_doc_wrapped_bare"; xmlns:ns2="http://schemas.xmlsoap.org/soap/http"; xmlns:ns1="http://apache.org/hello_world_doc_wrapped_bare/types"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";> + <wsdl:types> +<xs:schema xmlns:tns="http://apache.org/hello_world_doc_wrapped_bare/types"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; elementFormDefault="qualified" targetNamespace="http://apache.org/hello_world_doc_wrapped_bare/types"; version="1.0"> + + <xs:element name="BadRecordLit" type="xs:string"/> + + <xs:element name="BareDocument" type="xs:string"/> + + <xs:element name="BareDocumentResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="company" type="xs:string"/> + </xs:sequence> + <xs:attribute name="id" type="xs:int"/> + </xs:complexType> + </xs:element> + + <xs:element name="NoSuchCodeLit"> + <xs:complexType> + <xs:sequence> + <xs:element name="code" type="tns:ErrorCode"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="addNumbers" type="tns:addNumbers"/> + + <xs:element name="addNumbersResponse" type="tns:addNumbersResponse"/> + + <xs:element name="greetMe"> + <xs:complexType> + <xs:sequence> + <xs:element name="requestType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="greetMeOneWay"> + <xs:complexType> + <xs:sequence> + <xs:element name="requestType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="greetMeResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="responseType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="greetMeSometime"> + <xs:complexType> + <xs:sequence> + <xs:element name="requestType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="greetMeSometimeResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="responseType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="sayHi"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + + <xs:element name="sayHiResponse"> + <xs:complexType> + <xs:sequence> + <xs:element name="responseType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="testDocLitFault"> + <xs:complexType> + <xs:sequence> + <xs:element name="faultType" type="xs:string"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="testDocLitFaultResponse"> + <xs:complexType> + <xs:sequence/> + </xs:complexType> + </xs:element> + + <xs:complexType name="ErrorCode"> + <xs:sequence> + <xs:element name="minor" type="xs:short"/> + <xs:element name="major" type="xs:short"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="addNumbers"> + <xs:sequence> + <xs:element name="arg0" type="xs:int"/> + <xs:element name="arg1" type="xs:int"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="addNumbersResponse"> + <xs:sequence> + <xs:element name="return" type="xs:int"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="BadRecord"> + <xs:sequence> + <xs:element name="reason" type="xs:string"/> + <xs:element name="code" type="xs:short"/> + </xs:sequence> + </xs:complexType> + +</xs:schema> + </wsdl:types> + <wsdl:message name="BadRecordLitFault"> + <wsdl:part name="BadRecordLitFault" element="ns1:BadRecordLit"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="testDocLitBareResponse"> + <wsdl:part name="out" element="ns1:BareDocumentResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="greetMeSometimeResponse"> + <wsdl:part name="parameters" element="ns1:greetMeSometimeResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="greetMeResponse"> + <wsdl:part name="parameters" element="ns1:greetMeResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHiResponse"> + <wsdl:part name="parameters" element="ns1:sayHiResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="greetMeSometime"> + <wsdl:part name="parameters" element="ns1:greetMeSometime"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="NoSuchCodeLitFault"> + <wsdl:part name="NoSuchCodeLitFault" element="ns1:NoSuchCodeLit"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="greetMe"> + <wsdl:part name="parameters" element="ns1:greetMe"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="testDocLitBare"> + <wsdl:part name="in" element="ns1:BareDocument"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="testDocLitFault"> + <wsdl:part name="parameters" element="ns1:testDocLitFault"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="testDocLitFaultResponse"> + <wsdl:part name="parameters" element="ns1:testDocLitFaultResponse"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHi"> + <wsdl:part name="parameters" element="ns1:sayHi"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="greetMeOneWay"> + <wsdl:part name="parameters" element="ns1:greetMeOneWay"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="Greeter"> + <wsdl:operation name="greetMeSometime"> + <wsdl:input name="greetMeSometime" message="tns:greetMeSometime"> + </wsdl:input> + <wsdl:output name="greetMeSometimeResponse" message="tns:greetMeSometimeResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="greetMe"> + <wsdl:input name="greetMe" message="tns:greetMe"> + </wsdl:input> + <wsdl:output name="greetMeResponse" message="tns:greetMeResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="testDocLitBare"> + <wsdl:input name="testDocLitBare" message="tns:testDocLitBare"> + </wsdl:input> + <wsdl:output name="testDocLitBareResponse" message="tns:testDocLitBareResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="testDocLitFault"> + <wsdl:input name="testDocLitFault" message="tns:testDocLitFault"> + </wsdl:input> + <wsdl:output name="testDocLitFaultResponse" message="tns:testDocLitFaultResponse"> + </wsdl:output> + <wsdl:fault name="BadRecordLitFault" message="tns:BadRecordLitFault"> + </wsdl:fault> + <wsdl:fault name="NoSuchCodeLitFault" message="tns:NoSuchCodeLitFault"> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="sayHi"> + <wsdl:input name="sayHi" message="tns:sayHi"> + </wsdl:input> + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="greetMeOneWay"> + <wsdl:input name="greetMeOneWay" message="tns:greetMeOneWay"> + </wsdl:input> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="greetMeSometime"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMeSometime"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="greetMeSometimeResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="greetMe"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMe"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="greetMeResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="testDocLitBare"> + <soap:operation soapAction="http://apache.org/hello_world_doc_wrapped_bare/testDocLitBare"; style="document"/> + <wsdl:input name="testDocLitBare"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="testDocLitBareResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="testDocLitFault"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="testDocLitFault"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="testDocLitFaultResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="BadRecordLitFault"> + <soap:fault name="BadRecordLitFault" use="literal"/> + </wsdl:fault> + <wsdl:fault name="NoSuchCodeLitFault"> + <soap:fault name="NoSuchCodeLitFault" use="literal"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="sayHi"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHi"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHiResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="greetMeOneWay"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMeOneWay"> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="GreeterService"> + <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding"> + <soap:address location="http://localhost"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_lit_service_no_anno.wsdl ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_lit_service_no_anno.wsdl b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_lit_service_no_anno.wsdl new file mode 100644 index 0000000..23d85ef --- /dev/null +++ b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_lit_service_no_anno.wsdl @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloService" targetNamespace="http://cxf.com/"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://cxf.com/"; xmlns:ns1="http://schemas.xmlsoap.org/soap/http"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";> + <wsdl:message name="sayHiResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHi"> + </wsdl:message> + <wsdl:portType name="Hello"> + <wsdl:operation name="sayHi"> + <wsdl:input name="sayHi" message="tns:sayHi"> + </wsdl:input> + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="HelloServiceSoapBinding" type="tns:Hello"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHi"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="sayHi"> + <soap:body use="literal" namespace="http://cxf.com/"/> + </wsdl:input> + <wsdl:output name="sayHiResponse"> + <soap:body use="literal" namespace="http://cxf.com/"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloService"> + <wsdl:port name="HelloPort" binding="tns:HelloServiceSoapBinding"> + <soap:address location="http://localhost:9090"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_on_method.wsdl ---------------------------------------------------------------------- diff --git a/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_on_method.wsdl b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_on_method.wsdl new file mode 100644 index 0000000..83a6221 --- /dev/null +++ b/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/expected/rpc_on_method.wsdl @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="HelloWrongAnnotationService" targetNamespace="http://cxf.com/"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://cxf.com/"; xmlns:ns1="http://schemas.xmlsoap.org/soap/http"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";> + <wsdl:message name="sayHiResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="sayHi"> + </wsdl:message> + <wsdl:portType name="HelloWrongAnnotation"> + <wsdl:operation name="sayHi"> + <wsdl:input name="sayHi" message="tns:sayHi"> + </wsdl:input> + <wsdl:output name="sayHiResponse" message="tns:sayHiResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="HelloWrongAnnotationServiceSoapBinding" type="tns:HelloWrongAnnotation"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHi"> + <soap:operation soapAction="" style="rpc"/> + <wsdl:input name="sayHi"> + <soap:body use="literal" namespace="http://cxf.com/"/> + </wsdl:input> + <wsdl:output name="sayHiResponse"> + <soap:body use="literal" namespace="http://cxf.com/"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloWrongAnnotationService"> + <wsdl:port name="HelloWrongAnnotationPort" binding="tns:HelloWrongAnnotationServiceSoapBinding"> + <soap:address location="http://localhost:9090"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java index 92f89b3..0eb6a0c 100644 --- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java +++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJavaContainer.java @@ -169,9 +169,6 @@ public class WSDLToJavaContainer extends AbstractCXFToolContainer { } private void processWsdl() { - // TODO: After runtime support w3c EPR mapping ,this will be removed - //context.put(ToolConstants.CFG_NO_ADDRESS_BINDING, - // ToolConstants.CFG_NO_ADDRESS_BINDING); validate(context); FrontEndProfile frontend = context.get(FrontEndProfile.class); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java deleted file mode 100644 index 120bfb1..0000000 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/JAXWSBindingSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.cxf.tools.wsdlto.frontend.jaxws.customization; - -import java.io.*; - -import javax.wsdl.Definition; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.ExtensionRegistry; -import javax.wsdl.extensions.ExtensionSerializer; -import javax.xml.namespace.QName; - -public class JAXWSBindingSerializer implements ExtensionSerializer, Serializable { - public static final long serialVersionUID = 1; - - public void marshall(@SuppressWarnings("rawtypes") Class parentType, - QName elementType, - ExtensibilityElement extension, - PrintWriter pw, - Definition def, - ExtensionRegistry extReg) - throws WSDLException { - // TODO - } -} http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java index eacdea2..cf7a6a4 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/AbstractJAXWSGenerator.java @@ -31,7 +31,9 @@ public abstract class AbstractJAXWSGenerator extends AbstractGenerator { protected static final Logger LOG = LogUtils.getL7dLogger(AbstractJAXWSGenerator.class); protected static final String TEMPLATE_BASE = "org/apache/cxf/tools/wsdlto/frontend/jaxws/template"; - public abstract boolean passthrough(); + public boolean passthrough() { + return false; + } public abstract void generate(ToolContext penv) throws ToolException; http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java index ba3d76a..0a7080d 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/HandlerConfigGenerator.java @@ -50,21 +50,11 @@ public class HandlerConfigGenerator extends AbstractJAXWSGenerator { return handlerChainAnnotation; } - public boolean passthrough() { - //TODO: enable the handler chain - /* if (this.intf.getHandlerChains() == null) { - return true; - }*/ - return false; - } - public void setJavaInterface(JavaInterface javaInterface) { this.intf = javaInterface; } public void generate(ToolContext penv) throws ToolException { - - this.env = penv; if (passthrough()) { http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java index 0859f7f..8ec3e8d 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/SEIGenerator.java @@ -58,7 +58,6 @@ public class SEIGenerator extends AbstractJAXWSGenerator { } private boolean hasHandlerConfig(JavaInterface intf) { - // TODO : enbale handler chain return intf.getHandlerChains() != null; } http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java index ee67589..ad3db01 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/ServiceProcessor.java @@ -159,7 +159,7 @@ public class ServiceProcessor extends AbstractProcessor { } JAXWSBinding serviceBinding2 = service.getExtensor(JAXWSBinding.class); - //TODO : Handle service customized class + //Handle service customized class if (serviceBinding != null) { if (serviceBinding.getPackage() != null) { jaxwsBinding.setPackage(serviceBinding.getPackage()); http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java index 9bcba86..77e5cb8 100644 --- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java +++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/wsdl11/JAXWSDefinitionBuilder.java @@ -55,7 +55,6 @@ import org.apache.cxf.tools.wsdlto.core.WSDLDefinitionBuilder; import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.CustomizationParser; import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding; import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer; -import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer; import org.apache.cxf.wsdl.WSDLManager; public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder { @@ -100,7 +99,6 @@ public class JAXWSDefinitionBuilder extends AbstractWSDLBuilder { } private void registerJAXWSBinding(ExtensionRegistry registry, Class<?> clz) { - registry.registerSerializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingSerializer()); registry.registerDeserializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingDeserializer()); registry.mapExtensionTypes(clz, ToolConstants.JAXWS_BINDINGS, JAXWSBinding.class); } http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb6385a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java ---------------------------------------------------------------------- diff --git a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java index ecf7274..07b75b3 100644 --- a/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java +++ b/tools/wsdlto/misc/src/main/java/org/apache/cxf/tools/misc/processor/XSDToWSDLProcessor.java @@ -51,7 +51,6 @@ import org.apache.cxf.tools.util.FileWriterUtil; import org.apache.cxf.tools.util.OutputStreamCreator; import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBinding; import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingDeserializer; -import org.apache.cxf.tools.wsdlto.frontend.jaxws.customization.JAXWSBindingSerializer; import org.apache.cxf.wsdl.WSDLConstants; public class XSDToWSDLProcessor implements Processor { @@ -165,8 +164,6 @@ public class XSDToWSDLProcessor implements Processor { } private void registerJAXWSBinding(Class<?> clz) { - registry.registerSerializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingSerializer()); - registry.registerDeserializer(clz, ToolConstants.JAXWS_BINDINGS, new JAXWSBindingDeserializer()); registry.mapExtensionTypes(clz, ToolConstants.JAXWS_BINDINGS, JAXWSBinding.class); }
