ODE-987. Remove the use SynchChannel
git-svn-id: https://svn.apache.org/repos/asf/ode/trunk@1434552 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
index 3bf18e9..e41896a 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
@@ -30,7 +30,7 @@
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.JacobThread;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.apache.ode.jacob.soup.CommChannel;
import org.apache.ode.jacob.soup.CommGroup;
import org.apache.ode.jacob.soup.CommRecv;
@@ -279,14 +279,14 @@
_statistics.messagesSent++;
- SynchChannel replyChannel = null;
+ Synch replyChannel = null;
// Check for synchronous methods; create a synchronization channel
if (method.getReturnType() != void.class) {
- if (method.getReturnType() != SynchChannel.class) {
+ if (method.getReturnType() != Synch.class) {
throw new IllegalStateException(
- "ChannelListener method can only return SynchChannel: " + method);
+ "Channel method '" + method + "' must only return void or Synch");
}
- replyChannel = (SynchChannel) newChannel(SynchChannel.class, "", "Reply Channel");
+ replyChannel = (Synch) newChannel(Synch.class, "", "Reply Channel");
Object[] newArgs = new Object[args.length + 1];
System.arraycopy(args, 0, newArgs, 0, args.length);
newArgs[args.length] = replyChannel;
@@ -386,11 +386,11 @@
LOG.trace(">> [{}] : {}", _cycle, _source);
Object[] args;
- SynchChannel synchChannel;
+ Synch synchChannel;
if (_method.getReturnType() != void.class) {
args = new Object[_args.length - 1];
System.arraycopy(_args, 0, args, 0, args.length);
- synchChannel = (SynchChannel) _args[args.length];
+ synchChannel = (Synch)_args[args.length];
} else {
args = _args;
synchChannel = null;
diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
index ce8d627..a32965e 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
@@ -20,7 +20,7 @@
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
/**
* DOCUMENTME.
@@ -31,6 +31,6 @@
*/
public interface NaturalNumberStream extends Channel {
- public void val(int n, SynchChannel ret);
+ public void val(int n, Synch ret);
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
index 7648bd6..72283b9 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
@@ -21,7 +21,6 @@
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.ode.jacob.vpu.JacobVPU;
@@ -71,7 +70,7 @@
}
public void run() {
- _out.val(_n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(_n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
instance(new Counter(_out, _n+1));
}
@@ -104,8 +103,8 @@
public void run() {
object(new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
- public void val(final int n, final SynchChannel ret) {
- _primes.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ public void val(final int n, final Synch ret) {
+ _primes.val(n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
NaturalNumberStream x = newChannel(NaturalNumberStream.class);
instance(new PrimeFilter(n, _in, x));
@@ -131,7 +130,7 @@
}
public void run() {
object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream(){
- public void val(int n, SynchChannel ret) {
+ public void val(int n, Synch ret) {
_cnt ++;
_last = n;
System.out.println("PRIME: " + n);
@@ -165,9 +164,9 @@
}
public void run() {
object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
- public void val(int n, final SynchChannel ret) {
+ public void val(int n, final Synch ret) {
if (n % _prime != 0) {
- _out.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
ret.ret();
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
index 0be0d26..dccc244 100644
--- a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
+++ b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
@@ -22,7 +22,6 @@
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.Val;
import org.apache.ode.jacob.examples.sequence.Sequence;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
@@ -176,7 +175,7 @@
final String[] greeting = {"Hello", "World"};
instance(new Sequence(greeting.length, null) {
@Override
- protected JacobRunnable doStep(final int step, final SynchChannel done) {
+ protected JacobRunnable doStep(final int step, final Synch done) {
return new JacobRunnable() {
@Override
public void run() {
diff --git a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
index 44438a8..6e8954e 100644
--- a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
+++ b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
@@ -21,7 +21,6 @@
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
/**
* Abstract process that executes a number of steps sequentially.
@@ -30,7 +29,7 @@
public abstract class Sequence extends JacobRunnable {
private int _steps;
private int _current;
- private SynchChannel _done;
+ private Synch _done;
/**
* Create a {@link Sequence} with a number of steps.
@@ -38,7 +37,7 @@
* @param steps number of steps
* @param done synchronous callback
*/
- public Sequence(int steps, SynchChannel done) {
+ public Sequence(int steps, Synch done) {
_steps = steps;
_current = 0;
_done = done;
@@ -53,7 +52,7 @@
_done.ret();
}
} else {
- SynchChannel r = newChannel(SynchChannel.class);
+ Synch r = newChannel(Synch.class);
object(new ReceiveProcess<Synch>(r, new Synch() {
public void ret() {
++_current;
@@ -72,5 +71,5 @@
* @param done notification after step completion
* @return runnable process
*/
- protected abstract JacobRunnable doStep(int step, SynchChannel done);
+ protected abstract JacobRunnable doStep(int step, Synch done);
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
index 2a0169a..2c38a43 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
@@ -19,7 +19,7 @@
package org.apache.ode.jacob.examples.synch;
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
/**
* DOCUMENTME.
@@ -29,6 +29,6 @@
*/
public interface SynchPrint extends Channel {
- public SynchChannel print(String msg);
+ public Synch print(String msg);
}
diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
index bc9150c..426411e 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
@@ -21,7 +21,6 @@
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.ode.jacob.vpu.JacobVPU;
@@ -43,7 +42,7 @@
public void run() {
object(true, new ReceiveProcess<SynchPrint>(_self, new SynchPrint() {
- public SynchChannel print(String msg) {
+ public Synch print(String msg) {
System.out.println(msg);
return null; // Synch channel automatically created by JacobVPU
}
