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
Remove datarouter-node critical code smells
[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
46c4667
..
018c3af
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
@@
-31,7
+31,6
@@
import java.util.zip.GZIPInputStream;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
import com.att.eelf.configuration.EELFLogger;
import com.att.eelf.configuration.EELFManager;
-import org.apache.log4j.Logger;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import org.slf4j.MDC;
import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
import org.slf4j.MDC;
@@
-46,8
+45,7
@@
import static org.onap.dmaap.datarouter.node.NodeUtils.isFiletypeGzip;
* the file and its delivery data as well as to attempt delivery.
*/
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
* the file and its delivery data as well as to attempt delivery.
*/
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
- private static Logger loggerDeliveryTask = Logger.getLogger("org.onap.dmaap.datarouter.node.DeliveryTask");
- private static EELFLogger eelflogger = EELFManager.getInstance()
+ private static EELFLogger eelfLogger = EELFManager.getInstance()
.getLogger(DeliveryTask.class);
private DeliveryTaskHelper deliveryTaskHelper;
private String pubid;
.getLogger(DeliveryTask.class);
private DeliveryTaskHelper deliveryTaskHelper;
private String pubid;
@@
-129,7
+127,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
hdrv.add(new String[]{h, v});
}
} catch (Exception e) {
hdrv.add(new String[]{h, v});
}
} catch (Exception e) {
-
loggerDeliveryTask.error("Exception "+ Arrays.toString(e.getStackTrace())
, e);
+
eelfLogger.error("Exception"
, e);
}
hdrs = hdrv.toArray(new String[hdrv.size()][]);
url = deliveryTaskHelper.getDestURL(fileid);
}
hdrs = hdrv.toArray(new String[hdrv.size()][]);
url = deliveryTaskHelper.getDestURL(fileid);
@@
-249,7
+247,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
}
deliveryTaskHelper.reportStatus(this, rc, xpubid, rmsg);
} catch (Exception e) {
}
deliveryTaskHelper.reportStatus(this, rc, xpubid, rmsg);
} catch (Exception e) {
-
loggerDeliveryTask.error("Exception " + Arrays.toString(e.getStackTrace()),
e);
+
eelfLogger.error("Exception "+ Arrays.toString(e.getStackTrace()),
e);
deliveryTaskHelper.reportException(this, e);
}
}
deliveryTaskHelper.reportException(this, e);
}
}
@@
-274,7
+272,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
outputStream.close();
} catch (IOException e) {
httpURLConnection.setRequestProperty("Decompression_Status", "FAILURE");
outputStream.close();
} catch (IOException e) {
httpURLConnection.setRequestProperty("Decompression_Status", "FAILURE");
-
loggerDeliveryTask.info("Could not decompress file"
);
+
eelfLogger.info("Could not decompress file", e
);
sendFile(httpURLConnection);
}
sendFile(httpURLConnection);
}
@@
-328,7
+326,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
} catch (ProtocolException pe) {
deliveryTaskHelper.reportDeliveryExtra(this, -1L);
// Rcvd error instead of 100-continue
} catch (ProtocolException pe) {
deliveryTaskHelper.reportDeliveryExtra(this, -1L);
// Rcvd error instead of 100-continue
-
loggerDeliveryTask
.error("Exception " + Arrays.toString(pe.getStackTrace()), pe);
+
eelfLogger
.error("Exception " + Arrays.toString(pe.getStackTrace()), pe);
}
return outputStream;
}
}
return outputStream;
}
@@
-339,8
+337,8
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
void clean() {
datafile.delete();
metafile.delete();
void clean() {
datafile.delete();
metafile.delete();
- eelf
l
ogger.info(EelfMsgs.INVOKE, newInvocationId);
- eelf
l
ogger.info(EelfMsgs.EXIT);
+ eelf
L
ogger.info(EelfMsgs.INVOKE, newInvocationId);
+ eelf
L
ogger.info(EelfMsgs.EXIT);
hdrs = null;
}
hdrs = null;
}