Tickets #1924 #1925 #2383 #2387 #1927 #1926

Changed unlimited blocking to block up untill the replyTimeout, and added a test for it, where manual Ack is never received ticket #1926

removed unnecesary methods

akka-docs/rst/java/code/docs/camel/ActivationTestBase.java

@@ -6,6 +6,7 @@ package docs.camel;
     import akka.camel.Camel;
     import akka.camel.CamelExtension;
     import akka.camel.javaapi.UntypedConsumerActor;
+    import akka.util.Timeout;
     import scala.concurrent.Future;
     import scala.concurrent.util.Duration;
     import scala.concurrent.util.FiniteDuration;
@@ -26,14 +27,14 @@ public class ActivationTestBase {
     ActorRef producer = system.actorOf(props,"myproducer");
     Camel camel = CamelExtension.get(system);
     // get a future reference to the activation of the endpoint of the Consumer Actor
-    FiniteDuration duration = Duration.create(10, SECONDS);
-    Future<ActorRef> activationFuture = camel.activationFutureFor(producer, duration, system.dispatcher());
+    Timeout timeout = new Timeout(Duration.create(10, SECONDS));
+    Future<ActorRef> activationFuture = camel.activationFutureFor(producer, timeout, system.dispatcher());
     //#CamelActivation
     //#CamelDeactivation
     // ..
     system.stop(producer);
     // get a future reference to the deactivation of the endpoint of the Consumer Actor
-    Future<ActorRef> deactivationFuture = camel.deactivationFutureFor(producer, duration, system.dispatcher());
+    Future<ActorRef> deactivationFuture = camel.deactivationFutureFor(producer, timeout, system.dispatcher());
     //#CamelDeactivation
     system.shutdown();
   }

akka-docs/rst/java/code/docs/camel/Consumer4.java

@@ -11,7 +11,7 @@ public class Consumer4 extends UntypedConsumerActor {
   private final static FiniteDuration timeout = Duration.create(500, TimeUnit.MILLISECONDS);
 
   @Override
-  public Duration replyTimeout() {
+  public FiniteDuration replyTimeout() {
     return timeout;
   }
 

akka-docs/rst/java/code/docs/camel/ErrorThrowingConsumer.java

@@ -3,6 +3,7 @@ package docs.camel;
 import akka.actor.Status;
 import akka.camel.CamelMessage;
 import akka.camel.javaapi.UntypedConsumerActor;
+import akka.dispatch.Mapper;
 import org.apache.camel.builder.Builder;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RouteDefinition;
@@ -11,6 +12,13 @@ import scala.Option;
 public class ErrorThrowingConsumer extends UntypedConsumerActor{
   private String uri;
 
+  private static Mapper<RouteDefinition, ProcessorDefinition<?>> mapper = new Mapper<RouteDefinition, ProcessorDefinition<?>>() {
+    public ProcessorDefinition<?> apply(RouteDefinition rd) {
+        // Catch any exception and handle it by returning the exception message as response
+        return rd.onException(Exception.class).handled(true).transform(Builder.exceptionMessage()).end();
+    }
+  };
+
   public ErrorThrowingConsumer(String uri){
     this.uri = uri;
   }
@@ -29,9 +37,8 @@ public class ErrorThrowingConsumer extends UntypedConsumerActor{
   }
 
   @Override
-  public ProcessorDefinition<?> onRouteDefinition(RouteDefinition rd) {
-    // Catch any exception and handle it by returning the exception message as response
-    return rd.onException(Exception.class).handled(true).transform(Builder.exceptionMessage()).end();
+  public Mapper<RouteDefinition, ProcessorDefinition<?>> getRouteDefinitionHandler() {
+    return mapper;
   }
 
   @Override

akka-docs/rst/java/code/docs/camel/Responder.java

@@ -2,6 +2,7 @@ package docs.camel;
 //#CustomRoute
 import akka.actor.UntypedActor;
 import akka.camel.CamelMessage;
+import akka.dispatch.Mapper;
 import akka.japi.Function;
 
 public class Responder extends UntypedActor{
@@ -15,7 +16,8 @@ public class Responder extends UntypedActor{
   }
 
   private CamelMessage createResponse(CamelMessage msg) {
-    return msg.mapBody(new Function<String,String>() {
+    return msg.mapBody(new Mapper<String,String>() {
+      @Override
       public String apply(String body) {
         return String.format("received %s", body);
       }

akka-docs/rst/java/code/docs/camel/Transformer.java

@@ -2,6 +2,7 @@ package docs.camel;
 //#TransformOutgoingMessage
 import akka.camel.CamelMessage;
 import akka.camel.javaapi.UntypedProducerActor;
+import akka.dispatch.Mapper;
 import akka.japi.Function;
 
 public class Transformer extends UntypedProducerActor{
@@ -16,7 +17,8 @@ public class Transformer extends UntypedProducerActor{
   }
 
   private CamelMessage upperCase(CamelMessage msg) {
-    return msg.mapBody(new Function<String,String>() {
+    return msg.mapBody(new Mapper<String,String>() {
+      @Override
       public String apply(String body) {
         return body.toUpperCase();
       }

akka-docs/rst/java/code/docs/camel/sample/http/HttpTransformer.java

@@ -3,6 +3,7 @@ package docs.camel.sample.http;
 import akka.actor.Status;
 import akka.actor.UntypedActor;
 import akka.camel.CamelMessage;
+import akka.dispatch.Mapper;
 import akka.japi.Function;
 
 //#HttpExample
@@ -10,7 +11,8 @@ public class HttpTransformer extends UntypedActor{
   public void onReceive(Object message) {
     if (message instanceof CamelMessage) {
       CamelMessage camelMessage = (CamelMessage) message;
-      CamelMessage replacedMessage = camelMessage.mapBody(new Function<Object, String>(){
+      CamelMessage replacedMessage = camelMessage.mapBody(new Mapper<Object, String>(){
+        @Override
         public String apply(Object body) {
           String text = new String((byte[])body);
           return text.replaceAll("Akka ", "AKKA ");

akka-docs/rst/java/code/docs/camel/sample/route/Transformer.java

@@ -3,6 +3,7 @@ package docs.camel.sample.route;
 import akka.actor.ActorRef;
 import akka.actor.UntypedActor;
 import akka.camel.CamelMessage;
+import akka.dispatch.Mapper;
 import akka.japi.Function;
 
 public class Transformer extends UntypedActor {
@@ -16,7 +17,8 @@ public class Transformer extends UntypedActor {
     if (message instanceof CamelMessage) {
       // example: transform message body "foo" to "- foo -" and forward result to producer
       CamelMessage camelMessage = (CamelMessage) message;
-      CamelMessage transformedMessage = camelMessage.mapBody(new Function<String, String>(){
+      CamelMessage transformedMessage = camelMessage.mapBody(new Mapper<String, String>(){
+        @Override
         public String apply(String body) {
           return String.format("- %s -",body);
         }