From: r.bogacki <r.bogacki@samsung.com>
Date: Tue, 12 Feb 2019 07:44:03 +0000 (+0100)
Subject: Removed sub-expressions from RestMusicDataAPI
X-Git-Tag: 2.5.8~35
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F78270%2F4;p=music.git

Removed sub-expressions from RestMusicDataAPI

Fixed critical Sonar issue related to identical sub-expressions
on both sides of operator.
Added more details to error logger.

Change-Id: I421c4ac3894c08b6b174fdaeb6e68be50e024e63
Issue-ID: MUSIC-328
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
---

diff --git a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
index 507bcd40..0010ed1a 100755
--- a/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicDataAPI.java
@@ -4,6 +4,8 @@
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
  * ===================================================================
+ *  Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
  *  You may obtain a copy of the License at
@@ -404,9 +406,10 @@ public class RestMusicDataAPI {
                     @ApiParam(value = "Table Name",required = true) @PathParam("tablename") String tablename) throws Exception {
         try {
         ResponseBuilder response = MusicUtil.buildVersionResponse(VERSION, minorVersion, patchVersion);
-        if((keyspace == null || keyspace == null) || (tablename.isEmpty() || tablename.isEmpty())){
+        if(keyspace == null || keyspace.isEmpty() || tablename == null || tablename.isEmpty()){
             return response.status(Status.BAD_REQUEST).entity(new JsonResponse(ResultType.FAILURE)
-                    .setError("one or more path parameters are not set, please check and try again")
+                    .setError("One or more path parameters are not set, please check and try again."
+                        + "Parameter values: keyspace='" + keyspace + "' tablename='" + tablename + "'")
                           .toMap()).build();
         }
         EELFLoggerDelegate.mdcPut("keyspace", "( "+keyspace+" ) ");