From 73d45db443fa3c83ffb15b1bcab9005d22e3c46d Mon Sep 17 00:00:00 2001
From: Owen Cliffe <owen.cliffe@oracle.com>
Date: Thu, 28 Jun 2018 01:28:07 +0100
Subject: [PATCH] Fix JSON list responses (#1098)

---
 api/const.go             |  6 +++---
 api/datastore/sql/sql.go |  8 ++++----
 api/server/server.go     | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/api/const.go b/api/const.go
index 7e3a27f45..cabbcdb59 100644
--- a/api/const.go
+++ b/api/const.go
@@ -7,10 +7,10 @@ const (
 	Path    string = "path"
 
 	// Gin  URL template parameters
-	ParamAppID     string = "appId"
+	ParamAppID     string = "appID"
 	ParamAppName   string = "appName"
 	ParamRouteName string = "route"
-	ParamTriggerID string = "triggerId"
+	ParamTriggerID string = "triggerID"
 	ParamCallID    string = "call"
-	ParamFnID      string = "fnId"
+	ParamFnID      string = "fnID"
 )
diff --git a/api/datastore/sql/sql.go b/api/datastore/sql/sql.go
index e9664bebc..f597bb093 100644
--- a/api/datastore/sql/sql.go
+++ b/api/datastore/sql/sql.go
@@ -378,7 +378,7 @@ func (ds *SQLStore) InsertApp(ctx context.Context, newApp *models.App) (*models.
 	app.ID = id.New().String()
 
 	if app.Config == nil {
-		// keeps the json from being nil
+		// keeps the JSON from being nil
 		app.Config = map[string]string{}
 	}
 
@@ -509,7 +509,7 @@ func (ds *SQLStore) GetAppByID(ctx context.Context, appID string) (*models.App,
 
 // GetApps retrieves an array of apps according to a specific filter.
 func (ds *SQLStore) GetApps(ctx context.Context, filter *models.AppFilter) ([]*models.App, error) {
-	var res []*models.App
+	res := []*models.App{} // for JSON empty list
 
 	if filter.NameIn != nil && len(filter.NameIn) == 0 { // this basically makes sure it doesn't return ALL apps
 		return res, nil
@@ -845,7 +845,7 @@ func (ds *SQLStore) UpdateFn(ctx context.Context, fn *models.Fn) (*models.Fn, er
 }
 
 func (ds *SQLStore) GetFns(ctx context.Context, filter *models.FnFilter) ([]*models.Fn, error) {
-	var res []*models.Fn // for json empty list
+	res := []*models.Fn{} // for JSON empty list
 	if filter == nil {
 		filter = new(models.FnFilter)
 	}
@@ -1338,7 +1338,7 @@ func buildFilterTriggerQuery(filter *models.TriggerFilter) (string, []interface{
 }
 
 func (ds *SQLStore) GetTriggers(ctx context.Context, filter *models.TriggerFilter) ([]*models.Trigger, error) {
-	var res []*models.Trigger // for json empty list
+	res := []*models.Trigger{} // for JSON  empty list
 	if filter == nil {
 		filter = new(models.TriggerFilter)
 	}
diff --git a/api/server/server.go b/api/server/server.go
index 6fdbb5259..59de3aa8a 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -925,21 +925,21 @@ func (s *Server) bindHandlers(ctx context.Context) {
 			{
 				v2.GET("/apps", s.handleAppList)
 				v2.POST("/apps", s.handleAppCreate)
-				v2.GET("/apps/:appId", s.handleAppGet)
-				v2.PUT("/apps/:appId", s.handleAppUpdate)
-				v2.DELETE("/apps/:appId", s.handleAppDelete)
+				v2.GET("/apps/:appID", s.handleAppGet)
+				v2.PUT("/apps/:appID", s.handleAppUpdate)
+				v2.DELETE("/apps/:appID", s.handleAppDelete)
 
 				v2.GET("/fns", s.handleFnList)
 				v2.POST("/fns", s.handleFnCreate)
-				v2.GET("/fns/:fnId", s.handleFnGet)
-				v2.PUT("/fns/:fnId", s.handleFnUpdate)
-				v2.DELETE("/fns/:fnId", s.handleFnDelete)
+				v2.GET("/fns/:fnID", s.handleFnGet)
+				v2.PUT("/fns/:fnID", s.handleFnUpdate)
+				v2.DELETE("/fns/:fnID", s.handleFnDelete)
 
 				v2.GET("/triggers", s.handleTriggerList)
 				v2.POST("/triggers", s.handleTriggerCreate)
-				v2.GET("/triggers/:triggerId", s.handleTriggerGet)
-				v2.PUT("/triggers/:triggerId", s.handleTriggerUpdate)
-				v2.DELETE("/triggers/:triggerId", s.handleTriggerDelete)
+				v2.GET("/triggers/:triggerID", s.handleTriggerGet)
+				v2.PUT("/triggers/:triggerID", s.handleTriggerUpdate)
+				v2.DELETE("/triggers/:triggerID", s.handleTriggerDelete)
 			}
 
 			{
@@ -952,7 +952,7 @@ func (s *Server) bindHandlers(ctx context.Context) {
 
 				runnerAppApi := runner.Group(
 
-					"/apps/:appId")
+					"/apps/:appID")
 				runnerAppApi.Use(setAppIDInCtx)
 				runnerAppApi.GET("", s.handleV1AppGetByName)
 				runnerAppApi.GET("/routes/:route", s.handleRouteGetRunner)