|
@@ -1,7 +1,7 @@
|
|
|
package io.senslog.ws.handler;
|
|
package io.senslog.ws.handler;
|
|
|
|
|
|
|
|
import io.senslog.ws.WSException;
|
|
import io.senslog.ws.WSException;
|
|
|
-import net.sf.json.JSONObject;
|
|
|
|
|
|
|
+import io.senslog.ws.model.WSError;
|
|
|
|
|
|
|
|
import javax.ws.rs.core.Response;
|
|
import javax.ws.rs.core.Response;
|
|
|
import javax.ws.rs.ext.ExceptionMapper;
|
|
import javax.ws.rs.ext.ExceptionMapper;
|
|
@@ -12,10 +12,8 @@ public class ExceptionHandler implements ExceptionMapper<WSException> {
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Response toResponse(WSException exception) {
|
|
public Response toResponse(WSException exception) {
|
|
|
- JSONObject jsonObject = new JSONObject();
|
|
|
|
|
- jsonObject.put("timestamp", System.currentTimeMillis());
|
|
|
|
|
- jsonObject.put("message", exception.getMessage());
|
|
|
|
|
return Response.status(exception.getCode())
|
|
return Response.status(exception.getCode())
|
|
|
- .entity(jsonObject.toString()).build();
|
|
|
|
|
|
|
+ .entity(new WSError(exception.getMessage()).toJson())
|
|
|
|
|
+ .build();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|