X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Fatt%2Fdmf%2Fmr%2Fservice%2Fimpl%2FEventsServiceImpl.java;h=55657042a11017dbad55ba197d96f137f64423f4;hb=5a9c25120a7efd78e26cd35417ff15aadd8f3b04;hp=22b60fe0955f4e00bd7394f2c70228664dba7ce5;hpb=12635b7ef13b0a1b4954ace5f6df5ee3a742f555;p=dmaap%2Fmessagerouter%2Fmsgrtr.git 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..5565704 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,10 +486,10 @@ 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>(); + final ArrayList> pms = new ArrayList<>(); try { // for each message... @@ -499,7 +499,7 @@ public class EventsServiceImpl implements EventsService { batch.add(m); // final KeyedMessage data = new // KeyedMessage(topic, m.getKey(), - // m.getMessage()); + // kms.add(data); final ProducerRecord data = new ProducerRecord(topic, m.getKey(), m.getMessage()); @@ -509,7 +509,7 @@ public class EventsServiceImpl implements EventsService { final int sizeNow = batch.size(); if (sizeNow > maxEventBatch) { // ctx.getConfigReader().getfPublisher().sendBatchMessage(topic, - // kms); + // kms.clear(); ctx.getConfigReader().getfPublisher().sendBatchMessageNew(topic, pms); pms.clear();