Selaa lähdekoodia

refactor: use `fmt.Fprintf` for response format (#2126)

Signed-off-by: xjasonlyu <xjasonlyu@gmail.com>
Jason Lyu 1 vuosi sitten
vanhempi
commit
b5819152fb

+ 2 - 2
internal/server/plugin_init.go

@@ -85,7 +85,7 @@ func pluginsHandler(w http.ResponseWriter, r *http.Request, t plugin.PluginType)
 			return
 		}
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(fmt.Sprintf("%s plugin %s is created", plugin.PluginTypes[t], sd.GetName())))
+		fmt.Fprintf(w, "%s plugin %s is created", plugin.PluginTypes[t], sd.GetName())
 	}
 }
 
@@ -196,7 +196,7 @@ func functionRegisterHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(fmt.Sprintf("function plugin %s function list is registered", name)))
+	fmt.Fprintf(w, "function plugin %s function list is registered", name)
 }
 
 func prebuildSourcePlugins(w http.ResponseWriter, r *http.Request) {

+ 3 - 4
internal/server/portable_init.go

@@ -73,7 +73,7 @@ func portablesHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(fmt.Sprintf("portable plugin %s is created", sd.GetName())))
+		fmt.Fprintf(w, "portable plugin %s is created", sd.GetName())
 	}
 }
 
@@ -89,8 +89,7 @@ func portableHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		result := fmt.Sprintf("portable plugin %s is deleted", name)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "portable plugin %s is deleted", name)
 	case http.MethodGet:
 		j, ok := portableManager.GetPluginInfo(name)
 		if !ok {
@@ -116,7 +115,7 @@ func portableHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(fmt.Sprintf("portable plugin %s is updated", sd.GetName())))
+		fmt.Fprintf(w, "portable plugin %s is updated", sd.GetName())
 	}
 }
 

+ 5 - 9
internal/server/rest.go

@@ -495,9 +495,8 @@ func rulesHandler(w http.ResponseWriter, r *http.Request) {
 			handleError(w, err, "", logger)
 			return
 		}
-		result := fmt.Sprintf("Rule %s was created successfully.", id)
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "Rule %s was created successfully.", id)
 	case http.MethodGet:
 		content, err := getAllRulesWithStatus()
 		if err != nil {
@@ -551,15 +550,12 @@ func ruleHandler(w http.ResponseWriter, r *http.Request) {
 		}
 		// Update to db after validation
 		_, err = ruleProcessor.ExecUpdate(name, string(body))
-		var result string
 		if err != nil {
 			handleError(w, err, "Update rule error, suggest to delete it and recreate", logger)
 			return
-		} else {
-			result = fmt.Sprintf("Rule %s was updated successfully.", name)
 		}
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "Rule %s was updated successfully.", name)
 	}
 }
 
@@ -591,7 +587,7 @@ func startRuleHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(fmt.Sprintf("Rule %s was started", name)))
+	fmt.Fprintf(w, "Rule %s was started", name)
 }
 
 // stop a rule
@@ -617,7 +613,7 @@ func restartRuleHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte(fmt.Sprintf("Rule %s was restarted", name)))
+	fmt.Fprintf(w, "Rule %s was restarted", name)
 }
 
 // get topo of a rule
@@ -689,7 +685,7 @@ func importHandler(w http.ResponseWriter, r *http.Request) {
 		}
 		return nil
 	})
-	w.Write([]byte(fmt.Sprintf("imported %d streams, %d tables and %d rules", counts[0], counts[1], counts[2])))
+	fmt.Fprintf(w, "imported %d streams, %d tables and %d rules", counts[0], counts[1], counts[2])
 }
 
 func exportHandler(w http.ResponseWriter, r *http.Request) {

+ 3 - 4
internal/server/schema_init.go

@@ -76,7 +76,7 @@ func schemasHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(fmt.Sprintf("%s schema %s is created", sch.Type, sch.Name)))
+		fmt.Fprintf(w, "%s schema %s is created", sch.Type, sch.Name)
 	}
 }
 
@@ -103,8 +103,7 @@ func schemaHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		result := fmt.Sprintf("%s schema %s is deleted", st, name)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "%s schema %s is deleted", st, name)
 	case http.MethodPut:
 		sch := &schema.Info{Type: def.SchemaType(st), Name: name}
 		err := json.NewDecoder(r.Body).Decode(sch)
@@ -126,7 +125,7 @@ func schemaHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(fmt.Sprintf("%s schema %s is updated", sch.Type, sch.Name)))
+		fmt.Fprintf(w, "%s schema %s is updated", sch.Type, sch.Name)
 	}
 }
 

+ 3 - 4
internal/server/service_init.go

@@ -77,7 +77,7 @@ func servicesHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(fmt.Sprintf("service %s is created", sd.Name)))
+		fmt.Fprintf(w, "service %s is created", sd.Name)
 	}
 }
 
@@ -93,8 +93,7 @@ func serviceHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		result := fmt.Sprintf("service %s is deleted", name)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "service %s is deleted", name)
 	case http.MethodGet:
 		j, err := serviceManager.Get(name)
 		if err != nil {
@@ -117,7 +116,7 @@ func serviceHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(fmt.Sprintf("service %s is updated", sd.Name)))
+		fmt.Fprintf(w, "service %s is updated", sd.Name)
 	}
 }
 

+ 2 - 3
internal/server/wasm_init.go

@@ -72,7 +72,7 @@ func wasmsHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(fmt.Sprintf("wasm plugin %s is created", sd.GetName())))
+		fmt.Fprintf(w, "wasm plugin %s is created", sd.GetName())
 	}
 }
 
@@ -88,8 +88,7 @@ func wasmHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
-		result := fmt.Sprintf("wasm plugin %s is deleted", name)
-		w.Write([]byte(result))
+		fmt.Fprintf(w, "wasm plugin %s is deleted", name)
 	case http.MethodGet:
 		j, ok := wasmManager.GetPluginInfo(name)
 		if !ok {