[RICPLT-2157] Restructure handlers and converters.......

[ric-plt/e2mgr.git] / E2Manager / controllers / controller.go

diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go
index 7d549b2..6c86816 100644 (file)
--- a/E2Manager/controllers/controller.go
+++ b/E2Manager/controllers/controller.go
@@ -79,12 +79,13 @@ func (c *Controller) extractJsonBody(r *http.Request, request models.Request, wr
        }
 
        decoder := json.NewDecoder(r.Body)
-       if err := decoder.Decode(request); err != nil {
-               if err != nil {
-                       c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
-                       c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
-                       return false
-               }
+
+       err := decoder.Decode(request)
+
+       if err != nil {
+               c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err)
+               c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer)
+               return false
        }
 
        return true
@@ -103,6 +104,7 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head
        }
 
        handler, err := c.handlerProvider.GetHandler(requestName)
+
        if err != nil {
                c.handleErrorResponse(err, writer)
                return