Merge "added test cases to JsonResponseTest.java"

[music.git] / src / main / java / org / onap / music / rest / RestMusicVersionAPI.java

diff --git a/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java b/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
index 924b028..b9754f6 100644 (file)
--- a/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
+++ b/src/main/java/org/onap/music/rest/RestMusicVersionAPI.java
@@ -31,10 +31,9 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 
 import org.onap.music.response.jsonobjects.JsonResponse;
+import org.onap.music.eelf.logging.EELFLoggerDelegate;
 import org.onap.music.main.MusicUtil;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import org.onap.music.main.ResultType;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +43,8 @@ import io.swagger.annotations.ApiOperation;
 @Api(value="Version Api")
 public class RestMusicVersionAPI {
 
-       private static EELFLogger logger = EELFManager.getInstance().getLogger(RestMusicVersionAPI.class);
+       private EELFLoggerDelegate logger =EELFLoggerDelegate.getLogger(RestMusicVersionAPI.class);
+
        /**
         * Get the version of MUSIC
         * @return
@@ -54,8 +54,7 @@ public class RestMusicVersionAPI {
        @Produces(MediaType.APPLICATION_JSON)
        public Map<String,Object> version(@Context HttpServletResponse response) {
                logger.info("Replying to request for MUSIC version with MUSIC:" + MusicUtil.getVersion());
-               JsonResponse jResponse = new JsonResponse(true,"","MUSIC:" + MusicUtil.getVersion());
                response.addHeader("X-latestVersion",MusicUtil.getVersion());
-               return jResponse.toMap();
+               return new JsonResponse(ResultType.SUCCESS).setMusicVersion("MUSIC:" + MusicUtil.getVersion()).toMap();
        }
 }
\ No newline at end of file