Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "DR AAF CADI integration"
[dmaap/datarouter.git]
/
datarouter-node
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
node
/
DeliveryTask.java
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
b64396b
..
46c4667
100644
(file)
--- 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
@@
-67,6
+67,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
private boolean followRedirects;
private String[][] hdrs;
private String newInvocationId;
private boolean followRedirects;
private String[][] hdrs;
private String newInvocationId;
+ private long resumeTime;
/**
/**
@@
-77,7
+78,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
* the base for the file name in the spool directory and is of
* the form <milliseconds since 1970>.<fqdn of initial data router node>
*/
* the base for the file name in the spool directory and is of
* the form <milliseconds since 1970>.<fqdn of initial data router node>
*/
-
public
DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
+ DeliveryTask(DeliveryTaskHelper deliveryTaskHelper, String pubid) {
this.deliveryTaskHelper = deliveryTaskHelper;
this.pubid = pubid;
destInfo = deliveryTaskHelper.getDestinationInfo();
this.deliveryTaskHelper = deliveryTaskHelper;
this.pubid = pubid;
destInfo = deliveryTaskHelper.getDestinationInfo();
@@
-91,6
+92,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
metafile = new File(mfn);
boolean monly = destInfo.isMetaDataOnly();
date = Long.parseLong(pubid.substring(0, pubid.indexOf('.')));
metafile = new File(mfn);
boolean monly = destInfo.isMetaDataOnly();
date = Long.parseLong(pubid.substring(0, pubid.indexOf('.')));
+ resumeTime = System.currentTimeMillis();
Vector<String[]> hdrv = new Vector<>();
try (BufferedReader br = new BufferedReader(new FileReader(metafile))) {
Vector<String[]> hdrv = new Vector<>();
try (BufferedReader br = new BufferedReader(new FileReader(metafile))) {
@@
-167,7
+169,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
/**
* Get the publish ID
*/
/**
* Get the publish ID
*/
-
public
String getPublishId() {
+ String getPublishId() {
return (pubid);
}
return (pubid);
}
@@
-334,7
+336,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
/**
* Remove meta and data files
*/
/**
* Remove meta and data files
*/
-
public
void clean() {
+ void clean() {
datafile.delete();
metafile.delete();
eelflogger.info(EelfMsgs.INVOKE, newInvocationId);
datafile.delete();
metafile.delete();
eelflogger.info(EelfMsgs.INVOKE, newInvocationId);
@@
-342,10
+344,24
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
hdrs = null;
}
hdrs = null;
}
+ /**
+ * Set the resume time for a delivery task.
+ */
+ void setResumeTime(long resumeTime) {
+ this.resumeTime = resumeTime;
+ }
+
+ /**
+ * Get the resume time for a delivery task.
+ */
+ long getResumeTime() {
+ return resumeTime;
+ }
+
/**
* Has this delivery task been cleaned?
*/
/**
* Has this delivery task been cleaned?
*/
-
public
boolean isCleaned() {
+ boolean isCleaned() {
return (hdrs == null);
}
return (hdrs == null);
}
@@
-359,7
+375,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
/**
* Get creation date as encoded in the publish ID.
*/
/**
* Get creation date as encoded in the publish ID.
*/
-
public
long getDate() {
+ long getDate() {
return (date);
}
return (date);
}
@@
-373,42
+389,42
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
/**
* Get the content type
*/
/**
* Get the content type
*/
-
public
String getCType() {
+ String getCType() {
return (ctype);
}
/**
* Get the method
*/
return (ctype);
}
/**
* Get the method
*/
-
public
String getMethod() {
+ String getMethod() {
return (method);
}
/**
* Get the file ID
*/
return (method);
}
/**
* Get the file ID
*/
-
public
String getFileId() {
+ String getFileId() {
return (fileid);
}
/**
* Get the number of delivery attempts
*/
return (fileid);
}
/**
* Get the number of delivery attempts
*/
-
public
int getAttempts() {
+ int getAttempts() {
return (attempts);
}
/**
* Get the (space delimited list of) subscription ID for this delivery task
*/
return (attempts);
}
/**
* Get the (space delimited list of) subscription ID for this delivery task
*/
-
public
String getSubId() {
+ String getSubId() {
return (subid);
}
/**
* Get the feed ID for this delivery task
*/
return (subid);
}
/**
* Get the feed ID for this delivery task
*/
-
public
String getFeedId() {
+ String getFeedId() {
return (feedid);
}
return (feedid);
}