4.8.29 sonar fix

pom.xml

@@ -21,7 +21,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kafka.version>2.8.1</kafka.version>
     </properties>
-
+    <repositories>
+		<repository>
+			<id>github</id>
+			<url>https://maven.pkg.github.com/karthik-tarento/cb-common-util</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -209,22 +218,27 @@
             <artifactId>jedis</artifactId>
             <version>4.4.3</version>
         </dependency>
-    <dependency>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>elasticsearch</artifactId>
-        <version>6.8.0</version>
-    </dependency>
-    <dependency>
-        <groupId> org.elasticsearch.client</groupId>
-        <artifactId>elasticsearch-rest-high-level-client</artifactId>
-        <version>6.8.0</version>
-        <exclusions>
-            <exclusion>
-                <groupId>org.elasticsearch</groupId>
-                <artifactId>elasticsearch</artifactId>
-            </exclusion>
-        </exclusions>
-    </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>6.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId> org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>6.8.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.igot</groupId>
+            <artifactId>common-util</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/igot/cb/common/OutboundRequestHandlerServiceImpl.java

@@ -42,7 +42,7 @@ public Object fetchUsingGetWithHeadersProfile(String uri, Map<String, String> he
             }
             HttpHeaders headers = new HttpHeaders();
             if (!CollectionUtils.isEmpty(headersValues)) {
-                headersValues.forEach((k, v) -> headers.set(k, v));
+                headersValues.forEach(headers::set);
             }
             HttpEntity<Object> entity = new HttpEntity<>(headers);
             response = restTemplate.exchange(uri, HttpMethod.GET, entity, Map.class).getBody();
@@ -52,13 +52,15 @@ public Object fetchUsingGetWithHeadersProfile(String uri, Map<String, String> he
                         new TypeReference<HashMap<String, Object>>() {
                         });
             } catch (Exception e1) {
+                log.error("Error parsing response body from HttpClientErrorException", e1);
             }
             log.error("Error received: " + e.getResponseBodyAsString(), e);
         } catch (Exception e) {
             log.error(e.getMessage());
             try {
                 log.warn("Error Response: " + mapper.writeValueAsString(response));
             } catch (Exception e1) {
+                log.error("Error parsing response body from Exception", e1);
             }
         }
         return response;
@@ -69,7 +71,7 @@ public Map<String, Object> fetchResultUsingPatch(String uri, Object request, Map
         try {
             HttpHeaders headers = new HttpHeaders();
             if (!CollectionUtils.isEmpty(headersValues)) {
-                headersValues.forEach((k, v) -> headers.set(k, v));
+                headersValues.forEach(headers::set);
             }
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<Object> entity = new HttpEntity<>(request, headers);
@@ -86,6 +88,7 @@ public Map<String, Object> fetchResultUsingPatch(String uri, Object request, Map
                         new TypeReference<HashMap<String, Object>>() {
                         });
             } catch (Exception e1) {
+                log.error("Error parsing response body from HttpClientErrorException", e1);
             }
             log.error("Error received: " + e.getResponseBodyAsString(), e);
         }
@@ -104,6 +107,7 @@ private void logDetails(String uri, Object objectDetails) {
                     .append(System.lineSeparator());
             log.debug(str.toString());
         } catch (JsonProcessingException je) {
+            log.error("Error parsing request/response body", je);
         }
     }
 }

src/main/java/com/igot/cb/exceptions/ProjectCommonException.java

@@ -73,10 +73,6 @@ public void setResponseCode(ResponseCode responseCode) {
         this.responseCode = responseCode;
     }
 
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
     public void setErrorMessage(String errorMessage) {
         this.errorMessage = errorMessage;
     }
