From 36e4e5cbb71849b33da69924169f94e3a5161b19 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 7 May 2010 23:48:28 +0000 Subject: Adding support for declarative http headers in binding.rest git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@942274 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/rest/RESTBinding.java | 5 ++ .../sca/binding/rest/impl/RESTBindingImpl.java | 18 ++++-- .../sca/binding/rest/xml/RESTBindingProcessor.java | 68 ++++++++++++++++++---- 3 files changed, 75 insertions(+), 16 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany') diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java index 01dafc80a6..dd01c37537 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java @@ -19,9 +19,12 @@ package org.apache.tuscany.sca.binding.rest; +import java.util.List; + import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.common.http.HTTPHeader; /** * REST binding model. @@ -30,4 +33,6 @@ import org.apache.tuscany.sca.assembly.Binding; */ public interface RESTBinding extends Binding { QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.rest"); + + public List getHttpHeaders(); } diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java index 887d0d9878..f6acc6934e 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java @@ -19,11 +19,15 @@ package org.apache.tuscany.sca.binding.rest.impl; +import java.util.ArrayList; +import java.util.List; + import javax.xml.namespace.QName; import org.apache.tuscany.sca.assembly.OperationSelector; import org.apache.tuscany.sca.assembly.WireFormat; import org.apache.tuscany.sca.binding.rest.RESTBinding; +import org.apache.tuscany.sca.common.http.HTTPHeader; /** @@ -35,6 +39,8 @@ class RESTBindingImpl implements RESTBinding { private String name; private String uri; + + private List httpHeaders = new ArrayList(); private WireFormat wireFormat; private OperationSelector operationSelector; @@ -47,18 +53,22 @@ class RESTBindingImpl implements RESTBinding { return name; } - public String getURI() { - return uri; - } - public void setName(String name) { this.name = name; } + public String getURI() { + return uri; + } + public void setURI(String uri) { this.uri = uri; } + public List getHttpHeaders() { + return this.httpHeaders; + } + public boolean isUnresolved() { return false; } diff --git a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java index 46e0696c69..bd6b1dd7a2 100644 --- a/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java +++ b/sca-java-2.x/trunk/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java @@ -27,10 +27,12 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; +import org.apache.tuscany.sca.assembly.Base; import org.apache.tuscany.sca.assembly.OperationSelector; import org.apache.tuscany.sca.assembly.WireFormat; import org.apache.tuscany.sca.binding.rest.RESTBinding; import org.apache.tuscany.sca.binding.rest.RESTBindingFactory; +import org.apache.tuscany.sca.common.http.HTTPHeader; import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; @@ -48,7 +50,11 @@ import org.apache.tuscany.sca.core.FactoryExtensionPoint; * @version $Rev$ $Date$ */ public class RESTBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor { + private static final QName HEADERS_QNAME = new QName(Base.SCA11_TUSCANY_NS, "http-headers"); + private static final QName HEADER_QNAME = new QName(Base.SCA11_TUSCANY_NS, "header"); + private static final String NAME = "name"; + private static final String VALUE = "value"; private static final String URI = "uri"; private RESTBindingFactory httpBindingFactory; @@ -71,49 +77,87 @@ public class RESTBindingProcessor extends BaseStAXArtifactProcessor implements S } public RESTBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException { - RESTBinding httpBinding = httpBindingFactory.createRESTBinding(); - + RESTBinding restBinding = httpBindingFactory.createRESTBinding(); + + /** + * + * + * + * + * + * + * + * + * + */ while(reader.hasNext()) { QName elementName = null; int event = reader.getEventType(); switch (event) { case START_ELEMENT: elementName = reader.getName(); - - if (RESTBinding.TYPE.equals(elementName)) { + + if(RESTBinding.TYPE.equals(elementName)) { + + // binding attributes String name = getString(reader, NAME); if(name != null) { - httpBinding.setName(name); + restBinding.setName(name); } String uri = getURIString(reader, URI); if (uri != null) { - httpBinding.setURI(uri); + restBinding.setURI(uri); + } + break; + + } else if (HEADERS_QNAME.equals(elementName)) { + + // ignore wrapper element + break; + + } else if (HEADER_QNAME.equals(elementName)) { + + // header name/value pair + String name = getString(reader, NAME); + String value = getURIString(reader, VALUE); + + if(name != null) { + restBinding.getHttpHeaders().add(new HTTPHeader(name, value)); } + break; + } else { // Read an extension element Object extension = extensionProcessor.read(reader, context); if (extension != null) { if (extension instanceof WireFormat) { - httpBinding.setRequestWireFormat((WireFormat)extension); + restBinding.setRequestWireFormat((WireFormat)extension); } else if(extension instanceof OperationSelector) { - httpBinding.setOperationSelector((OperationSelector)extension); + restBinding.setOperationSelector((OperationSelector)extension); } } + break; } - } + + case END_ELEMENT: + elementName = reader.getName(); - if (event == END_ELEMENT && RESTBinding.TYPE.equals(reader.getName())) { - break; + if(RESTBinding.TYPE.equals(elementName)) { + return restBinding; + } + break; } + + // Read the next element if (reader.hasNext()) { reader.next(); } } - return httpBinding; + return restBinding; } public void write(RESTBinding restBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException { -- cgit v1.2.3