shorter names

dispatcher.go

@@ -81,14 +81,14 @@ type Outbounds map[string]transport.Outbounds
 
 // Filters contains the different type of filters
 type Filters struct {
-	UnaryFilter  transport.UnaryFilter
-	OnewayFilter transport.OnewayFilter
+	Unary  transport.UnaryFilter
+	Oneway transport.OnewayFilter
 }
 
 // Interceptors contains the different type of interceptors
 type Interceptors struct {
-	UnaryInterceptor  transport.UnaryInterceptor
-	OnewayInterceptor transport.OnewayInterceptor
+	Unary  transport.UnaryInterceptor
+	Oneway transport.OnewayInterceptor
 }
 
 // NewDispatcher builds a new Dispatcher using the specified Config.
@@ -120,12 +120,12 @@ func convertOutbounds(outbounds Outbounds, filters Filters) Outbounds {
 
 		// apply filters and create ValidatorOutbounds
 		if outs.Unary != nil {
-			unaryOutbound = transport.ApplyUnaryFilter(outs.Unary, filters.UnaryFilter)
+			unaryOutbound = transport.ApplyUnaryFilter(outs.Unary, filters.Unary)
 			unaryOutbound = request.UnaryValidatorOutbound{UnaryOutbound: unaryOutbound}
 		}
 
 		if outs.Oneway != nil {
-			onewayOutbound = transport.ApplyOnewayFilter(outs.Oneway, filters.OnewayFilter)
+			onewayOutbound = transport.ApplyOnewayFilter(outs.Oneway, filters.Oneway)
 			onewayOutbound = request.OnewayValidatorOutbound{OnewayOutbound: outs.Oneway}
 		}
 
@@ -248,11 +248,11 @@ func (d dispatcher) Register(rs []transport.Registrant) {
 		switch r.HandlerSpec.Type() {
 		case transport.Unary:
 			h := transport.ApplyUnaryInterceptor(r.HandlerSpec.Unary(),
-				d.Interceptors.UnaryInterceptor)
+				d.Interceptors.Unary)
 			r.HandlerSpec = transport.NewUnaryHandlerSpec(h)
 		case transport.Oneway:
 			h := transport.ApplyOnewayInterceptor(r.HandlerSpec.Oneway(),
-				d.Interceptors.OnewayInterceptor)
+				d.Interceptors.Oneway)
 			r.HandlerSpec = transport.NewOnewayHandlerSpec(h)
 		default:
 			panic(fmt.Sprintf("unknown handler type %q for service %q, procedure %q",

examples/json/client/main.go

@@ -112,7 +112,7 @@ func main() {
 			},
 		},
 		Filters: yarpc.Filters{
-			UnaryFilter: yarpc.UnaryFilters(requestLogFilter{}),
+			Unary: yarpc.UnaryFilters(requestLogFilter{}),
 		},
 	})
 	if err := dispatcher.Start(); err != nil {

examples/json/server/main.go

@@ -84,7 +84,7 @@ func main() {
 			http.NewInbound(":24034"),
 		},
 		Interceptors: yarpc.Interceptors{
-			UnaryInterceptor: requestLogInterceptor{},
+			Unary: requestLogInterceptor{},
 		},
 	})
 

examples/thrift/keyvalue/client/main.go

@@ -71,7 +71,7 @@ func main() {
 			},
 		},
 		Filters: yarpc.Filters{
-			UnaryFilter: cache,
+			Unary: cache,
 		},
 	})
 	if err := dispatcher.Start(); err != nil {

yarpctest/recorder/recorder_test.go

@@ -168,7 +168,7 @@ func withDisconnectedClient(t *testing.T, recorder *Recorder, f func(raw.Client)
 			},
 		},
 		Filters: yarpc.Filters{
-			UnaryFilter: recorder,
+			Unary: recorder,
 		},
 	})
 	require.NoError(t, clientDisp.Start())
@@ -202,7 +202,7 @@ func withConnectedClient(t *testing.T, recorder *Recorder, f func(raw.Client)) {
 			},
 		},
 		Filters: yarpc.Filters{
-			UnaryFilter: recorder,
+			Unary: recorder,
 		},
 	})
 	require.NoError(t, clientDisp.Start())