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

Added unique constraints for entities #1073

Merged
merged 10 commits into from
May 17, 2019
Merged

Added unique constraints for entities #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cc35aa0
added error processing
aklochkova Apr 25, 2019
474f489
added unique constraints for oracle
aklochkova Apr 29, 2019
5962c34
added unique constraints for sql server
aklochkova Apr 29, 2019
35df55a
Merge remote-tracking branch 'origin/master' into issue-1338-sql-part
aklochkova Apr 29, 2019
765d9e5
added check for already existing names with postfixes
aklochkova Apr 30, 2019
ac74e90
renamed constraint name
aklochkova May 16, 2019
95a3eff
Merge branch 'master' into issue-1338-sql-part
pavgra May 17, 2019
733b2be
Merge branch 'issue-1338-sql-part' of https://github.com/OHDSI/WebAPI…
pavgra May 17, 2019
44f46b2
Simplified replacements
pavgra May 17, 2019
526fc19
Revised SQL/PostgreSQL migration, removed schema from constraint name
anthonysena May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/main/java/org/ohdsi/webapi/util/GenericExceptionMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,25 @@

@Provider
public class GenericExceptionMapper implements ExceptionMapper<Throwable> {

private final String DETAIL = "Detail: ";

@Override
public Response toResponse(Throwable ex) {
ErrorMessage errorMessage = new ErrorMessage(ex);
StringWriter errorStackTrace = new StringWriter();
ex.printStackTrace(new PrintWriter(errorStackTrace));
Status responseStatus;
if(ex instanceof DataIntegrityViolationException) {
responseStatus = Status.CONFLICT;
String cause = ex.getCause().getCause().getMessage();
cause = cause.substring(cause.indexOf(DETAIL) + DETAIL.length());
ex = new RuntimeException(cause);
} else if (ex instanceof NotFoundException) {
responseStatus = Status.NOT_FOUND;
} else {
responseStatus = Status.INTERNAL_SERVER_ERROR;
}

ErrorMessage errorMessage = new ErrorMessage(ex);
return Response.status(responseStatus)
.entity(errorMessage)
.type(MediaType.APPLICATION_JSON)
Expand Down
Loading