AAI-1523 Batch reformat aai-core

[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / rest / PrivateEdgeIntegrationOldClientTest.java

diff --git a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java
index a3520f5..0232c5a 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/PrivateEdgeIntegrationOldClientTest.java
@@ -17,10 +17,21 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.rest;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNotNull;
 
 import com.jayway.jsonpath.JsonPath;
+
+import java.util.*;
+
+import javax.ws.rs.core.Response;
+
 import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,15 +45,6 @@ import org.onap.aai.serialization.engines.QueryStyle;
 import org.onap.aai.setup.SchemaVersion;
 import org.springframework.test.annotation.DirtiesContext;
 
-import javax.ws.rs.core.Response;
-import java.util.*;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-
 @RunWith(value = Parameterized.class)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_CLASS)
 public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
@@ -53,7 +55,6 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
     private String modelId;
     private String modelVerId;
 
-
     @Parameterized.Parameter(value = 0)
     public QueryStyle queryStyle;
 
@@ -62,10 +63,8 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
 
     @Parameterized.Parameters(name = "QueryStyle.{0} {1}")
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {QueryStyle.TRAVERSAL, new SchemaVersion("v14")},
-                {QueryStyle.TRAVERSAL_URI, new SchemaVersion("v14")},
-        });
+        return Arrays.asList(new Object[][] {{QueryStyle.TRAVERSAL, new SchemaVersion("v14")},
+                {QueryStyle.TRAVERSAL_URI, new SchemaVersion("v14")},});
     }
 
     @Before
@@ -79,9 +78,10 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
         Map<String, String> modelTemplateValues = new HashMap<>();
         modelTemplateValues.put("model-invariant-id", modelId);
 
-        String modelPayload =  PayloadUtil.getTemplatePayload("model.json", modelTemplateValues);
+        String modelPayload = PayloadUtil.getTemplatePayload("model.json", modelTemplateValues);
 
-        Response response = httpTestUtil.doPut("/aai/"+version.toString()+"/service-design-and-creation/models/model/" + modelId, modelPayload);
+        Response response = httpTestUtil.doPut(
+                "/aai/" + version.toString() + "/service-design-and-creation/models/model/" + modelId, modelPayload);
 
         assertNotNull(response);
         assertThat("Model was not successfully created", response.getStatus(), is(201));
@@ -91,15 +91,17 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
         modelVersionTemplateValues.put("model-name", "some-model");
         modelVersionTemplateValues.put("model-version", "testValue");
 
-        String modelVersionPayload =  PayloadUtil.getTemplatePayload("model-ver.json", modelVersionTemplateValues);
+        String modelVersionPayload = PayloadUtil.getTemplatePayload("model-ver.json", modelVersionTemplateValues);
 
-        response = httpTestUtil.doPut("/aai/"+version.toString()+"/service-design-and-creation/models/model/" + modelId + "/model-vers/model-ver/" + modelVerId, modelVersionPayload);
+        response = httpTestUtil.doPut("/aai/" + version.toString() + "/service-design-and-creation/models/model/"
+                + modelId + "/model-vers/model-ver/" + modelVerId, modelVersionPayload);
         assertNotNull(response);
         assertThat("Model was not successfully created", response.getStatus(), is(201));
     }
 
     @Test
-    public void testPutGenericVnfWithModelInfoToMatchExistingModelAndCheckIfPrivateEdgeCreatedAndDoGetOnOldModelAndMakeSureNoRelationship() throws Exception {
+    public void testPutGenericVnfWithModelInfoToMatchExistingModelAndCheckIfPrivateEdgeCreatedAndDoGetOnOldModelAndMakeSureNoRelationship()
+            throws Exception {
 
         Map<String, String> genericVnfHashMap = new HashMap<>();
         String genericVnf = "test-generic-" + UUID.randomUUID().toString();
@@ -109,16 +111,18 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
         genericVnfHashMap.put("model-version-id", modelVerId);
         String genericVnfPayload = PayloadUtil.getTemplatePayload("generic-vnf.json", genericVnfHashMap);
 
-        Response response = httpTestUtil.doPut("/aai/"+version.toString()+"/network/generic-vnfs/generic-vnf/" + genericVnf, genericVnfPayload);
+        Response response = httpTestUtil.doPut(
+                "/aai/" + version.toString() + "/network/generic-vnfs/generic-vnf/" + genericVnf, genericVnfPayload);
         assertNotNull("Response returned null", response);
         assertThat("Check the generic vnf is created", response.getStatus(), is(201));
 
-        response = httpTestUtil.doGet("/aai/"+version.toString()+"/network/generic-vnfs/generic-vnf/" + genericVnf);
+        response = httpTestUtil.doGet("/aai/" + version.toString() + "/network/generic-vnfs/generic-vnf/" + genericVnf);
         assertNotNull("Response returned null", response);
         assertThat("Check the generic vnf is created", response.getStatus(), is(200));
         assertThat(response.getEntity().toString(), not(containsString("relationship-list")));
 
-        List<Edge> edges = AAIGraph.getInstance().getGraph().newTransaction().traversal().E().has("private", true).toList();
+        List<Edge> edges =
+                AAIGraph.getInstance().getGraph().newTransaction().traversal().E().has("private", true).toList();
         assertNotNull("List of edges should not be null", edges);
         assertThat(edges.size(), is(1));
         Edge oldEdge = edges.get(0);
@@ -130,7 +134,8 @@ public class PrivateEdgeIntegrationOldClientTest extends AAISetup {
         assertThat(response.getEntity().toString(), not(containsString("relationship-list")));
 
         String resourceVersion = JsonPath.read(response.getEntity().toString(), "$.resource-version");
-        response = httpTestUtil.doDelete("/aai/"+version.toString()+"/network/generic-vnfs/generic-vnf/" + genericVnf, resourceVersion);
+        response = httpTestUtil.doDelete(
+                "/aai/" + version.toString() + "/network/generic-vnfs/generic-vnf/" + genericVnf, resourceVersion);
         assertNotNull("Response returned null", response);
         assertThat("Check the generic vnf is deleted", response.getStatus(), is(204));