Merge "Fix minor sonar issues"

3 files changed, 10 insertions, 12 deletions

diff --git a/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java b/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java
index aeb58c4b..e3ac2b26 100644
--- a/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java
+++ b/aai-core/src/main/java/org/onap/aai/rest/RestHandlerService.java
@@ -1,4 +1,4 @@
-/**
+/*
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -24,10 +24,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class RestHandlerService {
-    private static RestHandlerService single_instance = null;
+    private static RestHandlerService singleInstance = null;
     public ThreadPoolExecutor executor;
 
-    // private constructor restricted to this class itself
     private RestHandlerService() {
         executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(50);
     }
@@ -38,9 +37,9 @@ public class RestHandlerService {
      * @return single instance of RestHandlerService
      */
     public static RestHandlerService getInstance() {
-        if (single_instance == null) {
-            single_instance = new RestHandlerService();
+        if (singleInstance == null) {
+            singleInstance = new RestHandlerService();
         }
-        return single_instance;
+        return singleInstance;
     }
 }
diff --git a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java
index b250d8f3..41d97077 100644
--- a/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java
+++ b/aai-core/src/main/java/org/onap/aai/serialization/engines/query/QueryEngine.java
@@ -1,4 +1,4 @@
-/**
+/*
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -34,7 +34,7 @@ import org.onap.aai.introspection.Loader;
 
 public abstract class QueryEngine {
 
-    final protected GraphTraversalSource g;
+    protected final GraphTraversalSource g;
     protected double dbTimeMsecs = 0;
 
     /**
@@ -177,5 +177,4 @@ public abstract class QueryEngine {
     public abstract List<Path> findCousinsAsPath(Vertex start);
 
     public abstract double getDBTimeMsecs();
-
 }
diff --git a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java
index f2c7b27c..cc420018 100644
--- a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java
+++ b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -55,7 +55,7 @@ public class AAIGraphTest extends AAISetup {
     }
 
     @Test
-    public void getRealtimeInstanceConnectionName() throws Exception {
+    public void getRealtimeInstanceConnectionName() {
 
         JanusGraphManagement graphMgt = AAIGraph.getInstance().getGraph().openManagement();
         String connectionInstanceName =
@@ -96,7 +96,7 @@ public class AAIGraphTest extends AAISetup {
 
     @Ignore("Need to create schema specific to the test")
     @Test
-    public void checkIndexOfAliasedIndexedProps() throws Exception {
+    public void checkIndexOfAliasedIndexedProps() {
         Set<String> aliasedIndexedProps = getAliasedIndexedProps();
         JanusGraphManagement graphMgt = AAIGraph.getInstance().getGraph().openManagement();
         for (String aliasedIndexedProp : aliasedIndexedProps) {