From: Arundathi Patil <arundpil@in.ibm.com>
Date: Tue, 9 Jul 2019 03:27:45 +0000 (+0530)
Subject: Sonar fix- RestMusicVersionAPI.java
X-Git-Tag: 3.2.34~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=music.git;a=commitdiff_plain;h=c68232d55cd55a873c22adea8633e2854eb38ee9

Sonar fix- RestMusicVersionAPI.java

Fixed multiple sonar issues in this file

Issue-ID: MUSIC-430
Change-Id: Ic8029d4c3b96f23ea18a94ca7f0683e10c9552d6
Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
---

diff --git a/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java b/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
index 94540eb1..8c86152e 100644
--- a/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
@@ -3,6 +3,8 @@
  * org.onap.music
  * ===================================================================
  *  Copyright (c) 2017 AT&T Intellectual Property
+ *
+ *  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.
@@ -36,9 +38,6 @@ import org.onap.music.eelf.logging.EELFLoggerDelegate;
 import org.onap.music.main.MusicUtil;
 import org.onap.music.main.ResultType;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -48,7 +47,7 @@ import io.swagger.annotations.ApiOperation;
 public class RestMusicVersionAPI {
 
     private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RestMusicVersionAPI.class);
-
+    private static final String MUSIC_KEY = "MUSIC:";
     /**
      * Get the version of MUSIC.
      * @return
@@ -60,7 +59,7 @@ public class RestMusicVersionAPI {
         logger.info("Replying to request for MUSIC version with MUSIC:" + MusicUtil.getVersion());
         response.addHeader("X-latestVersion",MusicUtil.getVersion());
         return new JsonResponse(ResultType.SUCCESS).
-            setMusicVersion("MUSIC:" + MusicUtil.getVersion()).toMap();
+            setMusicVersion(MUSIC_KEY + MusicUtil.getVersion()).toMap();
     }
 
     /**
@@ -75,8 +74,8 @@ public class RestMusicVersionAPI {
         logger.info("Replying to request for MUSIC build with MUSIC:" + MusicUtil.getBuild());
         response.addHeader("X-latestVersion",MusicUtil.getVersion());
         return new JsonResponse(ResultType.SUCCESS)
-            .setMusicBuild("MUSIC:" + MusicUtil.getBuild())
-            .setMusicVersion("MUSIC:" + MusicUtil.getVersion()).toMap();
+            .setMusicBuild(MUSIC_KEY + MusicUtil.getBuild())
+            .setMusicVersion(MUSIC_KEY + MusicUtil.getVersion()).toMap();
     }