Reduce the number of problems in aai-common by removing unused imports

[aai/aai-common.git] / aai-els-onap-logging / src / test / java / org / onap / aai / aailog / filter / RestClientLoggingInterceptorTest.java

diff --git a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestClientLoggingInterceptorTest.java b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestClientLoggingInterceptorTest.java
index 601a13b..f8d23f3 100644 (file)
--- a/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestClientLoggingInterceptorTest.java
+++ b/aai-els-onap-logging/src/test/java/org/onap/aai/aailog/filter/RestClientLoggingInterceptorTest.java
@@ -17,8 +17,18 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.aailog.filter;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.doReturn;
+
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,75 +42,66 @@ import org.slf4j.MDC;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 
-import java.net.InetAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.doReturn;
-
 @RunWith(MockitoJUnitRunner.class)
 public class RestClientLoggingInterceptorTest {
 
-        @Mock
-        private HttpRequest httpRequest;
+    @Mock
+    private HttpRequest httpRequest;
 
-        @Spy
-        @InjectMocks
-        private RestClientLoggingInterceptor restClientLoggingInterceptor;
+    @Spy
+    @InjectMocks
+    private RestClientLoggingInterceptor restClientLoggingInterceptor;
 
-        @After
-        public void tearDown() {
-            MDC.clear();
-        }
+    @After
+    public void tearDown() {
+        MDC.clear();
+    }
 
-        @Test
-        public void setupHeadersTest() {
-            String transId="37b3ab2a-e57e-4fe8-8d8f-eee3019efce6";
-            HttpHeaders headers = new HttpHeaders();
-            headers.add(Constants.HttpHeaders.TRANSACTION_ID, transId);
-            restClientLoggingInterceptor.setupHeaders(httpRequest, headers);
+    @Test
+    public void setupHeadersTest() {
+        String transId = "37b3ab2a-e57e-4fe8-8d8f-eee3019efce6";
+        HttpHeaders headers = new HttpHeaders();
+        headers.add(Constants.HttpHeaders.TRANSACTION_ID, transId);
+        restClientLoggingInterceptor.setupHeaders(httpRequest, headers);
 
-            assertEquals(transId, headers.getFirst(Constants.HttpHeaders.TRANSACTION_ID));
-            assertEquals(transId, headers.getFirst(Constants.HttpHeaders.ECOMP_REQUEST_ID));
-            assertEquals(transId, headers.getFirst(ONAPLogConstants.Headers.REQUEST_ID));
-            assertEquals(transId, headers.getFirst(Constants.HttpHeaders.HEADER_REQUEST_ID));
-        }
+        assertEquals(transId, headers.getFirst(Constants.HttpHeaders.TRANSACTION_ID));
+        assertEquals(transId, headers.getFirst(Constants.HttpHeaders.ECOMP_REQUEST_ID));
+        assertEquals(transId, headers.getFirst(ONAPLogConstants.Headers.REQUEST_ID));
+        assertEquals(transId, headers.getFirst(Constants.HttpHeaders.HEADER_REQUEST_ID));
+    }
 
-        @Test
-        public void getServiceNameTest() throws URISyntaxException {
-            URI uri = null;
-            try {
-                uri = new URI("https://localhost:9999/aai/v1/cloud-infrastructure/complexes/complex/complex-1");
-            } catch (URISyntaxException e) {
-                throw e;
-            }
-            doReturn(uri).when(httpRequest).getURI();
-            String serviceName = restClientLoggingInterceptor.getServiceName(httpRequest);
-
-            assertEquals("/aai/v1/cloud-infrastructure/complexes", serviceName);
+    @Test
+    public void getServiceNameTest() throws URISyntaxException {
+        URI uri = null;
+        try {
+            uri = new URI("https://localhost:9999/aai/v1/cloud-infrastructure/complexes/complex/complex-1");
+        } catch (URISyntaxException e) {
+            throw e;
         }
+        doReturn(uri).when(httpRequest).getURI();
+        String serviceName = restClientLoggingInterceptor.getServiceName(httpRequest);
+
+        assertEquals("/aai/v1/cloud-infrastructure/complexes", serviceName);
+    }
 
-       @Test
-        public void setupMDCTest() throws URISyntaxException {
-           URI uri = new URI("https://localhost:9999/aai/v1/cloud-infrastructure/complexes/complex/complex-1");
-           doReturn(uri).when(httpRequest).getURI();
-           HttpHeaders headers = new HttpHeaders();
-           restClientLoggingInterceptor.pre(httpRequest, headers);
-           assertEquals("/aai/v1/cloud-infrastructure/complexes", MDC.get(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME) );
-           assertEquals("INPROGRESS", MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-           String serverFQDN = "";
-           InetAddress addr = null;
-           try {
-               addr = InetAddress.getLocalHost();
-               serverFQDN = addr.getCanonicalHostName();
+    @Test
+    public void setupMDCTest() throws URISyntaxException {
+        URI uri = new URI("https://localhost:9999/aai/v1/cloud-infrastructure/complexes/complex/complex-1");
+        doReturn(uri).when(httpRequest).getURI();
+        HttpHeaders headers = new HttpHeaders();
+        restClientLoggingInterceptor.pre(httpRequest, headers);
+        assertEquals("/aai/v1/cloud-infrastructure/complexes", MDC.get(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME));
+        assertEquals("INPROGRESS", MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
+        String serverFQDN = "";
+        InetAddress addr = null;
+        try {
+            addr = InetAddress.getLocalHost();
+            serverFQDN = addr.getCanonicalHostName();
 
-           } catch (UnknownHostException e) {
-               serverFQDN = "";
-           }
-           assertEquals(serverFQDN, MDC.get(ONAPLogConstants.MDCs.SERVER_FQDN));
-           assertNotNull(headers.getFirst(ONAPLogConstants.Headers.INVOCATION_ID));
+        } catch (UnknownHostException e) {
+            serverFQDN = "";
         }
+        assertEquals(serverFQDN, MDC.get(ONAPLogConstants.MDCs.SERVER_FQDN));
+        assertNotNull(headers.getFirst(ONAPLogConstants.Headers.INVOCATION_ID));
+    }
 }