From d3d2e313461abe4bf6f9119ee2c573256a29c48f Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Mon, 12 Apr 2021 13:49:53 +0200
Subject: [PATCH] Minor changes
---
.../java/it/inaf/oats/vospace/AsyncTransferService.java | 6 +++---
src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
index 69e4a32..4a95375 100644
--- a/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
+++ b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
@@ -1,8 +1,8 @@
package it.inaf.oats.vospace;
import com.fasterxml.jackson.databind.ObjectMapper;
+import it.inaf.oats.vospace.exception.InternalFaultException;
import java.io.IOException;
-import java.io.UncheckedIOException;
import net.ivoa.xml.uws.v1.JobSummary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,14 +26,14 @@ public class AsyncTransferService {
byte[] result = (byte[]) template.convertSendAndReceive("start_job_queue", message);
if (result == null) {
- throw new IllegalStateException("Transfer service returned an empty response");
+ throw new InternalFaultException("Transfer service returned an empty response");
}
LOG.trace("Tape transfer service answered:\n{}", new String(result));
return MAPPER.readValue(result, JobSummary.class);
} catch (IOException ex) {
- throw new UncheckedIOException(ex);
+ throw new InternalFaultException(ex);
}
}
}
diff --git a/src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java b/src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
index 37657b0..f9fe118 100644
--- a/src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
+++ b/src/main/java/it/inaf/oats/vospace/persistence/JobDAO.java
@@ -3,7 +3,6 @@ package it.inaf.oats.vospace.persistence;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
import java.sql.Timestamp;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -197,7 +196,6 @@ public class JobDAO {
if (last.isPresent()) {
sb.append(" LIMIT ?");
- //sb.append(last.get().toString());
queryParams.add(last.get());
queryParamTypes.add(Types.INTEGER);
}
--
GitLab