Update to new Java API for Scala STM

This commit is contained in:
Peter Vlugter 2012-01-18 15:59:59 +13:00
parent 158bbabb58
commit 2757869c62
12 changed files with 61 additions and 129 deletions

View file

@ -7,15 +7,11 @@ package akka.docs.transactor;
//#class
import akka.actor.*;
import akka.transactor.*;
import scala.concurrent.stm.*;
import scala.concurrent.stm.Ref;
import static scala.concurrent.stm.JavaAPI.*;
public class CoordinatedCounter extends UntypedActor {
private Ref<Integer> count = Stm.ref(0);
private void increment(InTxn txn) {
Integer newValue = count.get(txn) + 1;
count.set(newValue, txn);
}
private Ref.View<Integer> count = newRef(0);
public void onReceive(Object incoming) throws Exception {
if (incoming instanceof Coordinated) {
@ -26,14 +22,14 @@ public class CoordinatedCounter extends UntypedActor {
if (increment.hasFriend()) {
increment.getFriend().tell(coordinated.coordinate(new Increment()));
}
coordinated.atomic(new Atomically() {
public void atomically(InTxn txn) {
increment(txn);
coordinated.atomic(new Runnable() {
public void run() {
increment(count, 1);
}
});
}
} else if ("GetCount".equals(incoming)) {
getSender().tell(count.single().get());
getSender().tell(count.get());
} else {
unhandled(incoming);
}

View file

@ -6,7 +6,6 @@ package akka.docs.transactor;
import akka.actor.*;
import akka.transactor.*;
import scala.concurrent.stm.*;
public class Coordinator extends UntypedActor {
public void onReceive(Object incoming) throws Exception {
@ -15,8 +14,8 @@ public class Coordinator extends UntypedActor {
Object message = coordinated.getMessage();
if (message instanceof Message) {
//#coordinated-atomic
coordinated.atomic(new Atomically() {
public void atomically(InTxn txn) {
coordinated.atomic(new Runnable() {
public void run() {
// do something in the coordinated transaction ...
}
});

View file

@ -6,21 +6,21 @@ package akka.docs.transactor;
//#class
import akka.transactor.*;
import scala.concurrent.stm.*;
import scala.concurrent.stm.Ref;
import static scala.concurrent.stm.JavaAPI.*;
public class Counter extends UntypedTransactor {
Ref<Integer> count = Stm.ref(0);
Ref.View<Integer> count = newRef(0);
public void atomically(InTxn txn, Object message) {
public void atomically(Object message) {
if (message instanceof Increment) {
Integer newValue = count.get(txn) + 1;
count.set(newValue, txn);
increment(count, 1);
}
}
@Override public boolean normally(Object message) {
if ("GetCount".equals(message)) {
getSender().tell(count.single().get());
getSender().tell(count.get());
return true;
} else return false;
}

View file

@ -8,10 +8,11 @@ package akka.docs.transactor;
import akka.actor.*;
import akka.transactor.*;
import java.util.Set;
import scala.concurrent.stm.*;
import scala.concurrent.stm.Ref;
import static scala.concurrent.stm.JavaAPI.*;
public class FriendlyCounter extends UntypedTransactor {
Ref<Integer> count = Stm.ref(0);
Ref.View<Integer> count = newRef(0);
@Override public Set<SendTo> coordinate(Object message) {
if (message instanceof Increment) {
@ -22,16 +23,15 @@ public class FriendlyCounter extends UntypedTransactor {
return nobody();
}
public void atomically(InTxn txn, Object message) {
public void atomically(Object message) {
if (message instanceof Increment) {
Integer newValue = count.get(txn) + 1;
count.set(newValue, txn);
increment(count, 1);
}
}
@Override public boolean normally(Object message) {
if ("GetCount".equals(message)) {
getSender().tell(count.single().get());
getSender().tell(count.get());
return true;
} else return false;
}