Change the dynamically added endpoint tests to use wsdl resource from a contribution and simplify the endpoint creation helper

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1374206 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 22 insertions, 48 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java b/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
index 2c02fc152c..2c7fd65a9d 100644
--- a/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
+++ b/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
@@ -1,8 +1,5 @@
 package test;

 

-import java.net.URI;

-import java.net.URL;

-

 import javax.wsdl.PortType;

 import javax.wsdl.Service;

 import javax.xml.namespace.QName;

@@ -15,27 +12,22 @@ import org.apache.tuscany.sca.assembly.Endpoint;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

 import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;

 import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.ContributionFactory;

-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;

-import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;

+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

 import org.apache.tuscany.sca.contribution.processor.ProcessorContext;

-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;

-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;

-import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;

 import org.apache.tuscany.sca.core.ExtensionPointRegistry;

 import org.apache.tuscany.sca.core.FactoryExtensionPoint;

 import org.apache.tuscany.sca.impl.NodeImpl;

+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;

 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;

 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;

 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;

 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;

 import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;

+import org.apache.tuscany.sca.monitor.ValidationException;

 

 public class EndpointHelper {

 

-    // TODO: change this to be a method on Node that takes a configured Binding to add a new endpoint

-    public static void addWSEndpoint(Node node, String endpointName, URL wsdlURL, QName portTypeQN, String targetURL) {

+    public static Endpoint createWSEndpoint(String endpointName, QName wsdlPortQN, String targetURL, String curi, Node node) throws ContributionReadException, ValidationException, InvalidInterfaceException {

         ExtensionPointRegistry extensionPoints = ((NodeImpl)node).getExtensionPointRegistry();

         FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);

         AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);

@@ -47,7 +39,23 @@ public class EndpointHelper {
         WebServiceBinding wsBinding = webServiceBindingFactory.createWebServiceBinding();

         wsBinding.setURI(targetURL);

         

-        WSDLInterfaceContract wsdlIC = getWSDLInterfaceContract(wsdlURL, portTypeQN, modelFactories, extensionPoints);

+        WSDLFactory wif = modelFactories.getFactory(WSDLFactory.class);

+

+        Contribution c = node.getContribution(curi);

+        WSDLDefinition wd = wif.createWSDLDefinition();

+        wd.setUnresolved(true);

+        wd.setNamespace(wsdlPortQN.getNamespaceURI());

+        wd.setNameOfPortTypeToResolve(wsdlPortQN);

+        ProcessorContext ctx = new ProcessorContext();

+        wd = c.getModelResolver().resolveModel(WSDLDefinition.class, wd, ctx);

+        WSDLObject<PortType> pt = wd.getWSDLObject(PortType.class, wsdlPortQN);

+        

+        WSDLInterface nwi = wif.createWSDLInterface(pt.getElement(), wd, c.getModelResolver(), null);

+        nwi.setWsdlDefinition(wd);

+

+        WSDLInterfaceContract wsdlIC = wif.createWSDLInterfaceContract();

+        wsdlIC.setInterface(nwi);

+        

         wsBinding.setBindingInterfaceContract(wsdlIC);

 

         wsBinding.setGeneratedWSDLDocument(((WSDLInterface)wsdlIC.getInterface()).getWsdlDefinition().getDefinition());

@@ -61,41 +69,7 @@ public class EndpointHelper {
         newEndpoint.setBinding(wsBinding);

         newEndpoint.setURI(endpointName);

         newEndpoint.setRemote(true);

-        

-        ((NodeImpl)node).getEndpointRegistry().addEndpoint(newEndpoint);

+        return newEndpoint;

     }

      

-     private static WSDLInterfaceContract getWSDLInterfaceContract(URL wsdlURL, QName portTypeQN, FactoryExtensionPoint modelFactories, ExtensionPointRegistry extensionPoints) {

-         try {

-

-             ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);

-             Contribution contribution = contributionFactory.createContribution();

-             ModelResolverExtensionPoint modelResolvers = extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);

-             ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories);

-             contribution.setModelResolver(modelResolver);

-

-             ExtensibleURLArtifactProcessor aproc = new ExtensibleURLArtifactProcessor(extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class));

-

-             ProcessorContext ctx = new ProcessorContext();

-             WSDLDefinition wd = aproc.read(null, new URI("anything.wsdl"), wsdlURL, ctx, WSDLDefinition.class);

-             modelResolver.addModel(wd, ctx);

-             modelResolver.resolveModel(WSDLDefinition.class, wd, ctx);

-             final WSDLObject<PortType> pt = wd.getWSDLObject(PortType.class, portTypeQN);

-             if(pt == null)

-                 throw new ContributionResolveException("Couldn't find " + portTypeQN);

-             

-             WSDLFactory wif = modelFactories.getFactory(WSDLFactory.class);

-             final WSDLInterface nwi = wif.createWSDLInterface(pt.getElement(), wd, modelResolver, null);

-             nwi.setWsdlDefinition(wd);

-

-             WSDLInterfaceContract wsdlIC = wif.createWSDLInterfaceContract();

-             wsdlIC.setInterface(nwi);

-

-             return wsdlIC;

-

-         } catch(Exception e) {

-             throw new RuntimeException(e);

-         }

-     }

-     

 }