From 93f43075a998bfb14e80e601d2992f107928a359 Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 26 Mar 2009 15:44:27 +0000 Subject: Remove old "getWireFormatInterfaceContract" operation git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758697 13f79535-47bb-0310-9956-ffa450edef68 --- .../runtime/WireFormatJMSBytesReferenceProvider.java | 6 +----- .../jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java | 6 +----- .../runtime/WireFormatJMSObjectReferenceProvider.java | 4 ---- .../runtime/WireFormatJMSObjectServiceProvider.java | 4 ---- .../jmstext/runtime/WireFormatJMSTextReferenceProvider.java | 6 +----- .../jmstext/runtime/WireFormatJMSTextServiceProvider.java | 6 +----- .../runtime/WireFormatJMSTextXMLReferenceProvider.java | 6 +----- .../runtime/WireFormatJMSTextXMLServiceProvider.java | 7 +++---- .../org/apache/tuscany/sca/provider/WireFormatProvider.java | 12 +----------- 9 files changed, 9 insertions(+), 48 deletions(-) (limited to 'branches/sca-java-1.x/modules') diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java index de5a83bfdb..98e52c0be8 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesReferenceProvider.java @@ -67,11 +67,7 @@ public class WireFormatJMSBytesReferenceProvider implements WireFormatProvider { // databinding transformation takes place interfaceContract = reference.getInterfaceContract(); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - + public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java index 2fcb9ef118..318ed0cf04 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytes/runtime/WireFormatJMSBytesServiceProvider.java @@ -67,11 +67,7 @@ public class WireFormatJMSBytesServiceProvider implements WireFormatProvider { // databinding transformation takes place interfaceContract = service.getInterfaceContract(); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - + public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java index e566764ce4..644c9ebc38 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectReferenceProvider.java @@ -68,10 +68,6 @@ public class WireFormatJMSObjectReferenceProvider implements WireFormatProvider interfaceContract = reference.getInterfaceContract(); } - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java index 4f4d4b4bb5..e5887ec1b7 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsobject/runtime/WireFormatJMSObjectServiceProvider.java @@ -69,10 +69,6 @@ public class WireFormatJMSObjectServiceProvider implements WireFormatProvider { interfaceContract = service.getInterfaceContract(); } - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java index c2030f9d4c..24d963010c 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextReferenceProvider.java @@ -69,11 +69,7 @@ public class WireFormatJMSTextReferenceProvider implements WireFormatProvider { // databinding transformation takes place interfaceContract = reference.getInterfaceContract(); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - + public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java index d9ec72007a..3f759ff73b 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstext/runtime/WireFormatJMSTextServiceProvider.java @@ -67,11 +67,7 @@ public class WireFormatJMSTextServiceProvider implements WireFormatProvider { // databinding transformation takes place interfaceContract = service.getInterfaceContract(); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - + public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null ) { diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java index 0c383c0579..1365cf951e 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java @@ -90,11 +90,7 @@ public class WireFormatJMSTextXMLReferenceProvider implements WireFormatProvider } return "onMessage".equals(ic.getInterface().getOperations().get(0).getName()); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } - + public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ if (this.interfaceContract != null && diff --git a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java index 95dcbdf189..bccbb669b2 100644 --- a/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java +++ b/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java @@ -63,12 +63,15 @@ public class WireFormatJMSTextXMLServiceProvider implements WireFormatProvider { // currently maintaining the message processor structure which // contains the details of jms message processing so set the message // type here if not set explicitly in SCDL + // defaults to JMSBindingConstants.XML_MP_CLASSNAME so no need to set it +/* if (this.binding.getRequestWireFormat() instanceof WireFormatJMSTextXML){ this.binding.setRequestMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME); } if (this.binding.getResponseWireFormat() instanceof WireFormatJMSTextXML){ this.binding.setResponseMessageProcessorName(JMSBindingConstants.XML_MP_CLASSNAME); } +*/ // create a local interface contract that is configured specifically to // deal with the data format that this wire format is expecting to sent to @@ -89,10 +92,6 @@ public class WireFormatJMSTextXMLServiceProvider implements WireFormatProvider { } return "onMessage".equals(ic.getInterface().getOperations().get(0).getName()); } - - public InterfaceContract getWireFormatInterfaceContract() { - return interfaceContract; - } public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract){ diff --git a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java index 8f15d001d2..35526cb251 100644 --- a/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java +++ b/branches/sca-java-1.x/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/WireFormatProvider.java @@ -26,17 +26,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; * @version $Rev$ $Date$ */ public interface WireFormatProvider { - - /** - * Return the contract that describes the interface that - * is providing data to or accepting data from the - * wire format interceptor. The wire format's job - * is to translate between this interface contract and the - * format on the wire - * @return the wire format interface contract - */ - public InterfaceContract getWireFormatInterfaceContract(); - + /** * Set up the contract that describes the interface that * is providing data to or accepting data from the -- cgit v1.2.3