Author: rfeng
Date: Tue Jan 2 11:31:24 2007
New Revision: 491905
URL: http://svn.apache.org/viewvc?view=rev&rev=491905
Log:
Use operation.getDataBinding() directly as it already checks the containing
service contract
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java?view=diff&rev=491905&r1=491904&r2=491905
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingWirePostProcessor.java
Tue Jan 2 11:31:24 2007
@@ -22,20 +22,18 @@
import java.util.Map;
import java.util.Set;
-import org.osoa.sca.annotations.Constructor;
-
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.ReferenceBinding;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.databinding.Mediator;
import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.model.ServiceContract;
import org.apache.tuscany.spi.wire.InboundInvocationChain;
import org.apache.tuscany.spi.wire.InboundWire;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.OutboundInvocationChain;
import org.apache.tuscany.spi.wire.OutboundWire;
import org.apache.tuscany.spi.wire.WirePostProcessorExtension;
+import org.osoa.sca.annotations.Constructor;
/**
* This processor is responsible to add an interceptor to invocation chain if
the source and target operations have
@@ -58,8 +56,8 @@
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
getTargetOperation(target.getInvocationChains().keySet(),
sourceOperation.getName());
- String sourceDataBinding = getDataBinding(sourceOperation);
- String targetDataBinding = getDataBinding(targetOperation);
+ String sourceDataBinding = sourceOperation.getDataBinding();
+ String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null || targetDataBinding == null
|| !sourceDataBinding.equals(targetDataBinding)) {
// Add the interceptor to the source side because multiple
@@ -89,8 +87,8 @@
Operation<?> targetOperation =
getTargetOperation(source.getTargetCallbackInvocationChains().keySet(),
sourceOperation
.getName());
- String sourceDataBinding = getDataBinding(sourceOperation);
- String targetDataBinding = getDataBinding(targetOperation);
+ String sourceDataBinding = sourceOperation.getDataBinding();
+ String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null || targetDataBinding == null
|| !sourceDataBinding.equals(targetDataBinding)) {
// Add the interceptor to the source side because multiple
@@ -114,8 +112,8 @@
Operation<?> sourceOperation = entry.getKey();
Operation<?> targetOperation =
getTargetOperation(target.getInvocationChains().keySet(),
sourceOperation.getName());
- String sourceDataBinding = getDataBinding(sourceOperation);
- String targetDataBinding = getDataBinding(targetOperation);
+ String sourceDataBinding = sourceOperation.getDataBinding();
+ String targetDataBinding = targetOperation.getDataBinding();
if (sourceDataBinding == null || targetDataBinding == null
|| !sourceDataBinding.equals(targetDataBinding)) {
// Add the interceptor to the source side
@@ -145,15 +143,6 @@
}
}
return null;
- }
-
- private String getDataBinding(Operation<?> operation) {
- String dataBinding = operation.getDataBinding();
- if (dataBinding == null) {
- ServiceContract<?> serviceContract =
operation.getServiceContract();
- dataBinding = serviceContract.getDataBinding();
- }
- return dataBinding;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
