Fix Sonar vulnerabilities and Bugs

[dmaap/messagerouter/messageservice.git] / src / main / java / com / att / nsa / dmaap / DMaaPCambriaExceptionMapper.java

diff --git a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
index 53c3bed..c3699c7 100644 (file)
--- a/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
+++ b/src/main/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapper.java
@@ -8,14 +8,14 @@
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
  *        http://www.apache.org/licenses/LICENSE-2.0
- *  
+*  
  *  Unless required by applicable law or agreed to in writing, software
  *  distributed under the License is distributed on an "AS IS" BASIS,
  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  *  ============LICENSE_END=========================================================
- *
+ *  
  *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
  *  
  *******************************************************************************/
@@ -35,15 +35,15 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.att.nsa.cambria.CambriaApiException;
-import com.att.nsa.cambria.exception.DMaaPErrorMessages;
-import com.att.nsa.cambria.exception.DMaaPResponseCode;
-import com.att.nsa.cambria.exception.ErrorResponse;
+import com.att.dmf.mr.CambriaApiException;
+import com.att.dmf.mr.exception.DMaaPErrorMessages;
+import com.att.dmf.mr.exception.DMaaPResponseCode;
+import com.att.dmf.mr.exception.ErrorResponse;
 
 /**
  * Exception Mapper class to handle
  * CambriaApiException 
- * @author author
+ * @author rajashree.khare
  *
  */
 @Provider
@@ -103,8 +103,8 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx
                /**
                 * Cambria Generic Exception
                 */
-               if(ex instanceof CambriaApiException)
-               {
+               /*if(ex instanceof CambriaApiException)
+               {*/
                        
                        errRes = ex.getErrRes();
                        if(errRes!=null) {
@@ -124,7 +124,7 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx
                        }
                        
                        
-               }
+               /*}
                else
                {
                        errRes = new ErrorResponse(HttpStatus.SC_NOT_FOUND, 
@@ -134,7 +134,7 @@ public class DMaaPCambriaExceptionMapper implements ExceptionMapper<CambriaApiEx
                                        errRes.getErrMapperStr()).build();
                        
                        return response;
-               }
+               }*/
                
        }