X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver.go;h=46bc2a23315507ab6d934f0737be746c1ac1e74c;hb=c8f92e94bb2638aa66a1d7c2ba63375bbfcdc8c9;hp=bc4a1dabfb55975f33e0a181b9e80488b41916bf;hpb=8170f78af913d337f874477ba5dd93411e9e69da;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/server/server.go b/dmaap-mediator-producer/internal/server/server.go
index bc4a1dab..46bc2a23 100644
--- a/dmaap-mediator-producer/internal/server/server.go
+++ b/dmaap-mediator-producer/internal/server/server.go
@@ -38,6 +38,19 @@ const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}"
 const logLevelToken = "level"
 const logAdminPath = "/admin/log"
 
+type ErrorInfo struct {
+	// A URI reference that identifies the problem type.
+	Type string `json:"type" swaggertype:"string"`
+	// A short, human-readable summary of the problem type.
+	Title string `json:"title" swaggertype:"string"`
+	// The HTTP status code generated by the origin server for this occurrence of the problem.
+	Status int `json:"status" swaggertype:"integer" example:"400"`
+	// A human-readable explanation specific to this occurrence of the problem.
+	Detail string `json:"detail" swaggertype:"string" example:"Info job type not found"`
+	// A URI reference that identifies the specific occurrence of the problem.
+	Instance string `json:"instance" swaggertype:"string"`
+} // @name ErrorInfo
+
 type ProducerCallbackHandler struct {
 	jobsManager jobs.JobsManager
 }
@@ -66,21 +79,23 @@ func NewRouter(jm jobs.JobsManager, hcf func(http.ResponseWriter, *http.Request)
 // @Accept       json
 // @Param        user  body  jobs.JobInfo  true  "Info job data"
 // @Success      200
-// @Failure      400  {string}  Cause  of  error
+// @Failure      400  {object}  ErrorInfo     "Problem as defined in https://tools.ietf.org/html/rfc7807"
+// @Header       400  {string}  Content-Type  "application/problem+json"
 // @Router       /info_job [post]
 func (h *ProducerCallbackHandler) addInfoJobHandler(w http.ResponseWriter, r *http.Request) {
 	b, readErr := ioutil.ReadAll(r.Body)
 	if readErr != nil {
-		http.Error(w, fmt.Sprintf("Unable to read body due to: %v", readErr), http.StatusBadRequest)
+		returnError(fmt.Sprintf("Unable to read body due to: %v", readErr), w)
 		return
 	}
 	jobInfo := jobs.JobInfo{}
 	if unmarshalErr := json.Unmarshal(b, &jobInfo); unmarshalErr != nil {
-		http.Error(w, fmt.Sprintf("Invalid json body. Cause: %v", unmarshalErr), http.StatusBadRequest)
+		returnError(fmt.Sprintf("Invalid json body. Cause: %v", unmarshalErr), w)
 		return
 	}
 	if err := h.jobsManager.AddJobFromRESTCall(jobInfo); err != nil {
-		http.Error(w, fmt.Sprintf("Invalid job info. Cause: %v", err), http.StatusBadRequest)
+		returnError(fmt.Sprintf("Invalid job info. Cause: %v", err), w)
+		return
 	}
 }
 
@@ -106,7 +121,8 @@ func (h *ProducerCallbackHandler) deleteInfoJobHandler(w http.ResponseWriter, r
 // @Tags         Admin
 // @Param        level  query  string  false  "string enums"  Enums(Error, Warn, Info, Debug)
 // @Success      200
-// @Failure      400  {string}  Cause  of  error
+// @Failure      400  {object}  ErrorInfo     "Problem as defined in https://tools.ietf.org/html/rfc7807"
+// @Header       400  {string}  Content-Type  "application/problem+json"
 // @Router       /admin/log [put]
 func (h *ProducerCallbackHandler) setLogLevel(w http.ResponseWriter, r *http.Request) {
 	query := r.URL.Query()
@@ -114,7 +130,7 @@ func (h *ProducerCallbackHandler) setLogLevel(w http.ResponseWriter, r *http.Req
 	if loglevel, err := log.ParseLevel(logLevelStr); err == nil {
 		log.SetLevel(loglevel)
 	} else {
-		http.Error(w, fmt.Sprintf("Invalid log level: %v. Log level will not be changed!", logLevelStr), http.StatusBadRequest)
+		returnError(fmt.Sprintf("Invalid log level: %v. Log level will not be changed!", logLevelStr), w)
 		return
 	}
 }
@@ -130,3 +146,13 @@ type methodNotAllowedHandler struct{}
 func (h *methodNotAllowedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	http.Error(w, "Method is not supported.", http.StatusMethodNotAllowed)
 }
+
+func returnError(msg string, w http.ResponseWriter) {
+	errInfo := ErrorInfo{
+		Status: http.StatusBadRequest,
+		Detail: msg,
+	}
+	w.Header().Add("Content-Type", "application/problem+json")
+	w.WriteHeader(http.StatusBadRequest)
+	json.NewEncoder(w).Encode(errInfo)
+}