From 19a41092e1a15f45f6189b1ba5bd1194e0093b15 Mon Sep 17 00:00:00 2001 From: Surendra Reddy Katam Date: Thu, 20 Sep 2018 11:45:20 +0530 Subject: Sonar Major issues This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtd&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L537 L541 L551 Change-Id: I6b215d2ace1626b2cb6f22347ff831f51f047e89 Issue-ID: DMAAP-802 Signed-off-by: Surendra Reddy Katam --- .../java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java index 837c956..42ca57b 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java @@ -534,11 +534,11 @@ public class CambriaOutboundEventStream implements StreamWriter { private final Consumer fConsumer; private final int fLimit; private final int fTimeoutMs; - // private final rrNvReadable fSettings; + private final boolean fPretty; private final boolean fWithMeta; private int fSent; -// private final HpAlarmFilter fHpAlarmFilter; + //private final HpProcessingEngine fHppe; private DMaaPContext dmaapContext; private String responseTransactionId; @@ -548,7 +548,7 @@ public class CambriaOutboundEventStream implements StreamWriter { private ArrayList fKafkaConsumerList; private boolean istransType = true; // private static final Logger log = - // Logger.getLogger(CambriaOutboundEventStream.class); + private static final EELFLogger log = EELFManager.getInstance().getLogger(CambriaOutboundEventStream.class); } \ No newline at end of file -- cgit 1.2.3-korg From 37853aa3bd058d4cc80f39cb78f5c0f7be7e036b Mon Sep 17 00:00:00 2001 From: Surendra Reddy Katam Date: Thu, 20 Sep 2018 12:11:31 +0530 Subject: Sonar Major issues This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtb&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L482 L493 Change-Id: I897586855c5f6937fc27dadd4639a7bfd7e62629 Issue-ID: DMAAP-803 Signed-off-by: Surendra Reddy Katam --- .../mr/resources/CambriaOutboundEventStream.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java index 42ca57b..86a6ef8 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java @@ -479,10 +479,10 @@ public class CambriaOutboundEventStream implements StreamWriter { * * Checks whether filter is initialized */ - /*private boolean isFilterInitialized() { - return (fHpAlarmFilter != null && fHppe != null); - } -*/ + + + + /** * * @param msg @@ -490,18 +490,18 @@ public class CambriaOutboundEventStream implements StreamWriter { */ private boolean filterMatches(String msg) { boolean result = true; - /*if (isFilterInitialized()) { - try { - final HpJsonEvent e = new HpJsonEvent("e", new JSONObject(msg)); - result = fHpAlarmFilter.matches(fHppe, e); - } catch (JSONException x) { - // the msg may not be JSON - result = false; - log.error("Failed due to " + x.getMessage()); - } catch (Exception x) { - log.error("Error using filter: " + x.getMessage(), x); - } - }*/ + + + + + + + + + + + + return result; } -- cgit 1.2.3-korg From a5ee03c6b0f22ca2cc424bcc9ee99cbf94a0d941 Mon Sep 17 00:00:00 2001 From: Surendra Reddy Katam Date: Thu, 20 Sep 2018 15:48:34 +0530 Subject: Sonar Major issues This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41Wi2wGn37JfbyHxW&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java Line No-L379 L407 L489 Change-Id: I61fe5ce8021366e497b52e887ff2822d137350a2 Issue-ID: DMAAP-805 Signed-off-by: Surendra Reddy Katam --- src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java index 22b60fe..88c5fd9 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java +++ b/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java @@ -376,7 +376,7 @@ public class EventsServiceImpl implements EventsService { String topicNameStd = null; // topicNameStd= - // ctx.getConfigReader().getSettings().getString("enforced.topic.name.AAF"); + topicNameStd = com.att.ajsc.beans.PropertiesMapBean.getProperty(CambriaConstants.msgRtr_prop, "enforced.topic.name.AAF"); String metricTopicname = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop, @@ -404,7 +404,7 @@ public class EventsServiceImpl implements EventsService { if (topicNameEnforced || (user == null && null != ctx.getRequest().getHeader("Authorization") && !topic.equalsIgnoreCase(metricTopicname))) { // the topic name will be sent by the client - // String permission = "com.att.dmaap.mr.topic"+"|"+topic+"|"+"pub"; + DMaaPAAFAuthenticator aaf = new DMaaPAAFAuthenticatorImpl(); String permission = aaf.aafPermissionString(topic, "pub"); if (!aaf.aafAuthentication(ctx.getRequest(), permission)) { @@ -486,7 +486,7 @@ public class EventsServiceImpl implements EventsService { if (null != batchlen) maxEventBatch = Long.parseLong(batchlen); // long maxEventBatch = - // ctx.getConfigReader().getSettings().getLong(BATCH_LENGTH, 1024 * 16); + final LinkedList batch = new LinkedList<>(); // final ArrayList> kms = new // ArrayList>(); -- cgit 1.2.3-korg