Resolved conflicts

This commit is contained in:
rajesh
2025-06-06 14:28:21 +05:30
parent 66a07b36c2
commit a733411b5d
2 changed files with 1337 additions and 1312 deletions

View File

@@ -1043,15 +1043,17 @@ public class Utils {
return new ArrayList<>(responseMap.values()); return new ArrayList<>(responseMap.values());
} }
public static void setHttpServletRequestForThread(String redirectURI, String methodType,HttpServletRequest request,String remoteUser) {
public static void setHttpServletRequestForThread(HttpServletRequest request,String methodType, String remoteUser, Long userActionId) {
MockHttpServletRequest mockRequest = new MockHttpServletRequest(); MockHttpServletRequest mockRequest = new MockHttpServletRequest();
mockRequest.setRequestURI(redirectURI); mockRequest.setRequestURI(request.getRequestURI());
mockRequest.setMethod(methodType); mockRequest.setMethod(methodType);
mockRequest.setRemoteUser(remoteUser); mockRequest.setRemoteUser(remoteUser); // or pass it in if needed
Long userActionId = (Long) request.getAttribute(GepafinConstant.USER_ACTION_ID); mockRequest.setAttribute(GepafinConstant.USER_ACTION_ID, userActionId);
mockRequest.setAttribute(GepafinConstant.USER_ACTION_ID,userActionId );
ServletRequestAttributes attributes = new ServletRequestAttributes(mockRequest); ServletRequestAttributes attributes = new ServletRequestAttributes(mockRequest);
RequestContextHolder.setRequestAttributes(attributes, true); RequestContextHolder.setRequestAttributes(attributes, true);
} }
} }