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
22392731
Commit
22392731
authored
4 years ago
by
Sonia Zorba
Browse files
Options
Downloads
Patches
Plain Diff
Used generic JobInfo objects instead of Transfer objects in job_info column
parent
47342b33
No related branches found
No related tags found
No related merge requests found
Pipeline
#968
passed
4 years ago
Stage: build
Stage: test
Stage: dockerize
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
+29
-40
29 additions, 40 deletions
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
with
29 additions
and
40 deletions
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
+
29
−
40
View file @
22392731
...
...
@@ -25,11 +25,14 @@ import org.springframework.stereotype.Repository;
import
java.util.ArrayList
;
import
java.time.LocalDateTime
;
import
java.math.BigDecimal
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
@Repository
public
class
JobDAO
{
private
static
final
Logger
LOG
=
LoggerFactory
.
getLogger
(
JobDAO
.
class
);
private
static
final
ObjectMapper
MAPPER
=
new
ObjectMapper
();
private
final
JdbcTemplate
jdbcTemplate
;
...
...
@@ -41,21 +44,19 @@ public class JobDAO {
public
void
createJob
(
JobSummary
jobSummary
)
{
Object
jobPayload
=
getJobPayload
(
jobSummary
);
String
sql
=
"INSERT INTO job(job_id, owner_id, job_type, phase, job_info) VALUES (?, ?, ?, ?, ?)"
;
jdbcTemplate
.
update
(
sql
,
ps
->
{
int
i
=
0
;
ps
.
setString
(++
i
,
jobSummary
.
getJobId
());
ps
.
setString
(++
i
,
jobSummary
.
getOwnerId
());
ps
.
setObject
(++
i
,
getJobType
(
job
Payload
),
Types
.
OTHER
);
ps
.
setObject
(++
i
,
getJobType
(
job
Summary
),
Types
.
OTHER
);
ps
.
setObject
(++
i
,
jobSummary
.
getPhase
().
value
(),
Types
.
OTHER
);
ps
.
setObject
(++
i
,
toJson
(
job
Payload
),
Types
.
OTHER
);
ps
.
setObject
(++
i
,
toJson
(
job
Summary
.
getJobInfo
()
),
Types
.
OTHER
);
});
}
private
Object
getJob
Payload
(
JobSummary
jobSummary
)
{
private
String
getJob
Type
(
JobSummary
jobSummary
)
{
List
<
Object
>
payload
=
jobSummary
.
getJobInfo
().
getAny
();
if
(
payload
.
isEmpty
())
{
...
...
@@ -65,10 +66,7 @@ public class JobDAO {
throw
new
UnsupportedOperationException
(
"JobInfo as list not supported"
);
}
return
payload
.
get
(
0
);
}
private
String
getJobType
(
Object
jobPayload
)
{
Object
jobPayload
=
payload
.
get
(
0
);
if
(
jobPayload
instanceof
Transfer
)
{
Transfer
transfer
=
(
Transfer
)
jobPayload
;
...
...
@@ -102,14 +100,7 @@ public class JobDAO {
jobSummary
.
setJobId
(
rs
.
getString
(
"job_id"
));
jobSummary
.
setOwnerId
(
rs
.
getString
(
"owner_id"
));
jobSummary
.
setPhase
(
ExecutionPhase
.
fromValue
(
rs
.
getString
(
"phase"
)));
String
jobType
=
rs
.
getString
(
"job_type"
);
Object
jobPayload
=
getJobPayload
(
jobType
,
rs
.
getString
(
"job_info"
));
JobSummary
.
JobInfo
jobInfo
=
new
JobSummary
.
JobInfo
();
jobInfo
.
getAny
().
add
(
jobPayload
);
jobSummary
.
setJobInfo
(
jobInfo
);
jobSummary
.
setJobInfo
(
getJobPayload
(
rs
.
getString
(
"job_info"
)));
jobSummary
.
setResults
(
getResults
(
rs
.
getString
(
"results"
)));
return
jobSummary
;
...
...
@@ -215,10 +206,9 @@ public class JobDAO {
return
sjd
;
}
private
Object
getJobPayload
(
String
jobType
,
String
json
)
{
private
JobSummary
.
JobInfo
getJobPayload
(
String
json
)
{
try
{
// TODO: switch on jobType
return
MAPPER
.
readValue
(
json
,
Transfer
.
class
);
return
MAPPER
.
readValue
(
json
,
JobSummary
.
JobInfo
.
class
);
}
catch
(
JsonProcessingException
ex
)
{
throw
new
RuntimeException
(
ex
);
}
...
...
@@ -256,8 +246,7 @@ public class JobDAO {
}
}
public
static
XMLGregorianCalendar
toXMLGregorianCalendar
(
Timestamp
t
)
{
public
static
XMLGregorianCalendar
toXMLGregorianCalendar
(
Timestamp
t
)
{
XMLGregorianCalendar
cal
=
null
;
try
{
cal
=
DatatypeFactory
.
newInstance
().
newXMLGregorianCalendar
();
...
...
@@ -273,7 +262,7 @@ public class JobDAO {
cal
.
setFractionalSecond
(
new
BigDecimal
(
"0."
+
ldt
.
getNano
()));
}
catch
(
Exception
e
)
{
e
.
printStackTrace
(
);
LOG
.
error
(
"Error while generating XMLGregorianCalendar"
,
e
);
}
return
cal
;
...
...
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