Clean up pullrequest

Author: Emil Pirfält

handlerfunc/adapter.go

@@ -9,12 +9,12 @@ import (
 
 type HandlerFuncAdapter struct {
 	core.RequestAccessor
-	handler http.Handler
+	handlerFunc http.HandlerFunc
 }
 
 func New(handlerFunc http.HandlerFunc) *HandlerFuncAdapter {
 	return &HandlerFuncAdapter{
-		handler: handlerFunc,
+		handlerFunc: handlerFunc,
 	}
 }
 
@@ -25,7 +25,7 @@ func (h *HandlerFuncAdapter) Proxy(event events.APIGatewayProxyRequest) (events.
 	}
 
 	w := core.NewProxyResponseWriter()
-	h.handler.ServeHTTP(http.ResponseWriter(w), req)
+	h.handlerFunc.ServeHTTP(http.ResponseWriter(w), req)
 
 	resp, err := w.GetProxyResponse()
 	if err != nil {

handlerfunc/adapter_test.go

@@ -12,24 +12,17 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-type handler struct{}
-
-func (h handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	w.Header().Add("unfortunately-required-header", "")
-	fmt.Fprintf(w, "Go Lambda!!")
-}
-
 var _ = Describe("HandlerFuncAdapter tests", func() {
 	Context("Simple ping request", func() {
 		It("Proxies the event correctly", func() {
 			log.Println("Starting test")
 
-			handlerFunc := func(w http.ResponseWriter, req *http.Request) {
+			handler := func(w http.ResponseWriter, req *http.Request) {
 				w.Header().Add("unfortunately-required-header", "")
 				fmt.Fprintf(w, "Go Lambda!!")
 			}
 
-			adapter := handlerfunc.New(handlerFunc)
+			adapter := handlerfunc.New(handler)
 
 			req := events.APIGatewayProxyRequest{
 				Path:       "/ping",