updating logging filters

maximize re-use in logging filter classes

Issue-ID: LOG-1125
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Change-Id: I063d57635fe56a60d97945873d0c7b64852182a5

1 files changed, 0 insertions, 306 deletions

diff --git a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java b/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java
deleted file mode 100644
index 1687c19..0000000
--- a/reference/logging-filter/logging-filter-base/src/test/java/org/onap/logging/filter/base/MDCSetupTest.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - Logging
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.logging.filter.base;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.when;
-import java.util.HashMap;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.logging.filter.base.Constants;
-import org.onap.logging.filter.base.MDCSetup;
-import org.onap.logging.filter.base.ONAPComponents;
-import org.onap.logging.filter.base.SimpleHashMap;
-import org.onap.logging.filter.base.SimpleJaxrsHeadersMap;
-import org.onap.logging.filter.base.SimpleMap;
-import org.onap.logging.ref.slf4j.ONAPLogConstants;
-import org.slf4j.MDC;
-
-@RunWith(MockitoJUnitRunner.class)
-public class MDCSetupTest {
-
-    @Mock
-    private HttpServletRequest httpServletRequest;
-
-    @Spy
-    @InjectMocks
-    private MDCSetup mdcSetup = new MDCSetup();
-
-    private String requestId = "4d31fe02-4918-4975-942f-fe51a44e6a9b";
-    private String invocationId = "4d31fe02-4918-4975-942f-fe51a44e6a9a";
-
-    @After
-    public void tearDown() {
-        MDC.clear();
-    }
-
-    @Test
-    public void setElapsedTimeTest() {
-        String expected = "318";
-        MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP, "2019-06-18T02:09:06.024Z");
-        MDC.put(ONAPLogConstants.MDCs.LOG_TIMESTAMP, "2019-06-18T02:09:06.342Z");
-
-        mdcSetup.setElapsedTime();
-        assertEquals(expected, MDC.get(ONAPLogConstants.MDCs.ELAPSED_TIME));
-    }
-
-    @Test
-    public void setElapsedTimeInvokeTimestampTest() {
-        String expected = "318";
-        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP, "2019-06-18T02:09:06.024Z");
-        MDC.put(ONAPLogConstants.MDCs.LOG_TIMESTAMP, "2019-06-18T02:09:06.342Z");
-
-        mdcSetup.setElapsedTimeInvokeTimestamp();
-        assertEquals(expected, MDC.get(ONAPLogConstants.MDCs.ELAPSED_TIME));
-    }
-
-    @Test
-    public void setRequestIdTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put(ONAPLogConstants.Headers.REQUEST_ID, requestId);
-        String fetchedRequestId = mdcSetup.getRequestId(new SimpleHashMap(headers));
-        assertEquals(requestId, fetchedRequestId);
-    }
-
-    @Test
-    public void setRequestIdRequestIdHeaderTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put(Constants.HttpHeaders.HEADER_REQUEST_ID, requestId);
-        String fetchedRequestId = mdcSetup.getRequestId(new SimpleHashMap(headers));
-        assertEquals(requestId, fetchedRequestId);
-    }
-
-    @Test
-    public void setRequestIdTransactionIdHeaderTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put(Constants.HttpHeaders.TRANSACTION_ID, requestId);
-        String fetchedRequestId = mdcSetup.getRequestId(new SimpleHashMap(headers));
-        assertEquals(requestId, fetchedRequestId);
-    }
-
-    @Test
-    public void setRequestIdEcompRequestIdHeaderTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put(Constants.HttpHeaders.ECOMP_REQUEST_ID, requestId);
-        String fetchedRequestId = mdcSetup.getRequestId(new SimpleHashMap(headers));
-        assertEquals(requestId, fetchedRequestId);
-    }
-
-    @Test
-    public void setRequestIdNoHeaderTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        String fetchedRequestId = mdcSetup.getRequestId(new SimpleHashMap(headers));
-        assertNotNull(fetchedRequestId);
-    }
-
-    @Test
-    public void setInvocationIdTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        headers.put(ONAPLogConstants.Headers.INVOCATION_ID, invocationId);
-        mdcSetup.setInvocationId(new SimpleHashMap(headers));
-        assertEquals(invocationId, MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setInvocationIdNoHeaderTest() {
-        HashMap<String, String> headers = new HashMap<>();
-        mdcSetup.setInvocationId(new SimpleHashMap(headers));
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setInvovationIdFromMDCTest() {
-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, "7b77143c-9b50-410c-ac2f-05758a68e3e8");
-        mdcSetup.setInvocationIdFromMDC();
-        assertEquals("7b77143c-9b50-410c-ac2f-05758a68e3e8", MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setInvocationIdFromMDCNoInvocationIdTest() {
-        mdcSetup.setInvocationIdFromMDC();
-        // InvocationId is set to a random UUID
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-    }
-
-    @Test
-    public void setResponseStatusCodeTest() {
-        mdcSetup.setResponseStatusCode(200);
-        assertEquals("COMPLETE", MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-    }
-
-    @Test
-    public void setResponseStatusCodeErrorTest() {
-        mdcSetup.setResponseStatusCode(400);
-        assertEquals("ERROR", MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-        assertEquals("400", MDC.get(ONAPLogConstants.MDCs.ERROR_CODE));
-        assertEquals("Bad Request", MDC.get(ONAPLogConstants.MDCs.ERROR_DESC));
-    }
-
-    @Test
-    public void clearClientMDCsTest() {
-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, "7b77143c-9b50-410c-ac2f-05758a68e3e9");
-        MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, "Bad Gateway");
-        MDC.put(ONAPLogConstants.MDCs.ERROR_DESC, "Bad Gateway");
-        MDC.put(ONAPLogConstants.MDCs.ERROR_CODE, "502");
-        MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, "502");
-        MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, "502");
-        MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, "SO");
-        MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, "SDNC");
-        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP, "2019-06-18T02:09:06.024Z");
-
-        mdcSetup.clearClientMDCs();
-        assertNull(MDC.get(ONAPLogConstants.MDCs.INVOCATION_ID));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.ERROR_CODE));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.ERROR_DESC));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.RESPONSE_CODE));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.TARGET_ENTITY));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME));
-        assertNull(MDC.get(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP));
-    }
-
-    @Test
-    public void setTargetEntityTest() {
-        mdcSetup.setTargetEntity(ONAPComponents.SO);
-        assertEquals("SO", MDC.get(ONAPLogConstants.MDCs.TARGET_ENTITY));
-    }
-
-    @Test
-    public void setResponseDescriptionTest() {
-        mdcSetup.setResponseDescription(502);
-        assertEquals("Bad Gateway", MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION));
-    }
-
-    @Test
-    public void setMDCPartnerNameTest() {
-        MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
-        headerMap.putSingle(ONAPLogConstants.Headers.PARTNER_NAME, "SO");
-        SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
-
-        mdcSetup.setMDCPartnerName(headers);
-
-        assertEquals("SO", MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME));
-    }
-
-    @Test
-    public void setMDCPartnerNameUserAgentHeaderTest() {
-        MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
-        headerMap.putSingle(HttpHeaders.USER_AGENT, "Apache-HttpClient/4.5.8 (Java/1.8.0_191)");
-        SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
-
-        mdcSetup.setMDCPartnerName(headers);
-
-        assertEquals("Apache-HttpClient/4.5.8 (Java/1.8.0_191)", MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME));
-    }
-
-    @Test
-    public void setMDCPartnerNameClientIdHeaderTest() {
-        MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
-        headerMap.putSingle(Constants.HttpHeaders.CLIENT_ID, "SO");
-        SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
-
-        mdcSetup.setMDCPartnerName(headers);
-
-        assertEquals("SO", MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME));
-    }
-
-    @Test
-    public void setMDCPartnerNameNoHeaderTest() {
-        MultivaluedMap<String, String> headerMap = new MultivaluedHashMap<>();
-        SimpleMap headers = new SimpleJaxrsHeadersMap(headerMap);
-
-        mdcSetup.setMDCPartnerName(headers);
-
-        assertEquals("UNKNOWN", MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME));
-    }
-
-    @Test
-    public void setServerFQDNTest() {
-        mdcSetup.setServerFQDN();
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.SERVER_IP_ADDRESS));
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.SERVER_FQDN));
-    }
-
-    @Test
-    public void setClientIPAddressTest() {
-        when(httpServletRequest.getHeader("X-Forwarded-For")).thenReturn("127.0.0.2");
-        mdcSetup.setClientIPAddress(httpServletRequest);
-
-        assertEquals("127.0.0.2", MDC.get(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS));
-    }
-
-    @Test
-    public void setClientIPAddressNoHeaderTest() {
-        when(httpServletRequest.getRemoteAddr()).thenReturn("127.0.0.1");
-        mdcSetup.setClientIPAddress(httpServletRequest);
-
-        assertEquals("127.0.0.1", MDC.get(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS));
-    }
-
-    @Test
-    public void setClientIPAddressNullTest() {
-        mdcSetup.setClientIPAddress(null);
-
-        assertEquals("", MDC.get(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS));
-    }
-
-    @Test
-    public void setEntryTimeStampTest() {
-        mdcSetup.setEntryTimeStamp();
-
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP));
-    }
-
-    @Test
-    public void setLogTimestampTest() {
-        mdcSetup.setLogTimestamp();
-
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.LOG_TIMESTAMP));
-    }
-
-    @Test
-    public void setInstanceIDTest() {
-        mdcSetup.setInstanceID();
-
-        assertNotNull(MDC.get(ONAPLogConstants.MDCs.INSTANCE_UUID));
-    }
-
-    @Test
-    public void setServiceNameTest() {
-        String requestUri = "onap/so/serviceInstances";
-        when(httpServletRequest.getRequestURI()).thenReturn(requestUri);
-        mdcSetup.setServiceName(httpServletRequest);
-
-        assertEquals("onap/so/serviceInstances", MDC.get(ONAPLogConstants.MDCs.SERVICE_NAME));
-    }
-}