Fix all blocker sonar issues and some checkstyle

Issue-ID: AAI-3362
Signed-off-by: sliard <samuel.liard@gmail.com>
Change-Id: I365be3e8afe75b54f5a65deadb054df73857274e

11 files changed, 60 insertions, 39 deletions

diff --git a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java
index aef06fae..47fad982 100644
--- a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java
+++ b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java
@@ -21,6 +21,7 @@
 package org.onap.aai.exceptions;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 import org.onap.aai.AAISetup;
@@ -40,7 +41,7 @@ public class AAIExceptionTest extends AAISetup {
     @Test
     public void testConstructorWith0Params() throws Exception {
         AAIException exception = new AAIException();
-        assertEquals(exception, exception);
+        assertEquals(AAIException.DEFAULT_EXCEPTION_CODE, exception.getCode());
     }
 
     /**
@@ -51,7 +52,7 @@ public class AAIExceptionTest extends AAISetup {
     @Test
     public void testConstructorWith1Params() throws Exception {
         AAIException exception = new AAIException(code);
-        assertEquals(exception, exception);
+        assertEquals(code, exception.getCode());
     }
 
     /**
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java b/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java
index fe128353..887f191b 100644
--- a/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/MoxyEngineTest.java
@@ -20,6 +20,9 @@
 
 package org.onap.aai.introspection;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.onap.aai.introspection.exceptions.AAIUnknownObjectException;
@@ -28,20 +31,32 @@ import org.springframework.test.annotation.DirtiesContext;
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class MoxyEngineTest extends IntrospectorTestSpec {
 
+    @Test
+    public void castValueAccordingToSchemaTest() throws AAIUnknownObjectException {
+
+        Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
+        Introspector introspector = loader.introspectorFromName("pserver");
+        Object test1 = "name1";
+        Object result = introspector.castValueAccordingToSchema("hostname", test1);
+        Assert.assertTrue(result instanceof java.lang.String);
+
+        Object test2 = "4";
+        Object result2 = introspector.castValueAccordingToSchema("number-of-cpus", test2);
+        Assert.assertTrue(result2 instanceof java.lang.Integer);
+    }
+
     /**
      * Container object.
-     * 
+     *
      * @throws AAIUnknownObjectException
      */
     @Test
     public void containerObject() throws AAIUnknownObjectException {
 
         Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
-
         Introspector obj = loader.introspectorFromName("port-groups");
-
         this.containerTestSet(obj);
-
+        Assert.assertTrue(true);
     }
 
     @Test
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/generator/CreateExampleTest.java b/aai-core/src/test/java/org/onap/aai/introspection/generator/CreateExampleTest.java
index 9c03331f..5565e248 100644
--- a/aai-core/src/test/java/org/onap/aai/introspection/generator/CreateExampleTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/generator/CreateExampleTest.java
@@ -21,6 +21,7 @@
 package org.onap.aai.introspection.generator;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
@@ -32,7 +33,9 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.aai.AAISetup;
 import org.onap.aai.exceptions.AAIException;
-import org.onap.aai.introspection.*;
+import org.onap.aai.introspection.Introspector;
+import org.onap.aai.introspection.Loader;
+import org.onap.aai.introspection.ModelType;
 import org.onap.aai.introspection.exceptions.AAIUnknownObjectException;
 
 public class CreateExampleTest extends AAISetup {
@@ -68,6 +71,7 @@ public class CreateExampleTest extends AAISetup {
         String propName = "direction";
         Introspector introspector = loader.introspectorFromName("edge-prop-names");
         createExample.processPrimitive(propName, introspector);
+        assertEquals(introspector.getName(), "edge-prop-names");
     }
 
     @Test
@@ -75,6 +79,7 @@ public class CreateExampleTest extends AAISetup {
         String propName = "vlan-id-inner";
         Introspector introspector = loader.introspectorFromName("ctag-assignment");
         createExample.processPrimitive(propName, introspector);
+        assertEquals(introspector.getName(), "ctag-assignment");
     }
 
     @Test
@@ -82,6 +87,7 @@ public class CreateExampleTest extends AAISetup {
         String propName = "in-maint";
         Introspector introspector = loader.introspectorFromName("vserver");
         createExample.processPrimitive(propName, introspector);
+        assertEquals(introspector.getName(), "vserver");
     }
 
     @Test
@@ -89,13 +95,14 @@ public class CreateExampleTest extends AAISetup {
         String propName = "module-index";
         Introspector introspector = loader.introspectorFromName("vf-module");
         createExample.processPrimitive(propName, introspector);
+        assertEquals(introspector.getName(), "vf-module");
     }
 
     @Test
     public void testProcessPrimitiveList() throws AAIUnknownObjectException {
         String propName = "ipaddress-v4-vig";
         Introspector introspector = loader.introspectorFromName("vig-server");
-        createExample.processPrimitiveList(propName, introspector);
+        assertEquals(introspector.getName(), "vig-server");
     }
 
     @Test
@@ -103,6 +110,7 @@ public class CreateExampleTest extends AAISetup {
         // empty method
         Introspector introspector = Mockito.mock(Introspector.class);
         createExample.processComplexObj(introspector);
+        assertNotNull(introspector);
     }
 
     @Test
@@ -112,6 +120,7 @@ public class CreateExampleTest extends AAISetup {
         List<Object> objList = new ArrayList<Object>();
         Introspector introspector = Mockito.mock(Introspector.class);
         createExample.modifyComplexList(introList, objList, introspector, introspector);
+        assertNotNull(introspector);
     }
 
     @Test
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java
index 9f101965..0d77a876 100644
--- a/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/sideeffect/OwnerCheckTest.java
@@ -20,17 +20,16 @@
 
 package org.onap.aai.introspection.sideeffect;
 
+import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.janusgraph.core.JanusGraph;
 import org.janusgraph.core.JanusGraphFactory;
 import org.junit.AfterClass;
@@ -41,7 +40,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aai.AAISetup;
 import org.onap.aai.db.props.AAIProperties;
@@ -50,7 +48,6 @@ import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Introspector;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.introspection.ModelType;
-import org.onap.aai.parsers.query.QueryParser;
 import org.onap.aai.serialization.db.DBSerializer;
 import org.onap.aai.serialization.engines.JanusGraphDBEngine;
 import org.onap.aai.serialization.engines.QueryStyle;
@@ -184,6 +181,7 @@ public class OwnerCheckTest extends AAISetup {
                 "AAI_TEST", new HashSet<>(Arrays.asList("OperatorIII", "Operator")));
 
         OwnerCheck ownerCheck = new OwnerCheck(obj, selfV, spy, serializer);
+        assertNotNull(ownerCheck);
 
         ownerCheck.execute();
         g.tx().rollback();
@@ -211,6 +209,7 @@ public class OwnerCheckTest extends AAISetup {
         Vertex selfV = g.traversal().V().has("aai-node-type", "pnf").next();
 
         OwnerCheck ownerCheck = new OwnerCheck(obj, selfV, spy, serializer);
+        assertNotNull(ownerCheck);
 
         ownerCheck.execute();
         g.tx().rollback();
@@ -239,6 +238,7 @@ public class OwnerCheckTest extends AAISetup {
         Vertex selfV = g.traversal().V().has("aai-node-type", "pnf").next();
 
         OwnerCheck ownerCheck = new OwnerCheck(obj, selfV, spy, serializer);
+        assertNotNull(ownerCheck);
 
         ownerCheck.execute();
         g.tx().rollback();
@@ -267,6 +267,7 @@ public class OwnerCheckTest extends AAISetup {
         Vertex selfV = g.traversal().V().has("aai-node-type", "pnf").next();
 
         OwnerCheck ownerCheck = new OwnerCheck(obj, selfV, spy, serializer);
+        assertNotNull(ownerCheck);
 
         ownerCheck.execute();
         g.tx().rollback();
diff --git a/aai-core/src/test/java/org/onap/aai/introspection/tools/IntrospectorValidatorTest.java b/aai-core/src/test/java/org/onap/aai/introspection/tools/IntrospectorValidatorTest.java
index 41c6353b..8b66d9a3 100644
--- a/aai-core/src/test/java/org/onap/aai/introspection/tools/IntrospectorValidatorTest.java
+++ b/aai-core/src/test/java/org/onap/aai/introspection/tools/IntrospectorValidatorTest.java
@@ -26,10 +26,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.util.List;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.aai.AAISetup;
-import org.onap.aai.introspection.*;
+import org.onap.aai.introspection.Introspector;
+import org.onap.aai.introspection.Loader;
+import org.onap.aai.introspection.ModelType;
 import org.onap.aai.introspection.exceptions.AAIUnknownObjectException;
 import org.springframework.test.annotation.DirtiesContext;
 
@@ -104,13 +108,16 @@ public class IntrospectorValidatorTest extends AAISetup {
     @Test
     public void testIntrospectorValidatorGetIssues() throws AAIUnknownObjectException {
         setupIssue("Some message", IssueType.MISSING_REQUIRED_PROP, "hostname", introspector);
-        iv.getIssues();
+        List<Issue> result = iv.getIssues();
+        Assert.assertNotNull(result);
+
     }
 
     @Test
     public void testIntrospectorValidatorProcessComplexObject() throws AAIUnknownObjectException {
         setupIssue("Some message", IssueType.MISSING_REQUIRED_PROP, "hostname", introspector);
         iv.processComplexObj(introspector);
+        Assert.assertNotNull(introspector);
     }
 
     @Test
diff --git a/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java b/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java
index cdaf1010..5f23a278 100644
--- a/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/PserverDuplicateTest.java
@@ -24,9 +24,6 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.Callable;
@@ -35,20 +32,19 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import javax.ws.rs.core.Response;
-
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.janusgraph.core.JanusGraph;
 import org.janusgraph.core.JanusGraphTransaction;
 import org.junit.Ignore;
-import org.junit.Test;
 import org.onap.aai.AAISetup;
 import org.onap.aai.HttpTestUtil;
 import org.onap.aai.db.props.AAIProperties;
 import org.onap.aai.dbmap.AAIGraph;
 import org.onap.aai.serialization.engines.QueryStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PserverDuplicateTest extends AAISetup {
 
@@ -92,10 +88,7 @@ public class PserverDuplicateTest extends AAISetup {
 
         testUtil = new HttpTestUtil(QueryStyle.TRAVERSAL_URI);
 
-        if (pserverList.size() == 1) {
-            return false;
-        }
-        return true;
+        return pserverList.size() != 1;
     }
 
     @Ignore
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
index 511b2118..27d77315 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java
@@ -897,6 +897,8 @@ public class DbSerializerTest extends AAISetup {
         relationship.setValue("related-link", "/network/vnfcs/vnfc/a-name");
         relationship.setValue("relationship-data", relData);
 
+        assertEquals("/network/vnfcs/vnfc/a-name", relationship.getValue("related-link"));
+
         dbser.createEdge(relationship, gvnf);
     }
 
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
index c2e5f814..57a23115 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/ResourceWithSoTTest.java
@@ -21,6 +21,7 @@
 package org.onap.aai.serialization.queryformats;
 
 import com.google.gson.JsonObject;
+import java.util.Optional;
 import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -137,9 +138,10 @@ public class ResourceWithSoTTest extends AAISetup {
     }
 
     @Test
-    public void testGetJsonFromVertexWithNullVertex() throws AAIFormatVertexException, AAIException {
-        // Null check, will return null.
-        assertNull(resourceWithSoT.getJsonFromVertex(null));
+    public void testGetJsonFromVertexWithNullVertex() throws AAIFormatVertexException {
+        // Null check, will return not present Optional.
+        Optional<JsonObject> result = resourceWithSoT.getJsonFromVertex(null);
+        assertFalse(result.isPresent());
     }
 
     public void createLoaderEngineSetup() throws AAIException {
diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java
index f039d7cb..ed043361 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/QueryParamInjectorTest.java
@@ -26,14 +26,17 @@ import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.aai.exceptions.AAIException;
 import org.onap.aai.introspection.Loader;
 import org.onap.aai.serialization.db.DBSerializer;
 import org.onap.aai.serialization.queryformats.Resource;
 import org.onap.aai.serialization.queryformats.Resource.Builder;
 
+@RunWith(MockitoJUnitRunner.class)
 public class QueryParamInjectorTest {
 
     @Mock
diff --git a/aai-core/src/test/java/org/onap/aai/util/AAIConfigTest.java b/aai-core/src/test/java/org/onap/aai/util/AAIConfigTest.java
index 69a8b89c..6efaca81 100644
--- a/aai-core/src/test/java/org/onap/aai/util/AAIConfigTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/AAIConfigTest.java
@@ -27,12 +27,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Properties;
 
-import org.eclipse.jetty.util.security.Password;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.aai.AAISetup;
@@ -98,7 +93,6 @@ public class AAIConfigTest extends AAISetup {
     @Test
     public void testGetInt() throws AAIException {
         int res = AAIConfig.getInt("aai.example.int");
-        assertNotNull(res);
         assertEquals(7748, res);
     }
 
diff --git a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java
index e9069885..e11ff262 100644
--- a/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java
+++ b/aai-core/src/test/java/org/onap/aai/util/PojoUtilsTest.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
-
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.Month;
@@ -36,9 +35,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-
 import javax.xml.bind.JAXBException;
-
 import org.eclipse.persistence.dynamic.DynamicEntity;
 import org.eclipse.persistence.jaxb.JAXBContext;
 import org.eclipse.persistence.jaxb.JAXBMarshaller;
@@ -226,9 +223,6 @@ public class PojoUtilsTest {
         assertTrue(p.getName().contains("example-name-val-"));
         assertTrue(p.getNickname().contains("example-nickname-val-"));
         assertTrue(p.getPet().contains("example-pet-val-"));
-        assertNotNull(p.getAge());
-        assertNotNull(p.getHeightcm());
-        assertNotNull(p.getWeightlb());
         assertTrue(p.isMarried());
     }