diff options
author | efiacor <fiachra.corcoran@est.tech> | 2019-07-03 11:08:42 +0000 |
---|---|---|
committer | Fiachra Corcoran <fiachra.corcoran@est.tech> | 2019-07-05 11:00:32 +0000 |
commit | b24ac8d9ba04c7b00e3e943b1641ef0806fa4e64 (patch) | |
tree | 65676b913e1e7acc182b567eb2a3f80d9e6d8831 /datarouter-node/src/main | |
parent | c99a397d204ab13416c7d81faf48d7fe7b3ba8a2 (diff) |
Adding more unit tests for DR
Change-Id: I302c3172957770116e770c5916b54c5f32ff3b44
Issue-ID: DMAAP-1226
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Diffstat (limited to 'datarouter-node/src/main')
-rw-r--r-- | datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java index 91bd716b..7ed35928 100644 --- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java +++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java @@ -94,9 +94,9 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> { this.followRedirects = destInfo.isFollowRedirects(); feedid = destInfo.getLogData(); spool = destInfo.getSpool(); - String dfn = spool + "/" + pubid; + String dfn = spool + File.separator + pubid; String mfn = dfn + ".M"; - datafile = new File(spool + "/" + pubid); + datafile = new File(spool + File.separator + pubid); metafile = new File(mfn); boolean monly = destInfo.isMetaDataOnly(); date = Long.parseLong(pubid.substring(0, pubid.indexOf('.'))); @@ -242,7 +242,7 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> { httpURLConnection.setRequestProperty(DECOMPRESSION_STATUS, "SUCCESS"); OutputStream outputStream = getOutputStream(httpURLConnection); if (outputStream != null) { - int bytesRead = 0; + int bytesRead; try (InputStream gzipInputStream = new GZIPInputStream(new FileInputStream(datafile))) { int bufferLength = buffer.length; while ((bytesRead = gzipInputStream.read(buffer, 0, bufferLength)) > 0) { @@ -371,7 +371,8 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> { Files.deleteIfExists(file.toPath()); break; } catch (IOException e) { - eelfLogger.error("IOException : Failed to delete file :" + file.getName() + " on attempt " + tryCount, e); + eelfLogger.error("IOException : Failed to delete file :" + + file.getName() + " on attempt " + tryCount, e); } tryCount++; } @@ -464,7 +465,7 @@ public class DeliveryTask implements Runnable, Comparable<DeliveryTask> { /** * Get the followRedirects for this delivery task. */ - public boolean getFollowRedirects() { + boolean getFollowRedirects() { return (followRedirects); } } |