Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve RestResponseEntityExceptionHandler's "default" method #10617

Merged
merged 1 commit into from
Feb 9, 2021
Merged

improve RestResponseEntityExceptionHandler's "default" method #10617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions ...end/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/POInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ public static POInfo getPOInfo(final String tableName)
/**
* Please consider using {@link #getPOInfo(String)}.
*
* @param ctx_NOTUSED
* @param tableName
* @return POInfo
*/
public static POInfo getPOInfo(final Properties ctx_NOTUSED, final String tableName)
Expand Down Expand Up @@ -140,11 +138,6 @@ public static POInfo getPOInfo(final Properties ctx_NOTUSED, final int AD_Table_

/**
* Please consider using {@link #getPOInfo(String)}.
*
* @param ctx_NOTUSED
* @param tableName
* @param trxName
* @return
*/
public static POInfo getPOInfo(final Properties ctx_NOTUSED, final String tableName, final String trxName)
{
Expand Down
27 changes: 16 additions & 11 deletions ...til.web/src/main/java/de/metas/util/web/exception/RestResponseEntityExceptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@

package de.metas.util.web.exception;

import static de.metas.common.util.CoalesceUtil.coalesceSuppliers;

import javax.annotation.Nullable;

import de.metas.bpartner.service.BPartnerIdNotFoundException;
import de.metas.common.rest_api.JsonError;
import de.metas.dao.selection.pagination.PageNotFoundException;
import de.metas.i18n.TranslatableStrings;
import de.metas.logging.LogManager;
import de.metas.rest_api.utils.JsonErrors;
import de.metas.security.permissions2.PermissionNotGrantedException;
import lombok.NonNull;
import org.adempiere.exceptions.DBUniqueConstraintException;
import org.compiere.util.Env;
import org.slf4j.Logger;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;

import de.metas.bpartner.service.BPartnerIdNotFoundException;
import de.metas.dao.selection.pagination.PageNotFoundException;
import de.metas.i18n.TranslatableStrings;
import de.metas.logging.LogManager;
import de.metas.common.rest_api.JsonError;
import de.metas.rest_api.utils.JsonErrors;
import lombok.NonNull;
import javax.annotation.Nullable;

import static de.metas.common.util.CoalesceUtil.coalesceSuppliers;

@ControllerAdvice
public class RestResponseEntityExceptionHandler
Expand Down Expand Up @@ -105,6 +105,11 @@ public ResponseEntity<JsonError> handleDBUniqueConstraintException(@NonNull fina
@ExceptionHandler(Exception.class)
public ResponseEntity<JsonError> handleException(@NonNull final Exception e)
{
final ResponseStatus responseStatus = e.getClass().getAnnotation(ResponseStatus.class);
if (responseStatus != null)
{
return logAndCreateError(e, responseStatus.reason(), responseStatus.code());
}
return logAndCreateError(e, HttpStatus.UNPROCESSABLE_ENTITY);
}

Expand Down