/*
 * Copyright 2014-2015 Groupon, Inc
 * Copyright 2014-2015 The Billing Project, LLC
 *
 * The Billing Project licenses this file to you 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.
 */

package org.killbill.billing.server.filters;

import java.util.List;

import org.killbill.billing.util.UUIDs;
import org.killbill.commons.request.Request;
import org.killbill.commons.request.RequestData;

import com.google.inject.Singleton;
import com.sun.jersey.spi.container.ContainerRequest;
import com.sun.jersey.spi.container.ContainerRequestFilter;
import com.sun.jersey.spi.container.ContainerResponse;
import com.sun.jersey.spi.container.ContainerResponseFilter;

@Singleton
public class RequestDataFilter implements ContainerRequestFilter, ContainerResponseFilter {


    private static final String REQUEST_ID_HEADER_REQ = "X-Killbill-Request-Id-Req";

    @Override
    public ContainerRequest filter(final ContainerRequest request) {
        final List<String> requestIdHeaderRequests = request.getRequestHeader(REQUEST_ID_HEADER_REQ);
        final String requestId = (requestIdHeaderRequests == null || requestIdHeaderRequests.isEmpty()) ? UUIDs.randomUUID().toString() : requestIdHeaderRequests.get(0);
        Request.setPerThreadRequestData(new RequestData(requestId));
        return request;
    }

    @Override
    public ContainerResponse filter(final ContainerRequest request, final ContainerResponse response) {
        Request.resetPerThreadRequestData();
        return response;
    }
}

@@ -752,16 +752,54 @@
 .List;%0A%0A
+import javax.ws.rs.core.HttpHeaders;%0A%0A
 import o
@@ -1296,17 +1296,16 @@
 lter %7B%0A%0A
-%0A
     priv
@@ -1345,20 +1345,92 @@
 D_HEADER
-_REQ
+ = %22X-Request-Id%22;%0A%0A    private static final String LEGACY_REQUEST_ID_HEADER
  = %22X-Ki
@@ -1590,24 +1590,16 @@
 uests = 
-request.
 getReque
@@ -1604,36 +1604,18 @@
 uest
-Header(REQUEST_ID_HEADER_REQ
+Id(request
 );%0A 
@@ -2076,11 +2076,357 @@
 e;%0A    %7D
+%0A%0A    private List%3CString%3E getRequestId(final HttpHeaders requestHeaders) %7B%0A        List%3CString%3E requestIds = requestHeaders.getRequestHeader(REQUEST_ID_HEADER);%0A        if (requestIds == null %7C%7C requestIds.isEmpty()) %7B%0A            requestIds = requestHeaders.getRequestHeader(LEGACY_REQUEST_ID_HEADER);%0A        %7D%0A        return requestIds;%0A    %7D
 %0A%7D%0A

Add support for propagating the X-Request-Id header. Keeps backward compatibility to the old "X-Killbill-Request-Id-Req" header.