X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fserver%2Fserver.go;h=79646c29a30de120bda47d265b6f076365dde6e2;hb=46a0fd717e5f49ebae6cb2c4fbcf54f0e329dc86;hp=5861cbe7944a647df4200676d5538d423ee8603d;hpb=f1cee0f81c6bc482f73182c8f4c903e8376381e8;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/server/server.go b/dmaap-mediator-producer/internal/server/server.go index 5861cbe7..79646c29 100644 --- a/dmaap-mediator-producer/internal/server/server.go +++ b/dmaap-mediator-producer/internal/server/server.go @@ -36,17 +36,17 @@ const jobIdToken = "infoJobId" const deleteJobPath = AddJobPath + "/{" + jobIdToken + "}" type ProducerCallbackHandler struct { - jobHandler jobs.JobHandler + jobsManager jobs.JobsManager } -func NewProducerCallbackHandler(jh jobs.JobHandler) *ProducerCallbackHandler { +func NewProducerCallbackHandler(jm jobs.JobsManager) *ProducerCallbackHandler { return &ProducerCallbackHandler{ - jobHandler: jh, + jobsManager: jm, } } -func NewRouter(jh jobs.JobHandler) *mux.Router { - callbackHandler := NewProducerCallbackHandler(jh) +func NewRouter(jm jobs.JobsManager) *mux.Router { + callbackHandler := NewProducerCallbackHandler(jm) r := mux.NewRouter() r.HandleFunc(StatusPath, statusHandler).Methods(http.MethodGet).Name("status") r.HandleFunc(AddJobPath, callbackHandler.addInfoJobHandler).Methods(http.MethodPost).Name("add") @@ -71,7 +71,7 @@ func (h *ProducerCallbackHandler) addInfoJobHandler(w http.ResponseWriter, r *ht http.Error(w, fmt.Sprintf("Invalid json body. Cause: %v", unmarshalErr), http.StatusBadRequest) return } - if err := h.jobHandler.AddJob(jobInfo); err != nil { + if err := h.jobsManager.AddJobFromRESTCall(jobInfo); err != nil { http.Error(w, fmt.Sprintf("Invalid job info. Cause: %v", err), http.StatusBadRequest) } } @@ -84,7 +84,7 @@ func (h *ProducerCallbackHandler) deleteInfoJobHandler(w http.ResponseWriter, r return } - h.jobHandler.DeleteJob(id) + h.jobsManager.DeleteJobFromRESTCall(id) } type notFoundHandler struct{}