/*
Copyright 2016-2017, 2020-2022 WeAreFrank!

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.
*/
package nl.nn.adapterframework.webcontrol.api;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.ext.ExceptionMapper;
import javax.ws.rs.ext.Provider;

import org.apache.logging.log4j.Logger;

import nl.nn.adapterframework.util.LogUtil;

/**
 * Custom errorHandler for the FF!API to unpack and re-pack {@link WebApplicationException}s.
 * Has to be explicitly configured to override the CXF default {@link WebApplicationException}Listener.
 * 
 * @author	Niels Meijer
 */

@Provider
public class ApiExceptionHandler implements ExceptionMapper<WebApplicationException> {

	private Logger log = LogUtil.getLogger(this);

	@Override
	public Response toResponse(WebApplicationException exception) {
		//If the message has already been wrapped in an exception we don't need to `convert` it!
		if(exception instanceof ApiException) {
			return ((ApiException) exception).getResponse();
		}

		log.warn("Caught unhandled WebApplicationException while executing FF!API call", exception);

		return ApiException.formatException(exception.getMessage(), Status.INTERNAL_SERVER_ERROR);
	}
}

@@ -1637,16 +1637,225 @@
 tion);%0A%0A
+%09%09Status status = Status.INTERNAL_SERVER_ERROR;%0A%09%09Response response = exception.getResponse();%0A%09%09if(response != null && response.getStatus() %3E 0) %7B%0A%09%09%09status = Status.fromStatusCode(response.getStatus());%0A%09%09%7D%0A
 %09%09return
@@ -1912,36 +1912,14 @@
 (), 
-S
+s
 tatus
-.INTERNAL_SERVER_ERROR
 );%0A%09

Use status code from parent exception when available (#3788)