Merge "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 @@
*/
@Override
public Response toResponse(WebApplicationException ex) {
- //System.out.println("--------------------------------------------------"+ex);
LOGGER.info("Reached WebException Mapper");
/**
@@ -126,11 +127,8 @@
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 @@
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 @@
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 @@
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 @@
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 @@
/**
* 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 @@
/**
* Logger obj
*/
- //private Logger log = Logger.getLogger(MetricsRestService.class.toString());
+
private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class);
/**
* HttpServletRequest obj