rename Outbound -> UnaryOutbound and add 'Unary' to handlers

crossdock/client/ctxpropagation/behavior.go

@@ -322,7 +322,7 @@ func buildDispatcher(t crossdock.T) (dispatcher yarpc.Dispatcher, tconfig server
 	ch, err := tchannel.NewChannel("ctxclient", nil)
 	fatals.NoError(err, "failed to create TChannel")
 
-	var outbound transport.Outbound
+	var outbound transport.UnaryOutbound
 	switch trans := t.Param(params.Transport); trans {
 	case "http":
 		outbound = ht.NewOutbound(fmt.Sprintf("http://%s:8081", subject))

crossdock/client/dispatcher/dispatcher.go

@@ -40,21 +40,21 @@ func Create(t crossdock.T) yarpc.Dispatcher {
 	server := t.Param(params.Server)
 	fatals.NotEmpty(server, "server is required")
 
-	var outbound transport.Outbound
+	var unaryOutbound transport.UnaryOutbound
 	trans := t.Param(params.Transport)
 	switch trans {
 	case "http":
-		outbound = ht.NewOutbound(fmt.Sprintf("http://%s:8081", server))
+		unaryOutbound = ht.NewOutbound(fmt.Sprintf("http://%s:8081", server))
 	case "tchannel":
 		ch, err := tchannel.NewChannel("client", nil)
 		fatals.NoError(err, "couldn't create tchannel")
-		outbound = tch.NewOutbound(ch, tch.HostPort(server+":8082"))
+		unaryOutbound = tch.NewOutbound(ch, tch.HostPort(server+":8082"))
 	default:
 		fatals.Fail("", "unknown transport %q", trans)
 	}
 
 	return yarpc.NewDispatcher(yarpc.Config{
 		Name:      "client",
-		Outbounds: transport.Outbounds{"yarpc-test": outbound},
+		Outbounds: transport.Outbounds{"yarpc-test": unaryOutbound},
 	})
 }

crossdock/internal/header.go

@@ -1,3 +1,23 @@
+// Copyright (c) 2016 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
 package internal
 
 import "go.uber.org/yarpc"

crossdock/server/yarpc/phone.go

@@ -70,7 +70,7 @@ type PhoneResponse struct {
 
 // Phone implements the phone procedure
 func Phone(ctx context.Context, reqMeta yarpc.ReqMeta, body *PhoneRequest) (*PhoneResponse, yarpc.ResMeta, error) {
-	var outbound transport.Outbound
+	var outbound transport.UnaryOutbound
 
 	switch {
 	case body.Transport.HTTP != nil:

dispatcher.go

@@ -112,7 +112,7 @@ func (d dispatcher) Inbounds() []transport.Inbound {
 func (d dispatcher) Channel(service string) transport.Channel {
 	if out, ok := d.Outbounds[service]; ok {
 		out = transport.ApplyFilter(out, d.Filter)
-		out = request.ValidatorOutbound{Outbound: out}
+		out = request.ValidatorOutbound{UnaryOutbound: out}
 		return transport.IdentityChannel(d.Name, service, out)
 	}
 	panic(noOutboundForService{Service: service})

dispatcher_test.go

@@ -117,12 +117,12 @@ func TestStartStopFailures(t *testing.T) {
 				return inbounds
 			},
 			outbounds: func(mockCtrl *gomock.Controller) transport.Outbounds {
-				outbounds := make(transport.Outbounds)
+				outbounds := make(transport.Outbounds, 10)
 				for i := 0; i < 10; i++ {
-					out := transporttest.NewMockOutbound(mockCtrl)
+					out := transporttest.NewMockUnaryOutbound(mockCtrl)
 					out.EXPECT().Start(gomock.Any()).Return(nil)
 					out.EXPECT().Stop().Return(nil)
-					outbounds[fmt.Sprintf("service-%v", i)] = out
+					outbounds[fmt.Sprintf("servuce-%v", i)] = out
 				}
 				return outbounds
 			},
@@ -144,12 +144,12 @@ func TestStartStopFailures(t *testing.T) {
 				return inbounds
 			},
 			outbounds: func(mockCtrl *gomock.Controller) transport.Outbounds {
-				outbounds := make(transport.Outbounds)
+				outbounds := make(transport.Outbounds, 10)
 				for i := 0; i < 10; i++ {
-					out := transporttest.NewMockOutbound(mockCtrl)
+					out := transporttest.NewMockUnaryOutbound(mockCtrl)
 					out.EXPECT().Start(gomock.Any()).Return(nil)
 					out.EXPECT().Stop().Return(nil)
-					outbounds[fmt.Sprintf("service-%v", i)] = out
+					outbounds[fmt.Sprintf("servuce-%v", i)] = out
 				}
 				return outbounds
 			},
@@ -172,12 +172,12 @@ func TestStartStopFailures(t *testing.T) {
 				return inbounds
 			},
 			outbounds: func(mockCtrl *gomock.Controller) transport.Outbounds {
-				outbounds := make(transport.Outbounds)
+				outbounds := make(transport.Outbounds, 10)
 				for i := 0; i < 10; i++ {
-					out := transporttest.NewMockOutbound(mockCtrl)
+					out := transporttest.NewMockUnaryOutbound(mockCtrl)
 					out.EXPECT().Start(gomock.Any()).Return(nil)
 					out.EXPECT().Stop().Return(nil)
-					outbounds[fmt.Sprintf("service-%v", i)] = out
+					outbounds[fmt.Sprintf("servuce-%v", i)] = out
 				}
 				return outbounds
 			},
@@ -196,16 +196,16 @@ func TestStartStopFailures(t *testing.T) {
 				return inbounds
 			},
 			outbounds: func(mockCtrl *gomock.Controller) transport.Outbounds {
-				outbounds := make(transport.Outbounds)
+				outbounds := make(transport.Outbounds, 10)
 				for i := 0; i < 10; i++ {
-					out := transporttest.NewMockOutbound(mockCtrl)
+					out := transporttest.NewMockUnaryOutbound(mockCtrl)
 					if i == 5 {
 						out.EXPECT().Start(gomock.Any()).Return(errors.New("something went wrong"))
 					} else {
 						out.EXPECT().Start(gomock.Any()).Return(nil)
 						out.EXPECT().Stop().Return(nil)
 					}
-					outbounds[fmt.Sprintf("service-%v", i)] = out
+					outbounds[fmt.Sprintf("servuce-%v", i)] = out
 				}
 				return outbounds
 			},
@@ -225,16 +225,16 @@ func TestStartStopFailures(t *testing.T) {
 				return inbounds
 			},
 			outbounds: func(mockCtrl *gomock.Controller) transport.Outbounds {
-				outbounds := make(transport.Outbounds)
+				outbounds := make(transport.Outbounds, 10)
 				for i := 0; i < 10; i++ {
-					out := transporttest.NewMockOutbound(mockCtrl)
+					out := transporttest.NewMockUnaryOutbound(mockCtrl)
 					out.EXPECT().Start(gomock.Any()).Return(nil)
 					if i == 7 {
 						out.EXPECT().Stop().Return(errors.New("something went wrong"))
 					} else {
 						out.EXPECT().Stop().Return(nil)
 					}
-					outbounds[fmt.Sprintf("service-%v", i)] = out
+					outbounds[fmt.Sprintf("servuce-%v", i)] = out
 				}
 				return outbounds
 			},

encoding/json/inbound.go

@@ -42,7 +42,7 @@ type jsonHandler struct {
 	handler reflect.Value
 }
 
-func (h jsonHandler) Handle(ctx context.Context, treq *transport.Request, rw transport.ResponseWriter) error {
+func (h jsonHandler) HandleUnary(ctx context.Context, treq *transport.Request, rw transport.ResponseWriter) error {
 	if err := encoding.Expect(treq, Encoding); err != nil {
 		return err
 	}

encoding/json/inbound_test.go

@@ -40,7 +40,7 @@ func TestHandleStructSuccess(t *testing.T) {
 	}
 
 	resw := new(transporttest.FakeResponseWriter)
-	err := handler.Handle(context.Background(), &transport.Request{
+	err := handler.HandleUnary(context.Background(), &transport.Request{
 		Procedure: "simpleCall",
 		Encoding:  "json",
 		Body:      jsonBody(`{"name": "foo", "attributes": {"bar": 42}}`),
@@ -67,7 +67,7 @@ func TestHandleMapSuccess(t *testing.T) {
 	}
 
 	resw := new(transporttest.FakeResponseWriter)
-	err := handler.Handle(context.Background(), &transport.Request{
+	err := handler.HandleUnary(context.Background(), &transport.Request{
 		Procedure: "foo",
 		Encoding:  "json",
 		Body:      jsonBody(`{"foo": 42, "bar": ["a", "b", "c"]}`),
@@ -87,7 +87,7 @@ func TestHandleInterfaceEmptySuccess(t *testing.T) {
 	handler := jsonHandler{reader: ifaceEmptyReader{}, handler: reflect.ValueOf(h)}
 
 	resw := new(transporttest.FakeResponseWriter)
-	err := handler.Handle(context.Background(), &transport.Request{
+	err := handler.HandleUnary(context.Background(), &transport.Request{
 		Procedure: "foo",
 		Encoding:  "json",
 		Body:      jsonBody(`["a", "b", "c"]`),
@@ -109,7 +109,7 @@ func TestHandleSuccessWithResponseHeaders(t *testing.T) {
 	}
 
 	resw := new(transporttest.FakeResponseWriter)
-	err := handler.Handle(context.Background(), &transport.Request{
+	err := handler.HandleUnary(context.Background(), &transport.Request{
 		Procedure: "simpleCall",
 		Encoding:  "json",
 		Body:      jsonBody(`{"name": "foo", "attributes": {"bar": 42}}`),

encoding/json/outbound.go

@@ -69,7 +69,7 @@ func (c jsonClient) Call(ctx context.Context, reqMeta yarpc.CallReqMeta, reqBody
 	}
 
 	treq.Body = bytes.NewReader(encoded)
-	tres, err := c.ch.GetOutbound().Call(ctx, &treq)
+	tres, err := c.ch.GetUnaryOutbound().Call(ctx, &treq)
 
 	if err != nil {
 		return nil, err

encoding/json/outbound_test.go

@@ -97,7 +97,7 @@ func TestCall(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		outbound := transporttest.NewMockOutbound(mockCtrl)
+		outbound := transporttest.NewMockUnaryOutbound(mockCtrl)
 		client := New(transport.IdentityChannel(caller, service, outbound))
 
 		if !tt.noCall {

encoding/json/register.go

@@ -58,14 +58,14 @@ func Procedure(name string, handler interface{}) []transport.Registrant {
 	return []transport.Registrant{
 		{
 			Procedure: name,
-			Handler:   wrapHandler(name, handler),
+			Handler:   wrapUnaryHandler(name, handler),
 		},
 	}
 }
 
-// wrapHandler takes a valid JSON handler function and converts it into a
-// transport.Handler.
-func wrapHandler(name string, handler interface{}) transport.Handler {
+// wrapUnaryHandler takes a valid JSON handler function and converts it into a
+// transport.UnaryHandler.
+func wrapUnaryHandler(name string, handler interface{}) transport.UnaryHandler {
 	reqBodyType := verifySignature(name, reflect.TypeOf(handler))
 
 	var r requestReader

encoding/json/register_test.go

@@ -61,12 +61,12 @@ func TestWrapHandlerInvalid(t *testing.T) {
 
 	for _, tt := range tests {
 		assert.Panics(t, assert.PanicTestFunc(func() {
-			wrapHandler(tt.Name, tt.Func)
+			wrapUnaryHandler(tt.Name, tt.Func)
 		}))
 	}
 }
 
-func TestWrapHandlerValid(t *testing.T) {
+func TestWrapUnaryHandlerValid(t *testing.T) {
 	tests := []struct {
 		Name string
 		Func interface{}
@@ -98,6 +98,6 @@ func TestWrapHandlerValid(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		wrapHandler(tt.Name, tt.Func)
+		wrapUnaryHandler(tt.Name, tt.Func)
 	}
 }

encoding/raw/inbound.go

@@ -29,12 +29,12 @@ import (
 	"go.uber.org/yarpc/transport"
 )
 
-// rawHandler adapts a Handler into a transport.Handler
+// rawHandler adapts a Handler into a transport.UnaryHandler
 type rawHandler struct {
-	h Handler
+	UnaryHandler UnaryHandler
 }
 
-func (r rawHandler) Handle(ctx context.Context, treq *transport.Request, rw transport.ResponseWriter) error {
+func (r rawHandler) HandleUnary(ctx context.Context, treq *transport.Request, rw transport.ResponseWriter) error {
 	if err := encoding.Expect(treq, Encoding); err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ func (r rawHandler) Handle(ctx context.Context, treq *transport.Request, rw tran
 	}
 
 	reqMeta := meta.FromTransportRequest(treq)
-	resBody, resMeta, err := r.h(ctx, reqMeta, reqBody)
+	resBody, resMeta, err := r.UnaryHandler(ctx, reqMeta, reqBody)
 	if err != nil {
 		return err
 	}

encoding/raw/inbound_test.go

@@ -46,7 +46,7 @@ func TestRawHandler(t *testing.T) {
 		procedure  string
 		headers    transport.Headers
 		bodyChunks [][]byte
-		handler    Handler
+		handler    UnaryHandler
 
 		wantErr     string
 		wantHeaders transport.Headers
@@ -97,7 +97,7 @@ func TestRawHandler(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		handler := rawHandler{tt.handler}
+		handler := rawHandler{UnaryHandler: tt.handler}
 		resw := new(transporttest.FakeResponseWriter)
 
 		writer, chunkReader := testreader.ChunkReader()
@@ -109,7 +109,7 @@ func TestRawHandler(t *testing.T) {
 		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 		defer cancel()
 
-		err := handler.Handle(ctx, &transport.Request{
+		err := handler.HandleUnary(ctx, &transport.Request{
 			Procedure: tt.procedure,
 			Headers:   tt.headers,
 			Encoding:  "raw",