From: Ram Koya <rk541m@att.com>
Date: Thu, 17 Jan 2019 21:36:28 +0000 (+0000)
Subject: Merge "Update INFO.yaml file"
X-Git-Tag: 1.1.11~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e97d3556885006663f2eb730301bdcacdcbc3e54;hp=38203bb37230f7ccd53f435a1d9d13d7d0480930;p=dmaap%2Fmessagerouter%2Fmessageservice.git

Merge "Update INFO.yaml file"
---

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;
 		}
 		
 		
diff --git a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
index 49eddd9..71a0f63 100644
--- a/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
+++ b/src/main/java/org/onap/dmaap/service/ApiKeysRestService.java
@@ -68,7 +68,7 @@ public class ApiKeysRestService {
 	/**
 	 * Logger obj
 	 */
-	//private Logger log = Logger.getLogger(ApiKeysRestService.class.toString());
+
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(ApiKeysRestService.class);
 	/**
 	 * HttpServletRequest obj
diff --git a/src/main/java/org/onap/dmaap/service/MetricsRestService.java b/src/main/java/org/onap/dmaap/service/MetricsRestService.java
index 0a9193b..fdc67d5 100644
--- a/src/main/java/org/onap/dmaap/service/MetricsRestService.java
+++ b/src/main/java/org/onap/dmaap/service/MetricsRestService.java
@@ -58,7 +58,7 @@ public class MetricsRestService {
 	/**
 	 * Logger obj
 	 */
-	//private Logger log = Logger.getLogger(MetricsRestService.class.toString());
+	
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class);
 	/**
 	 * HttpServletRequest obj
diff --git a/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java b/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java
index b03eb5b..903fa96 100644
--- a/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java
+++ b/src/main/java/org/onap/dmaap/util/ContentLengthInterceptor.java
@@ -43,7 +43,7 @@ public class ContentLengthInterceptor implements AjscInterceptor{
 
 	
 	private String defLength;
-	//private Logger log = Logger.getLogger(ContentLengthInterceptor.class.toString());
+	
 	private static final EELFLogger log = EELFManager.getInstance().getLogger(ContentLengthInterceptor.class);
 
 
@@ -87,7 +87,7 @@ public class ContentLengthInterceptor implements AjscInterceptor{
 				} 
 				else 
 				{
-				//chain.doFilter(req, res);
+				
 				return true;
 				}