Merge "Sonar Fix: JsonResponse.java"

diff --git a/src/main/java/org/onap/music/exceptions/MusicServiceException.java b/src/main/java/org/onap/music/exceptions/MusicServiceException.java
index a3b1fc5..1f0264b 100644 (file)
--- a/src/main/java/org/onap/music/exceptions/MusicServiceException.java
+++ b/src/main/java/org/onap/music/exceptions/MusicServiceException.java
@@ -32,26 +32,6 @@ public class MusicServiceException extends Exception {
     private int errorCode;
     private String errorMessage;
 
-    public int getErrorCode() {
-        return errorCode;
-    }
-
-
-    public void setErrorCode(int errorCode) {
-        this.errorCode = errorCode;
-    }
-
-
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-
-    public void setErrorMessage(String errorMessage) {
-        this.errorMessage = errorMessage;
-    }
-
-
     public MusicServiceException() {
         super();
     }
@@ -76,9 +56,28 @@ public class MusicServiceException extends Exception {
 
 
     public MusicServiceException(String message, Throwable cause, boolean enableSuppression,
-                    boolean writableStackTrace) {
+                                 boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
 
     }
 
+    public int getErrorCode() {
+        return errorCode;
+    }
+
+
+    public void setErrorCode(int errorCode) {
+        this.errorCode = errorCode;
+    }
+
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
 }

diff --git a/src/main/java/org/onap/music/main/ReturnType.java b/src/main/java/org/onap/music/main/ReturnType.java
index 1453a1b..33f68d7 100644 (file)
--- a/src/main/java/org/onap/music/main/ReturnType.java
+++ b/src/main/java/org/onap/music/main/ReturnType.java
@@ -28,6 +28,8 @@ public class ReturnType {
     private ResultType result;
     private String message;
 
+    private String timingInfo;
+
     public ReturnType(ResultType result, String message) {
         super();
         this.result = result;
@@ -42,8 +44,6 @@ public class ReturnType {
         this.timingInfo = timingInfo;
     }
 
-    private String timingInfo;
-
     public ResultType getResult() {
         return result;
     }