Complete adding go1.11 support to splice

PiperOrigin-RevId: 294504741
google · Feb 11, 2020 · c11f9cc · c11f9cc
1 parent c8296a8
commit c11f9cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/appengine/appengine.go b/appengine/appengine.go
@@ -21,18 +21,17 @@ limitations under the License.
 package main
 
 import (
-	http "net/http"
+	"net/http"
+
 	"google.golang.org/appengine"
 	"github.com/google/splice/appengine/endpoints"
 )
 
-func init() {
+func main() {
 	http.Handle("/request", &endpoints.AttendedRequestHandler{})
 	http.Handle("/result", endpoints.ResultHandler(endpoints.ProcessResult))
 	http.Handle("/request-unattended", &endpoints.UnattendedRequestHandler{})
 	http.Handle("/result-unattended", endpoints.ResultHandler(endpoints.ProcessResult))
-}
 
-func main() {
 	appengine.Main()
 }
diff --git a/appengine/endpoints/request.go b/appengine/endpoints/request.go
@@ -97,7 +97,6 @@ func requestResponse(ctx context.Context, w http.ResponseWriter, r *http.Request
 // ProcessRequest takes a models.Request that is provided by the client,
 // and validates it. A response is provided using models.Response.
 func ProcessRequest(ctx context.Context, w http.ResponseWriter, r *http.Request, checks []basic.Validator) models.Response {
-
 	request, code, err := unmarshalRequest(r)
 	if err != nil {
 		return models.Response{