diff options
author | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-06-17 13:46:18 +0200 |
---|---|---|
committer | Haakon Dybdahl <dybdahl@yahoo-inc.com> | 2016-06-17 13:46:18 +0200 |
commit | d519c7adc924d9093ed5a0dcbfe788fb9ccda4a1 (patch) | |
tree | a881c7ea425bf34c09b0f064b3af35d1eaa49ad8 /messagebus | |
parent | e5ba456729056cb2da64f586667840c087f12db2 (diff) | |
parent | 2eceb7f4e457ffbca92403b444eaf3b07d185971 (diff) |
Merge branch 'master' into dybis/update-author
Diffstat (limited to 'messagebus')
7 files changed, 13 insertions, 11 deletions
diff --git a/messagebus/OWNERS b/messagebus/OWNERS index 17460cca915..7379f3287ad 100644 --- a/messagebus/OWNERS +++ b/messagebus/OWNERS @@ -1,2 +1,3 @@ dybis -balder +baldersheim + diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java index 4e96c9af959..746ab2adc2d 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Protocol.java @@ -8,7 +8,7 @@ import com.yahoo.messagebus.routing.RoutingPolicy; /** * Interface implemented by the concrete application message protocol. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public interface Protocol { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Result.java b/messagebus/src/main/java/com/yahoo/messagebus/Result.java index 095398f6b5d..6341e75e158 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Result.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Result.java @@ -10,7 +10,7 @@ package com.yahoo.messagebus; * * <p>This class is <b>immutable</b>. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth */ public class Result { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java index 66321b5975e..cf568eeffb9 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/HopBlueprint.java @@ -7,7 +7,7 @@ import java.util.*; * A hop blueprint is a stored prototype of a hop that has been created from a {@link HopSpec} object. A map of these * are stored in a {@link RoutingTable}. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class HopBlueprint { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java index c9684e77a66..bb045e435cf 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/Route.java @@ -15,7 +15,7 @@ import java.util.List; * #parse(String)} to produce a route instance from a string representation, or * you may build one programatically through the hop accessors.</p> * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> + * @author bratseth * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ public class Route { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java index a9f2ed8de3c..2fc523542e3 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RouteParser.java @@ -4,7 +4,7 @@ package com.yahoo.messagebus.routing; /** * This replaces the incredibly slow javacc RouteParser.jj. It is a has its c++ sibling and * the implementation is a a copy of the C++ version. - * @author <a href="mailto:balder@yahoo-inc.com">Henning Baldersheim</a> + * @author baldersheim * @since 5.2 */ diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java index b8fa37b0542..a3f93a6231c 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingPolicy.java @@ -17,8 +17,8 @@ package com.yahoo.messagebus.routing; * <p> * This class is pluggable per template point in the address of a hop. * - * @author <a href="bratseth@yahoo-inc.com">Jon Bratseth</a> - * @author <a href="bratseth@yahoo-inc.com">Simon Thoresen</a> + * @author bratseth + * @author Simon Thoresen */ public interface RoutingPolicy { @@ -29,7 +29,7 @@ public interface RoutingPolicy { * * @param context the complete context for the invocation of this policy. Contains all available data. */ - public void select(RoutingContext context); + void select(RoutingContext context); /** * This function is called when all replies have arrived for some message. The implementation is responsible for @@ -38,11 +38,12 @@ public interface RoutingPolicy { * * @param context the complete context for the invocation of this policy. Contains all available data. */ - public void merge(RoutingContext context); + void merge(RoutingContext context); /** * Destroys this factory and frees up any resources it has held. Making further calls on a destroyed * factory causes a runtime exception. */ - public void destroy(); + void destroy(); + } |