Merge "Merge from ECOMP's repository"

1 files changed, 0 insertions, 47 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/ControllersUtils.java b/vid-app-common/src/main/java/org/onap/vid/controllers/ControllersUtils.java
deleted file mode 100644
index 1abe300ef..000000000
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/ControllersUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.onap.vid.controllers;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.onap.portalsdk.core.domain.User;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.util.SystemProperties;
-import org.onap.vid.model.ExceptionResponse;
-import org.slf4j.MDC;
-import org.springframework.http.ResponseEntity;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.ws.rs.WebApplicationException;
-
-import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
-import static org.onap.vid.utils.Logging.getMethodName;
-
-public class ControllersUtils {
-
-
-    public static String extractUserId(HttpServletRequest request) {
-        String userId = "";
-        HttpSession session = request.getSession();
-        if (session != null) {
-            User user = (User) session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME));
-            if (user != null) {
-                //userId = user.getHrid();
-                userId = user.getLoginId();
-                if (userId == null)
-                    userId = user.getOrgUserId();
-            }
-        }
-        return userId;
-    }
-
-    public static ExceptionResponse handleException(Exception e, EELFLoggerDelegate logger) {
-        logger.error(EELFLoggerDelegate.errorLogger, "{}: {}", getMethodName(), ExceptionUtils.getMessage(e), e);
-
-        ExceptionResponse exceptionResponse = new ExceptionResponse(e);
-        return exceptionResponse;
-    }
-
-    public static ResponseEntity handleWebApplicationException(WebApplicationException e, EELFLoggerDelegate logger) {
-        return ResponseEntity.status(e.getResponse().getStatus()).body(ControllersUtils.handleException(e, logger));
-    }
-
-}