/*
 * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
 *
 * 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 org.traccar.api;

import org.traccar.helper.Log;

import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import java.util.HashMap;
import java.util.Map;

public class ResourceErrorHandler implements ExceptionMapper<Exception> {

    private static final String KEY_MESSAGE = "message";
    private static final String KEY_DETAILS = "details";

    @Override
    public Response toResponse(Exception e) {
        Map<String, String> error = new HashMap<>();
        if (e instanceof WebApplicationException) {
            WebApplicationException webApplicationException = (WebApplicationException) e;
            return Response.status(webApplicationException.getResponse().getStatus()).entity(error).build();
        } else {
            error.put(KEY_MESSAGE, e.getMessage());
            error.put(KEY_DETAILS, Log.exceptionStack(e));
            return Response.status(Response.Status.BAD_REQUEST).entity(error).build();
        }
    }

}

@@ -14,16 +14,23 @@
 ht 2015 
+- 2016 
 Anton Ta
@@ -804,56 +804,8 @@
 per;
-%0Aimport java.util.HashMap;%0Aimport java.util.Map;
 %0A%0Apu
@@ -881,123 +881,8 @@
  %7B%0A%0A
-    private static final String KEY_MESSAGE = %22message%22;%0A    private static final String KEY_DETAILS = %22details%22;%0A%0A
     
@@ -941,61 +941,8 @@
 ) %7B%0A
-        Map%3CString, String%3E error = new HashMap%3C%3E();%0A
     
@@ -1025,31 +1025,17 @@
 ception 
-webApplicationE
+e
 xception
@@ -1082,105 +1082,144 @@
     
-return Response.status(webApplicationException.getResponse().getStatus()).entity(error).build();%0A
+String message;%0A            if (exception.getCause() != null) %7B%0A                message = Log.exceptionStack(exception.getCause());%0A    
     
@@ -1247,106 +1247,174 @@
     
+ 
-error.put(KEY_MESSAGE, e.getMessage());%0A            error.put(KEY_DETAILS, Log.exceptionStack(e));
+   message = Log.exceptionStack(exception);%0A            %7D%0A            return Response.fromResponse(exception.getResponse()).entity(message).build();%0A        %7D else %7B
 %0A   
@@ -1485,13 +1485,29 @@
 ity(
-error
+Log.exceptionStack(e)
 ).bu

Update resource error handling