From 2be2e77d30a3cd547c1a37fb2f280b5fabf1ecd6 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Thu, 19 Sep 2019 13:10:26 +0300
Subject: Rename PromiseRequestIdFilter, extract isWrapNeeded and
 incomingRequestId methods

Change-Id: Idb39f7d5e723598e34e737522c4f73d8de3df93c
Issue-ID: VID-253
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../filter/PromiseEcompRequestIdFilter.java        | 123 ---------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseEcompRequestIdFilter.java

(limited to 'vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseEcompRequestIdFilter.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseEcompRequestIdFilter.java b/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseEcompRequestIdFilter.java
deleted file mode 100644
index 37622a215..000000000
--- a/vid-app-common/src/main/java/org/onap/vid/controller/filter/PromiseEcompRequestIdFilter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 - 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.vid.controller.filter;
-
-
-import com.google.common.collect.ImmutableList;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.filter.GenericFilterBean;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.UUID;
-
-import static org.onap.portalsdk.core.util.SystemProperties.ECOMP_REQUEST_ID;
-
-@WebFilter(urlPatterns = "/*")
-public class PromiseEcompRequestIdFilter extends GenericFilterBean {
-
-    private static final String REQUEST_ID_RESPONSE_HEADER = ECOMP_REQUEST_ID + "-echo";
-
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException {
-
-        if (request instanceof HttpServletRequest) {
-            request = wrapIfNeeded(request);
-
-            if (response instanceof HttpServletResponse) {
-                final String actualRequestId = ((HttpServletRequest) request).getHeader(ECOMP_REQUEST_ID);
-                ((HttpServletResponse) response).addHeader(REQUEST_ID_RESPONSE_HEADER, actualRequestId);
-            }
-        }
-
-        chain.doFilter(request, response);
-    }
-
-    public static ServletRequest wrapIfNeeded(ServletRequest request) {
-        final HttpServletRequest httpRequest = (HttpServletRequest) request;
-        final String originalRequestId = httpRequest.getHeader(ECOMP_REQUEST_ID);
-
-        if (StringUtils.isEmpty(originalRequestId) || !verifyAndValidateUuid(originalRequestId)) {
-            request = new PromiseEcompRequestIdRequestWrapper(httpRequest);
-        }
-
-        return request;
-    }
-
-    public static boolean verifyAndValidateUuid(String value)
-    {
-        String uuidRegex = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
-        return value.matches(uuidRegex);
-    }
-
-    private static class PromiseEcompRequestIdRequestWrapper extends HttpServletRequestWrapper {
-
-        private final UUID requestId;
-
-        PromiseEcompRequestIdRequestWrapper(HttpServletRequest request) {
-            super(request);
-            requestId = UUID.randomUUID();
-        }
-
-        @Override
-        public String getHeader(String name) {
-            return isRequestIdHeaderName(name) ?
-                    requestId.toString() : super.getHeader(name);
-        }
-
-        @Override
-        public Enumeration<String> getHeaders(String name) {
-            if (isRequestIdHeaderName(name)) {
-                return Collections.enumeration(Collections.singleton(requestId.toString()));
-            } else {
-                return super.getHeaders(name);
-            }
-        }
-
-        @Override
-        public Enumeration<String> getHeaderNames() {
-
-            if (null == super.getHeader(ECOMP_REQUEST_ID)) {
-            return Collections.enumeration(ImmutableList.<String>builder()
-                    .add(ECOMP_REQUEST_ID)
-                    .addAll(Collections.list(super.getHeaderNames()))
-                    .build());
-        }
-
-            return super.getHeaderNames();
-        }
-
-        private boolean isRequestIdHeaderName(String name) {
-            return ECOMP_REQUEST_ID.equalsIgnoreCase(name);
-        }
-    }
-}
-- 
cgit 1.2.3-korg