ODE-987. Remove ChannelProxy.export() not invoked directly anymore.
git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1434464 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ode/jacob/ChannelProxy.java b/src/main/java/org/apache/ode/jacob/ChannelProxy.java
index 007ce7a..24e8a2b 100644
--- a/src/main/java/org/apache/ode/jacob/ChannelProxy.java
+++ b/src/main/java/org/apache/ode/jacob/ChannelProxy.java
@@ -18,13 +18,9 @@
*/
package org.apache.ode.jacob;
-import java.io.Serializable;
/**
* Interface implemented by channel proxies.
*/
-public interface ChannelProxy extends Serializable {
-
- public String export();
-
+public interface ChannelProxy {
}
diff --git a/src/main/java/org/apache/ode/jacob/ProcessUtil.java b/src/main/java/org/apache/ode/jacob/ProcessUtil.java
index 8f05cb4..fb1f196 100644
--- a/src/main/java/org/apache/ode/jacob/ProcessUtil.java
+++ b/src/main/java/org/apache/ode/jacob/ProcessUtil.java
@@ -18,6 +18,8 @@
*/
package org.apache.ode.jacob;
+import org.apache.ode.jacob.vpu.JacobVPU;
+
public final class ProcessUtil {
private ProcessUtil() {
@@ -26,7 +28,10 @@
public static String exportChannel(Channel channel) {
if (channel != null && channel instanceof ChannelProxy) {
- return ((ChannelProxy)channel).export();
+ // TODO: replace the brute force call on the activeThread with
+ // something that doesn't expose the implementation once the
+ // cleaner refactored api becomes available
+ return JacobVPU.activeJacobThread().exportChannel(channel);
}
throw new IllegalArgumentException("Invalid proxy type: "
+ channel == null ? "<null>" : channel.getClass().toString());
diff --git a/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java b/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
index 26f2b34..a45822f 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
@@ -29,20 +29,12 @@
public class ChannelFactory {
private static final Method METHOD_OBJECT_EQUALS;
- private static final Method METHOD_CHANNEL_EXPORT;
-
static {
try {
METHOD_OBJECT_EQUALS = Object.class.getMethod("equals", new Class[] { Object.class });
} catch (Exception e) {
throw new AssertionError("No equals(Object) method on Object!");
}
-
- try {
- METHOD_CHANNEL_EXPORT = ChannelProxy.class.getMethod("export", new Class[] {});
- } catch (Exception e) {
- throw new AssertionError("No export() method on Object!");
- }
}
public static Object getBackend(Channel channel) {
@@ -83,9 +75,6 @@
}
return method.invoke(this, args);
}
- if (method.equals(METHOD_CHANNEL_EXPORT)) {
- return JacobVPU.activeJacobThread().exportChannel((Channel)proxy);
- }
return JacobVPU.activeJacobThread().message((Channel)proxy, method, args);
}
} // class ChannelInvocationHandler
diff --git a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
index 246f0ff..623e2ca 100644
--- a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
+++ b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
@@ -39,7 +39,6 @@
Greeter gp = (Greeter) Proxy.newProxyInstance(Greeter.class.getClassLoader(),
new Class<?>[] {ChannelProxy.class, Greeter.class}, new GreeterInvocationHandler(new GreeterImpl()));
assertEquals("Hello World", gp.hello("World"));
- assertEquals("Implemented by InvocationHandler", ProcessUtil.exportChannel(gp));
}
public interface TestExecution {
@@ -145,9 +144,6 @@
throw new IllegalStateException(String.valueOf(method));
}
}
- if (method.equals(ChannelProxy.class.getMethod("export", new Class[] {}))) {
- return "Implemented by InvocationHandler";
- }
return method.invoke(greeter, args);
}
}
