/*
 * Copyright 2010-2013 Ning, Inc.
 *
 * Ning 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.jaxrs.mappers;

import javax.inject.Singleton;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@Singleton
@Provider
public class RuntimeExceptionMapper extends ExceptionMapperBase implements ExceptionMapper<RuntimeException> {

    private final UriInfo uriInfo;

    private static final Logger log = LoggerFactory.getLogger(RuntimeExceptionMapper.class);

    public RuntimeExceptionMapper(@Context final UriInfo uriInfo) {
        this.uriInfo = uriInfo;
    }

    @Override
    public Response toResponse(final RuntimeException exception) {
        if (exception instanceof NullPointerException) {
            // Assume bad payload
            exception.printStackTrace();
            log.warn("Exception : " + exception.getMessage());
            return buildBadRequestResponse(exception, uriInfo);
        } else if (exception instanceof WebApplicationException) {
            // e.g. com.sun.jersey.api.NotFoundException
            return ((WebApplicationException) exception).getResponse();
        } else {
            return buildInternalErrorResponse(exception, uriInfo);
        }
    }
}

@@ -36,16 +36,115 @@
 .%0A *
-%0A * Ning
+ Copyright 2014-2018 Groupon, Inc%0A * Copyright 2014-2018 The Billing Project, LLC%0A *%0A * The Billing Project
  lic
@@ -1592,93 +1592,40 @@
     
-// Assume bad payload%0A            exception.printStackTrace();%0A            log.warn(%22
+log.warn(%22Unexpected NullPointer
 Exce
@@ -1633,14 +1633,10 @@
 tion
- : %22 +
+%22,
  exc
@@ -1645,21 +1645,8 @@
 tion
-.getMessage()
 );%0A 

fix printing of NPE in RuntimeExceptionMapper