Author: rfeng
Date: Mon Aug 13 12:24:11 2007
New Revision: 565481
URL: http://svn.apache.org/viewvc?view=rev&rev=565481
Log:
Further clean up the unused callback-related code
Removed:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
Mon Aug 13 12:24:11 2007
@@ -135,27 +135,6 @@
}
}
- // Object targetAddress = UriHelper.getBaseName(source.getUri());
- List<InvocationChain> callbackChains =
wire.getCallbackInvocationChains();
- if (callbackChains == null) {
- // callback chains could be null
- return;
- }
-
- for (InvocationChain chain : callbackChains) {
- Operation sourceOperation = chain.getSourceOperation();
- Operation targetOperation = chain.getTargetOperation();
- if (isTransformationRequired(sourceContract, sourceOperation,
targetContract, targetOperation)) {
-
- // Add the interceptor to the source side because multiple
- // references can be wired
- // to the same service
- DataTransformationInteceptor interceptor = new
DataTransformationInteceptor(wire, sourceOperation,
-
targetOperation);
- interceptor.setMediator(mediator);
- chain.addInterceptor(0, interceptor);
- }
- }
}
}
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
Mon Aug 13 12:24:11 2007
@@ -24,7 +24,6 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
@@ -76,14 +75,6 @@
* @param operation The assembly model operation
* @return The runtime Invoker
*/
- Invoker getInvoker(Binding binding, Operation operation);
-
- /**
- * Get the callback invocation chain for the given binding and operation
- * @param binding The assembly model binding
- * @param operation The assembly model operation
- * @return The runtime callback invocation chain
- */
- InvocationChain getCallbackInvocationChain(Binding binding, Operation
operation);
+ Invoker getInvoker(Binding binding, Operation operation);
}
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
Mon Aug 13 12:24:11 2007
@@ -91,11 +91,4 @@
*/
InvocationChain getInvocationChain(Binding binding, Operation operation);
- /**
- * Get the callback invoker for the given binding and operation
- * @param binding The assembly model binding
- * @param operation The assembly model operation
- * @return The runtime callback invoker
- */
- Invoker getCallbackInvoker(Binding binding, Operation operation);
}
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
(original)
+++
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
Mon Aug 13 12:24:11 2007
@@ -19,10 +19,8 @@
package org.apache.tuscany.sca.runtime;
-import java.util.IdentityHashMap;
import java.util.List;
-import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.InvocationChain;
/**
@@ -55,30 +53,5 @@
* wire
*/
List<InvocationChain> getInvocationChains();
-
- /**
- * Returns the invocation chains for callback service operations associated
- * with the wire
- *
- * @return the invocation chains for callback service operations associated
- * with the wire
- */
- List<InvocationChain> getCallbackInvocationChains();
-
- /**
- * Add an invocation chain for a callback service operation associated
- * with the wire
- *
- * @param chain an invocation chain
- */
- void addCallbackInvocationChain(InvocationChain chain);
-
- /**
- * Get a map of invocation chains for callback service operations
associated
- * with the wire
- *
- * @return a map of invocation chains
- */
- IdentityHashMap<Operation, InvocationChain> getCallbackInvocationMap();
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
Mon Aug 13 12:24:11 2007
@@ -83,18 +83,4 @@
return null;
}
- public InvocationChain getCallbackInvocationChain(Binding binding,
Operation operation) {
- RuntimeWire wire = getRuntimeWire(binding);
- if (wire == null) {
- return null;
- }
- for (InvocationChain chain : wire.getCallbackInvocationChains()) {
- Operation op = chain.getTargetOperation();
- if (mapper.isCompatible(operation, op,
op.getInterface().isRemotable())) {
- return chain;
- }
- }
- return null;
- }
-
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
Mon Aug 13 12:24:11 2007
@@ -102,17 +102,4 @@
return null;
}
- public Invoker getCallbackInvoker(Binding binding, Operation operation) {
- for (RuntimeWire wire : callbackWires) {
- if (wire.getTarget().getBinding() == binding) {
- for (InvocationChain chain :
wire.getCallbackInvocationChains()) {
- Operation op = chain.getSourceOperation();
- if (mapper.isCompatible(operation, op,
op.getInterface().isRemotable())) {
- return chain.getHeadInvoker();
- }
- }
- }
- }
- return null;
- }
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java?view=diff&rev=565481&r1=565480&r2=565481
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
Mon Aug 13 12:24:11 2007
@@ -20,10 +20,8 @@
package org.apache.tuscany.sca.core.runtime;
import java.util.ArrayList;
-import java.util.IdentityHashMap;
import java.util.List;
-import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.runtime.EndpointReference;
import org.apache.tuscany.sca.runtime.RuntimeWire;
@@ -36,8 +34,6 @@
private EndpointReference wireTarget;
private final List<InvocationChain> chains = new
ArrayList<InvocationChain>();
- private final List<InvocationChain> callbackChains = new
ArrayList<InvocationChain>();
- IdentityHashMap<Operation, InvocationChain> callbackMap = new
IdentityHashMap<Operation, InvocationChain>();
/**
* @param source
@@ -50,10 +46,6 @@
this.wireTarget = target;
}
- public List<InvocationChain> getCallbackInvocationChains() {
- return callbackChains;
- }
-
public List<InvocationChain> getInvocationChains() {
return chains;
}
@@ -64,15 +56,6 @@
public EndpointReference getTarget() {
return wireTarget;
- }
-
- public void addCallbackInvocationChain(InvocationChain chain) {
- callbackChains.add(chain);
- callbackMap.put(chain.getSourceOperation(), chain);
- }
-
- public IdentityHashMap<Operation, InvocationChain>
getCallbackInvocationMap() {
- return callbackMap;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
