AAI-1523 Batch reformat aai-core

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

diff --git a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
index e031a32..f8172b0 100644 (file)
--- a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
@@ -17,9 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.rest;
 
+import static org.junit.Assert.assertEquals;
+
 import com.jayway.jsonpath.JsonPath;
+
+import java.util.*;
+
+import javax.ws.rs.core.Response;
+
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -35,11 +43,6 @@ import org.skyscreamer.jsonassert.JSONAssert;
 import org.springframework.test.context.junit4.rules.SpringClassRule;
 import org.springframework.test.context.junit4.rules.SpringMethodRule;
 
-import javax.ws.rs.core.Response;
-import java.util.*;
-
-import static org.junit.Assert.assertEquals;
-
 @RunWith(value = Parameterized.class)
 public class TenantTest extends AAISetup {
 
@@ -50,20 +53,17 @@ public class TenantTest extends AAISetup {
 
     @Rule
     public final SpringMethodRule springMethodRule = new SpringMethodRule();
-    
+
     @Parameterized.Parameter(value = 0)
     public QueryStyle queryStyle;
 
     @Parameterized.Parameters(name = "QueryStyle.{0}")
     public static Collection<Object[]> data() {
-        return Arrays.asList(new Object[][]{
-                {QueryStyle.TRAVERSAL},
-                {QueryStyle.TRAVERSAL_URI}
-        });
+        return Arrays.asList(new Object[][] {{QueryStyle.TRAVERSAL}, {QueryStyle.TRAVERSAL_URI}});
     }
 
     @Before
-    public void setUp(){
+    public void setUp() {
         httpTestUtil = new HttpTestUtil(queryStyle);
         templateValuesMap = new HashMap<>();
     }
@@ -79,32 +79,30 @@ public class TenantTest extends AAISetup {
 
         String cloudRegionPayload = PayloadUtil.getTemplatePayload("cloud-region.json", templateValuesMap);
         String cloudRegionUri = String.format("/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/%s/%s",
-                templateValuesMap.get("cloud-owner"),
-                templateValuesMap.get("cloud-region-id")
-        );
+                templateValuesMap.get("cloud-owner"), templateValuesMap.get("cloud-region-id"));
 
         String tenantUri = cloudRegionUri + "/tenants/tenant/" + templateValuesMap.get("tenant-id");
         String tenantPayload = PayloadUtil.getTemplatePayload("tenant.json", templateValuesMap);
 
-        Response response     = httpTestUtil.doPut(cloudRegionUri, cloudRegionPayload);
+        Response response = httpTestUtil.doPut(cloudRegionUri, cloudRegionPayload);
         assertEquals("Expected the cloud region to be created", 201, response.getStatus());
 
-        response     = httpTestUtil.doGet(tenantUri);
+        response = httpTestUtil.doGet(tenantUri);
         assertEquals("Expected the cloud region to be created", 200, response.getStatus());
         String responseStr = response.getEntity().toString();
 
         JSONAssert.assertEquals(tenantPayload, responseStr, false);
         String resourceVersion = JsonPath.read(responseStr, "$.resource-version");
 
-        response     = httpTestUtil.doDelete(tenantUri, resourceVersion);
+        response = httpTestUtil.doDelete(tenantUri, resourceVersion);
         assertEquals("Expected the cloud region to be created", 204, response.getStatus());
 
-        response     = httpTestUtil.doGet(cloudRegionUri);
+        response = httpTestUtil.doGet(cloudRegionUri);
         assertEquals("Expected the cloud region to be created", 200, response.getStatus());
         responseStr = response.getEntity().toString();
         resourceVersion = JsonPath.read(responseStr, "$.resource-version");
 
-        response     = httpTestUtil.doDelete(cloudRegionUri, resourceVersion);
+        response = httpTestUtil.doDelete(cloudRegionUri, resourceVersion);
         assertEquals("Expected the cloud region to be created", 204, response.getStatus());
     }
 }