Merge "some code smells removed"

diff --git a/docs/index.rst b/docs/index.rst
index 437a50d..1982263 100755 (executable)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,7 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
 .. Copyright 2017 AT&T Intellectual Property.  All rights reserved.
+.. _master_index:
 
 Music Developer Documentation
 =============================

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 9387c20..e736d84 100644 (file)
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,5 +1,6 @@
 .. This work is licensed under a Creative Commons Attribution 4.0 International License.
 .. http://creativecommons.org/licenses/by/4.0
+.. _release_notes:
 
 
 Release Notes

diff --git a/music-core/src/main/java/org/onap/music/main/CorePropertiesLoader.java b/music-core/src/main/java/org/onap/music/main/CorePropertiesLoader.java
index c386667..2e5ca68 100644 (file)
--- a/music-core/src/main/java/org/onap/music/main/CorePropertiesLoader.java
+++ b/music-core/src/main/java/org/onap/music/main/CorePropertiesLoader.java
@@ -24,8 +24,6 @@ package org.onap.music.main;
 
 import java.util.Properties;
 
-import org.onap.music.eelf.logging.EELFLoggerDelegate;
-
 public class CorePropertiesLoader {
 
     public static void loadProperties(Properties properties) {

diff --git a/music-core/src/main/java/org/onap/music/main/DeadlockDetectionUtil.java b/music-core/src/main/java/org/onap/music/main/DeadlockDetectionUtil.java
index 4c9a74b..23ccca7 100644 (file)
--- a/music-core/src/main/java/org/onap/music/main/DeadlockDetectionUtil.java
+++ b/music-core/src/main/java/org/onap/music/main/DeadlockDetectionUtil.java
@@ -39,7 +39,8 @@ public class DeadlockDetectionUtil {
                @Override
                public String toString() {
                        StringBuffer sb = new StringBuffer();
-                       for (Node link : links) sb.append(link.id);
+                       for (Node link : links)
+                               sb.append(link.id);
                        return "Node [id=" + id + ", links=" + sb.toString() + ", visited=" + visited + ", onStack=" + onStack + "]";
                }
 
@@ -109,13 +110,17 @@ public class DeadlockDetectionUtil {
        }
 
        private boolean findCycle(Node currentNode) {
-               if (currentNode==null) return false;
-               if (currentNode.isOnStack()) return true;
-               if (currentNode.isVisited()) return false;
+               if (currentNode==null)
+                       return false;
+               if (currentNode.isOnStack())
+                       return true;
+               if (currentNode.isVisited())
+                       return false;
                currentNode.setOnStack(true);
                currentNode.setVisited(true);
                for (Node childNode : currentNode.getLinks()) {
-                       if (findCycle(childNode)) return true;
+                       if (findCycle(childNode))
+                               return true;
                }
                currentNode.setOnStack(false);
                return false;

diff --git a/music-rest/src/main/java/org/onap/music/rest/RestMusicQAPI.java b/music-rest/src/main/java/org/onap/music/rest/RestMusicQAPI.java
index 4def0e4..63b72cd 100755 (executable)
--- a/music-rest/src/main/java/org/onap/music/rest/RestMusicQAPI.java
+++ b/music-rest/src/main/java/org/onap/music/rest/RestMusicQAPI.java
@@ -174,9 +174,11 @@ public class RestMusicQAPI {
                 clusteringKey=clusteringKey.replaceAll("[\\(]+","");
                 clusteringKey=clusteringKey.replaceAll("[\\)]+","");
                 clusteringKey = clusteringKey.trim();
-                if (clusteringKey.indexOf(',') == 0) clusteringKey=clusteringKey.substring(1);
+                if (clusteringKey.indexOf(',') == 0)
+                                       clusteringKey=clusteringKey.substring(1);
                 clusteringKey = clusteringKey.trim();
-                if (clusteringKey.equals(",") ) clusteringKey=""; // print error if needed    ( ... ),)
+                if (clusteringKey.equals(",") )
+                                       clusteringKey=""; // print error if needed    ( ... ),)
             }
         }
 

diff --git a/music-core/src/main/resources/application.properties b/music-rest/src/main/resources/application.properties
similarity index 100%
rename from music-core/src/main/resources/application.properties
rename to music-rest/src/main/resources/application.properties