Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-rest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-rest
Commits
16806f5f
Commit
16806f5f
authored
4 years ago
by
Nicola Fulvio Calabria
Browse files
Options
Downloads
Patches
Plain Diff
Added missing lines to getJob for error summary retrieval
and extended tests.
parent
71087ac6
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
+12
-7
12 additions, 7 deletions
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
src/test/java/it/inaf/oats/vospace/persistence/JobDAOTest.java
+17
-8
17 additions, 8 deletions
...est/java/it/inaf/oats/vospace/persistence/JobDAOTest.java
with
29 additions
and
15 deletions
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
+
12
−
7
View file @
16806f5f
...
...
@@ -48,8 +48,8 @@ public class JobDAO {
String
sql
=
"INSERT INTO job(job_id, owner_id, job_type, phase, job_info,"
+
" error_message, error_type, error_has_detail) "
+
"VALUES (?, ?, ?, ?, ?, ? ,? ,?)"
;
+
" error_message, error_type, error_has_detail
, error_detail
) "
+
"VALUES (?, ?, ?, ?, ?, ? ,?
,?
,?)"
;
jdbcTemplate
.
update
(
sql
,
ps
->
{
int
i
=
0
;
...
...
@@ -64,10 +64,12 @@ public class JobDAO {
ps
.
setString
(++
i
,
errorSummary
.
getMessage
());
ps
.
setObject
(++
i
,
errorSummary
.
getType
().
value
(),
Types
.
OTHER
);
ps
.
setBoolean
(++
i
,
errorSummary
.
isHasDetail
());
ps
.
setString
(++
i
,
errorSummary
.
getDetailMessage
());
}
else
{
ps
.
setNull
(++
i
,
Types
.
VARCHAR
);
ps
.
setNull
(++
i
,
Types
.
OTHER
);
ps
.
setNull
(++
i
,
Types
.
BOOLEAN
);
ps
.
setNull
(++
i
,
Types
.
VARCHAR
);
}
});
}
...
...
@@ -127,6 +129,8 @@ public class JobDAO {
errorSummary
.
setType
(
ErrorType
.
fromValue
(
rs
.
getString
(
"error_type"
)));
}
errorSummary
.
setHasDetail
(
rs
.
getBoolean
(
"error_has_detail"
));
errorSummary
.
setDetailMessage
(
rs
.
getString
(
"error_detail"
));
jobSummary
.
setErrorSummary
(
errorSummary
);
return
jobSummary
;
...
...
@@ -258,14 +262,14 @@ public class JobDAO {
ErrorSummary
errorSummary
=
job
.
getErrorSummary
();
if
(
errorSummary
!=
null
)
{
sql
+=
", error_message, error_type, error_has_detail"
;
sql
+=
", error_message, error_type, error_has_detail
, error_detail
"
;
}
sql
+=
") = (?, ?"
;
if
(
errorSummary
!=
null
)
{
sql
+=
", ?, ?, ?"
;
sql
+=
", ?, ?,
?,
?"
;
}
sql
+=
") WHERE job_id = ?"
;
...
...
@@ -279,6 +283,7 @@ public class JobDAO {
ps
.
setString
(++
i
,
errorSummary
.
getMessage
());
ps
.
setObject
(++
i
,
errorSummary
.
getType
().
value
(),
Types
.
OTHER
);
ps
.
setBoolean
(++
i
,
errorSummary
.
isHasDetail
());
ps
.
setString
(++
i
,
errorSummary
.
getDetailMessage
());
}
ps
.
setString
(++
i
,
job
.
getJobId
());
});
...
...
This diff is collapsed.
Click to expand it.
src/test/java/it/inaf/oats/vospace/persistence/JobDAOTest.java
+
17
−
8
View file @
16806f5f
...
...
@@ -22,7 +22,7 @@ import java.time.Month;
import
net.ivoa.xml.uws.v1.ErrorSummary
;
import
net.ivoa.xml.uws.v1.Jobs
;
import
it.inaf.oats.vospace.exception.ErrorSummaryFactory
;
import
it.inaf.oats.vospace.exception.
VOSpaceFaultEnum
;
import
it.inaf.oats.vospace.exception.
PermissionDeniedException
;
@ExtendWith
(
SpringExtension
.
class
)
@ContextConfiguration
(
classes
=
{
DataSourceConfig
.
class
})
...
...
@@ -58,7 +58,8 @@ public class JobDAOTest {
private
boolean
areEqual
(
ErrorSummary
a
,
ErrorSummary
b
)
{
return
(
a
.
getMessage
().
equals
(
b
.
getMessage
())
&&
a
.
getType
().
equals
(
b
.
getType
())
&&
a
.
isHasDetail
()
==
b
.
isHasDetail
());
&&
a
.
isHasDetail
()
==
b
.
isHasDetail
()
&&
a
.
getDetailMessage
().
equals
(
b
.
getDetailMessage
()));
}
@Test
...
...
@@ -83,10 +84,14 @@ public class JobDAOTest {
job
.
setPhase
(
ExecutionPhase
.
ERROR
);
//
A g
ener
ic picked randomly
//
G
ener
ate it from exception
ErrorSummary
errorSummary
=
ErrorSummaryFactory
.
newErrorSummary
(
VOSpaceFaultEnum
.
PERMISSION_DENIED
);
new
PermissionDeniedException
(
"/pippo1/pippo2"
));
// Check if properly generated
assertTrue
(
errorSummary
.
isHasDetail
());
assertEquals
(
"PermissionDenied. Path: /pippo1/pippo2"
,
errorSummary
.
getDetailMessage
());
job
.
setErrorSummary
(
errorSummary
);
...
...
@@ -109,10 +114,14 @@ public class JobDAOTest {
dao
.
createJob
(
job
);
job
.
setPhase
(
ExecutionPhase
.
ERROR
);
//
A g
ener
ic picked randomly
//
G
ener
ate it from exception
ErrorSummary
errorSummary
=
ErrorSummaryFactory
.
newErrorSummary
(
VOSpaceFaultEnum
.
PERMISSION_DENIED
);
new
PermissionDeniedException
(
"/pippo1/pippo2"
));
// Check if properly generated
assertTrue
(
errorSummary
.
isHasDetail
());
assertEquals
(
"PermissionDenied. Path: /pippo1/pippo2"
,
errorSummary
.
getDetailMessage
());
job
.
setErrorSummary
(
errorSummary
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment