From 731bc2a7a5cde189a552e0310efa80c2a4ff7624 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Tue, 2 Feb 2021 18:55:26 +0100
Subject: [PATCH] Minor changes
---
.gitlab-ci.yml | 4 +---
.../{TapeService.java => AsyncTransferService.java} | 8 ++++++--
src/main/java/it/inaf/oats/vospace/JobService.java | 4 ++--
.../java/it/inaf/oats/vospace/TransferControllerTest.java | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
rename src/main/java/it/inaf/oats/vospace/{TapeService.java => AsyncTransferService.java} (78%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2a6398..21db9fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,8 @@ test:
- docker
image: "${CI_REGISTRY_IMAGE}/vospace-test-env"
variables:
- FILE_CATALOG_REPO_URL: "https://gitlab-ci-token:${CI_JOB_TOKEN}@www.ict.inaf.it/gitlab/ia2/vospace-file-catalog.git"
+ FILE_CATALOG_REPO_URL: "https://gitlab-ci-token:${CI_JOB_TOKEN}@www.ict.inaf.it/gitlab/vospace/vospace-file-catalog.git"
script:
- - pwd
- - ls
- git clone ${FILE_CATALOG_REPO_URL}
- mvn clean test -Dinit_database_scripts_path=../../vospace-file-catalog
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv
diff --git a/src/main/java/it/inaf/oats/vospace/TapeService.java b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
similarity index 78%
rename from src/main/java/it/inaf/oats/vospace/TapeService.java
rename to src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
index 42e5c1c..69e4a32 100644
--- a/src/main/java/it/inaf/oats/vospace/TapeService.java
+++ b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
@@ -11,9 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
-public class TapeService {
+public class AsyncTransferService {
- private static final Logger LOG = LoggerFactory.getLogger(TapeService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncTransferService.class);
@Autowired
private RabbitTemplate template;
@@ -25,6 +25,10 @@ public class TapeService {
byte[] message = MAPPER.writeValueAsBytes(job);
byte[] result = (byte[]) template.convertSendAndReceive("start_job_queue", message);
+ if (result == null) {
+ throw new IllegalStateException("Transfer service returned an empty response");
+ }
+
LOG.trace("Tape transfer service answered:\n{}", new String(result));
return MAPPER.readValue(result, JobSummary.class);
diff --git a/src/main/java/it/inaf/oats/vospace/JobService.java b/src/main/java/it/inaf/oats/vospace/JobService.java
index 749a4ba..2f397b1 100644
--- a/src/main/java/it/inaf/oats/vospace/JobService.java
+++ b/src/main/java/it/inaf/oats/vospace/JobService.java
@@ -17,7 +17,7 @@ public class JobService {
private UriService uriService;
@Autowired
- private TapeService tapeService;
+ private AsyncTransferService asyncTransfService;
public enum JobType {
pullToVoSpace,
@@ -58,7 +58,7 @@ public class JobService {
private void handlePullToVoSpace(JobSummary job) {
// TODO: check protocol
- tapeService.startJob(job);
+ asyncTransfService.startJob(job);
}
private void handleVoSpaceUrlsListResult(JobSummary job) {
diff --git a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
index 2645cb3..5dd3cb6 100644
--- a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
+++ b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
@@ -55,7 +55,7 @@ public class TransferControllerTest {
private NodeDAO nodeDao;
@MockBean
- private TapeService tapeService;
+ private AsyncTransferService tapeService;
@Autowired
private MockMvc mockMvc;
--
GitLab