4194: rename RESTRouterWrapper

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 32479d829bec0194a3c8548152fdad29eb8461db..2514998db973a468fc1b7c2f896810902eafe51d 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -750,7 +750,7 @@ func IssueRequest(router *mux.Router, rt *RequestTester) *httptest.ResponseRecor
        if rt.api_token != "" {
                req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
        }
-  routerWrapper := WrapRESTRouter{router}
+  routerWrapper := RESTRouterWrapper{router}
   routerWrapper.ServeHTTP(response, req)
        return response
 }

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 5eed4ed653b6b1ed37bd1950d65c2c549b44e997..49f55e8d14bd7112384fb04fc4a117446f1db208 100644 (file)
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -745,11 +745,11 @@ func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
   return loggingWriter.ResponseWriter.Write(data)
 }
 
-type WrapRESTRouter struct {
+type RESTRouterWrapper struct {
   router *mux.Router
 }
 
-func (wrapper *WrapRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
+func (wrapper *RESTRouterWrapper) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
   loggingWriter := LoggingResponseWriter{200, nil, resp}
   wrapper.router.ServeHTTP(&loggingWriter, req)
   if loggingWriter.data != nil && loggingWriter.status == 200 {

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 08043cc3898405d4b0cd7b2dfe82f3a74bc73637..eafcc2395e7aaef5f03d0d1cf188ec455bafdb09 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -263,7 +263,7 @@ func main() {
        KeepVM = MakeRRVolumeManager(goodvols)
 
        // Tell the built-in HTTP server to direct all requests to the REST router.
-  routerWrapper := WrapRESTRouter{MakeRESTRouter()}
+  routerWrapper := RESTRouterWrapper{MakeRESTRouter()}
   http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
     routerWrapper.ServeHTTP(resp, req)
   })