You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ha...@apache.org on 2013/01/16 23:51:51 UTC
svn commit: r1434464 - in /ode/trunk/jacob/src:
main/java/org/apache/ode/jacob/ main/java/org/apache/ode/jacob/vpu/
test/java/org/apache/ode/jacob/vpu/
Author: hadrian
Date: Wed Jan 16 22:51:50 2013
New Revision: 1434464
URL: http://svn.apache.org/viewvc?rev=1434464&view=rev
Log:
ODE-987. Remove ChannelProxy.export() not invoked directly anymore.
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java?rev=1434464&r1=1434463&r2=1434464&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java Wed Jan 16 22:51:50 2013
@@ -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 {
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java?rev=1434464&r1=1434463&r2=1434464&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java Wed Jan 16 22:51:50 2013
@@ -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 final class ProcessUtil {
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());
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java?rev=1434464&r1=1434463&r2=1434464&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java Wed Jan 16 22:51:50 2013
@@ -29,20 +29,12 @@ import org.apache.ode.jacob.soup.CommCha
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 @@ public class ChannelFactory {
}
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
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java?rev=1434464&r1=1434463&r2=1434464&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java Wed Jan 16 22:51:50 2013
@@ -39,7 +39,6 @@ public class ProxyConstructorTimingTest
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 @@ public class ProxyConstructorTimingTest
throw new IllegalStateException(String.valueOf(method));
}
}
- if (method.equals(ChannelProxy.class.getMethod("export", new Class[] {}))) {
- return "Implemented by InvocationHandler";
- }
return method.invoke(greeter, args);
}
}