From: Ram Koya <rk541m@att.com>
Date: Wed, 16 Jan 2019 22:27:38 +0000 (+0000)
Subject: Merge changes I3027d53f,I1233ebcc
X-Git-Tag: 1.1.11~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=88718c03ff4a258520cb1ad624cce0c22774755f;hp=2954b7f79c70300a6f195ad55193c674406236d5;p=dmaap%2Fmessagerouter%2Fmessageservice.git

Merge changes I3027d53f,I1233ebcc

* changes:
  Sonar majior issues
  Sonar majior issues
---

diff --git a/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java b/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java
index 389fb5c..4e2745b 100644
--- a/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java
+++ b/src/main/java/org/onap/dmaap/DMaaPWebExceptionMapper.java
@@ -3,6 +3,8 @@
  *  org.onap.dmaap
  *  ================================================================================
  *  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ *  Modifications Copyright (C) 2019 IBM.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -84,7 +86,6 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 	 */
 	@Override
 	public Response toResponse(WebApplicationException ex) {
-		//System.out.println("--------------------------------------------------"+ex);
 		LOGGER.info("Reached WebException Mapper");
 		
 		/**
@@ -126,11 +127,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 			errRes = new ErrorResponse(errCode,dmaapErrCode,errMsg);
 			
 			LOGGER.info(errRes.toString());
-			Response response = Response.status(errRes.getHttpStatusCode()).header("exception", 
+			return Response.status(errRes.getHttpStatusCode()).header("exception",
 					errRes.getErrMapperStr()).build();
-			
-			return response;
-			
 		}
 		/**
 		 * UnAuthorized 
@@ -141,10 +139,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 					getResponseCode(),msgs.getAuthFailure());
 			
 			LOGGER.info(errRes.toString());
-			Response response = Response.status(errRes.getHttpStatusCode()).header("exception", 
+			return Response.status(errRes.getHttpStatusCode()).header("exception",
 					errRes.getErrMapperStr()).build();
-			
-			return response;
 		}
 		/**
 		 * Malformed request
@@ -155,10 +151,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 					getResponseCode(),msgs.getBadRequest());
 			
 			LOGGER.info(errRes.toString());
-			Response response = Response.status(errRes.getHttpStatusCode()).header("exception", 
+			return Response.status(errRes.getHttpStatusCode()).header("exception",
 					errRes.getErrMapperStr()).build();
-			
-			return response;
 		}
 		/**
 		 * HTTP Method not allowed
@@ -169,10 +163,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 					getResponseCode(),msgs.getMethodNotAllowed());
 			
 			LOGGER.info(errRes.toString());
-			Response response = Response.status(errRes.getHttpStatusCode()).header("exception", 
+			return Response.status(errRes.getHttpStatusCode()).header("exception",
 					errRes.getErrMapperStr()).build();
-			
-			return response;
 		}
 		
 		/**
@@ -184,10 +176,8 @@ public class DMaaPWebExceptionMapper implements ExceptionMapper<WebApplicationEx
 					getResponseCode(),msgs.getServerUnav());
 			
 			LOGGER.info(errRes.toString());
-			Response response = Response.status(errRes.getHttpStatusCode()).header("exception", 
+			return Response.status(errRes.getHttpStatusCode()).header("exception",
 					errRes.getErrMapperStr()).build();
-			
-			return response;
 		}