Skip to content

Commit fc1c59c

Browse files
null check
1 parent 4f3c0f3 commit fc1c59c

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/main/java/com/iemr/hwc/utils/RestTemplateUtil.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.iemr.hwc.utils;
22

3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
35
import org.springframework.http.HttpEntity;
46
import org.springframework.http.HttpHeaders;
57
import org.springframework.http.MediaType;
@@ -8,10 +10,11 @@
810
import org.springframework.web.context.request.RequestContextHolder;
911
import org.springframework.web.context.request.ServletRequestAttributes;
1012

11-
1213
import jakarta.servlet.http.HttpServletRequest;
1314

1415
public class RestTemplateUtil {
16+
private final static Logger logger = LoggerFactory.getLogger(RestTemplateUtil.class);
17+
1518
public static HttpEntity<Object> createRequestEntity(Object body, String authorization) {
1619

1720
ServletRequestAttributes servletRequestAttributes = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes());
@@ -27,18 +30,21 @@ public static HttpEntity<Object> createRequestEntity(Object body, String authori
2730
jwtTokenFromCookie = CookieUtil.getJwtTokenFromCookie(requestHeader);
2831

2932
} catch (Exception e) {
30-
e.printStackTrace();
33+
logger.error("Error while getting jwtToken from Cookie" + e.getMessage() );
3134
}
3235

3336
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
3437
headers.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE + ";charset=utf-8");
35-
headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
38+
if(null != UserAgentContext.getUserAgent()) {
39+
headers.add(HttpHeaders.USER_AGENT, UserAgentContext.getUserAgent());
40+
}
3641
headers.add(HttpHeaders.AUTHORIZATION, authorization);
3742
headers.add("JwtToken",requestHeader.getHeader("JwtToken"));
38-
headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie);
43+
if(null != jwtTokenFromCookie) {
44+
headers.add(HttpHeaders.COOKIE, "Jwttoken=" + jwtTokenFromCookie);
45+
}
3946

4047
return new HttpEntity<>(body, headers);
4148
}
4249

43-
}
44-
50+
}

0 commit comments

Comments
 (0)