@@ -133,7 +129,7 @@ public static void throwServerErrorException(ResponseCode responseCode, String e
         throw new ProjectCommonException(
                 responseCode,
                 StringUtils.isBlank(exceptionMessage) ? responseCode.getErrorMessage() : exceptionMessage,
-                ResponseCode.SERVER_ERROR.getResponseCode());
+                ResponseCode.SERVER_ERROR.getHttpStatusCode());
     }
 
     public static void throwServerErrorException(ResponseCode responseCode) {

src/main/java/com/igot/cb/exceptions/ResponseCode.java

@@ -10,18 +10,18 @@
  */
 @Getter
 public enum ResponseCode {
-    unAuthorized(ResponseMessage.Key.UNAUTHORIZED_USER, ResponseMessage.Message.UNAUTHORIZED_USER),
-    internalError(ResponseMessage.Key.INTERNAL_ERROR, ResponseMessage.Message.INTERNAL_ERROR),
-    resourceNotFound(
+    UNAUTHORIZED(ResponseMessage.Key.UNAUTHORIZED_USER, ResponseMessage.Message.UNAUTHORIZED_USER),
+    INTERNAL_SERVER_ERROR(ResponseMessage.Key.INTERNAL_ERROR, ResponseMessage.Message.INTERNAL_ERROR),
+    RESOURCE_NOT_FOUND(
             ResponseMessage.Key.RESOURCE_NOT_FOUND, ResponseMessage.Message.RESOURCE_NOT_FOUND),
-    invalidParameterValue(
+    INVALID_PARAMETER_VALUE(
             ResponseMessage.Key.INVALID_PARAMETER_VALUE, ResponseMessage.Message.INVALID_PARAMETER_VALUE),
 
     OK(200),
     CLIENT_ERROR(400),
     SERVER_ERROR(500);
     @Setter
-    private int responseCode;
+    private int httpStatusCode;
     /**
      * error code contains String value
      */
@@ -40,8 +40,8 @@ public enum ResponseCode {
         this.errorMessage = errorMessage;
     }
 
-    ResponseCode(int responseCode) {
-        this.responseCode = responseCode;
+    ResponseCode(int httpStatusCode) {
+        this.httpStatusCode = httpStatusCode;
     }
 
     /**
@@ -51,7 +51,7 @@ public static ResponseCode getResponse(String errorCode) {
         if (StringUtils.isBlank(errorCode)) {
             return null;
         } else if (Constants.UNAUTHORIZED.equals(errorCode)) {
-            return ResponseCode.unAuthorized;
+            return ResponseCode.UNAUTHORIZED;
         } else {
             ResponseCode value = null;
             ResponseCode[] responseCodes = ResponseCode.values();
@@ -63,9 +63,4 @@ public static ResponseCode getResponse(String errorCode) {
             return value;
         }
     }
-
-    public String getMessage(int errorCode) {
-        return "";
-    }
-
 }

src/main/java/com/igot/cb/profile/controller/ProfileController.java

@@ -1,8 +1,9 @@
 package com.igot.cb.profile.controller;
 
 import com.igot.cb.profile.service.ProfileService;
-import com.igot.cb.util.ApiResponse;
 import com.igot.cb.util.Constants;
+
+import org.igot.common.model.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +19,7 @@ public class ProfileController {
     private ProfileService profileService;
 
     @PostMapping("/extended")
-    public ResponseEntity<?> saveExtendedProfile(
+    public ResponseEntity<Object> saveExtendedProfile(
             @RequestHeader(value = Constants.X_AUTH_TOKEN, required = true) String authToken,
             @RequestBody Map<String, Object> request) throws Exception {
         ApiResponse response = profileService.saveExtendedProfile(request, authToken);
@@ -62,15 +63,15 @@ public ResponseEntity<Object> getAchievements(@PathVariable(Constants.USER_ID_RQ
     }
 
     @PutMapping("/extended")
-    public ResponseEntity<?> updateExtendedProfile(
+    public ResponseEntity<Object> updateExtendedProfile(
             @RequestHeader(value = Constants.X_AUTH_TOKEN, required = true) String authToken,
             @RequestBody Map<String, Object> request) throws Exception {
         ApiResponse response = profileService.updateExtendedProfile(request, authToken);
         return new ResponseEntity<>(response, response.getResponseCode());
     }
 
     @DeleteMapping("/extended")
-    public ResponseEntity<?> deleteExtendedProfile(
+    public ResponseEntity<Object> deleteExtendedProfile(
             @RequestHeader(value = Constants.X_AUTH_TOKEN, required = true) String authToken,
             @RequestBody Map<String, Object> request) {
 

src/main/java/com/igot/cb/profile/service/ProfileService.java

@@ -1,9 +1,9 @@
 package com.igot.cb.profile.service;
 
-import com.igot.cb.util.ApiResponse;
-
 import java.util.Map;
 
+import org.igot.common.model.ApiResponse;
+
 public interface ProfileService {
 
     ApiResponse saveExtendedProfile(Map<String, Object> request, String userToken);