Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Genesys Backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Backend
Commits
552e6723
Commit
552e6723
authored
Jan 24, 2018
by
Matija Obreza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
API: Catch database errors and wrap them as errors
parent
3f003703
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
src/main/java/org/genesys2/server/servlet/controller/rest/AccessionController.java
...2/server/servlet/controller/rest/AccessionController.java
+15
-5
No files found.
src/main/java/org/genesys2/server/servlet/controller/rest/AccessionController.java
View file @
552e6723
...
...
@@ -54,6 +54,7 @@ import org.genesys2.spring.ResourceNotFoundException;
import
org.genesys2.util.InvalidDOIException
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.dao.CannotAcquireLockException
;
import
org.springframework.dao.DataIntegrityViolationException
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.http.MediaType
;
...
...
@@ -244,7 +245,7 @@ public class AccessionController extends RestController {
List
<
AccessionOpResponse
>
response
=
null
;
try
{
response
=
batchRESTService
.
upsertAccessionData
(
institute
,
batch
);
}
catch
(
RESTApiException
e
)
{
}
catch
(
RESTApiException
|
DataIntegrityViolationException
e
)
{
LOG
.
info
(
"Retrying upsert one by one due to {}"
,
e
.
getMessage
());
response
=
upsertAccessionData1by1
(
institute
,
batch
);
}
...
...
@@ -280,19 +281,28 @@ public class AccessionController extends RestController {
AccessionOpResponse
accessionResponse
=
batchRESTService
.
upsertAccessionData
(
institute
,
batchOfOne
).
get
(
0
);
response
.
add
(
accessionResponse
);
}
catch
(
RESTApiException
e
)
{
}
catch
(
RESTApiException
|
DataIntegrityViolationException
e
)
{
if
(
LOG
.
isInfoEnabled
())
{
LOG
.
info
(
"Error upserting {}: {}"
,
acceJ
.
instCode
,
e
.
getMessage
());
}
AccessionOpResponse
accessionResponse
=
new
AccessionOpResponse
(
acceJ
.
instCode
,
acceJ
.
acceNumb
,
acceJ
.
genus
);
accessionResponse
.
setError
(
e
.
getMessage
(
));
accessionResponse
.
setError
(
getDetailedErrorMessage
(
e
));
response
.
add
(
accessionResponse
);
}
}
return
response
;
}
private
String
getDetailedErrorMessage
(
Throwable
e
)
{
StringBuffer
sb
=
new
StringBuffer
(
e
.
getMessage
());
Throwable
r
=
e
;
while
((
r
=
r
.
getCause
())
!=
null
)
{
sb
.
append
(
"\n"
+
r
.
getMessage
());
}
return
sb
.
toString
();
}
/**
* Update accessions in the system
*
...
...
@@ -348,7 +358,7 @@ public class AccessionController extends RestController {
}
AccessionOpResponse
accessionResponse
=
new
AccessionOpResponse
(
acceJ
.
instCode
,
acceJ
.
acceNumb
,
acceJ
.
genus
);
accessionResponse
.
setError
(
e
.
getMessage
(
));
accessionResponse
.
setError
(
getDetailedErrorMessage
(
e
));
response
.
add
(
accessionResponse
);
}
}
...
...
@@ -412,7 +422,7 @@ public class AccessionController extends RestController {
}
AccessionOpResponse
accessionResponse
=
new
AccessionOpResponse
(
acceJ
.
instCode
,
acceJ
.
acceNumb
,
acceJ
.
genus
);
accessionResponse
.
setError
(
e
.
getMessage
(
));
accessionResponse
.
setError
(
getDetailedErrorMessage
(
e
));
response
.
add
(
accessionResponse
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment