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=a88910379e391b8ae3eff5e4540cf9d1d6d59db4;hb=51659cfd123fab4c7a5ce25cc300182c8a9a0d20;hp=22b60fe0955f4e00bd7394f2c70228664dba7ce5;hpb=b1a2963af584d1baed00695d2d8147338141fc53;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..a889103 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(); @@ -523,7 +523,7 @@ public class EventsServiceImpl implements EventsService { final int sizeNow = batch.size(); if (sizeNow > 0) { // ctx.getConfigReader().getfPublisher().sendBatchMessage(topic, - // kms); + // kms.clear(); ctx.getConfigReader().getfPublisher().sendBatchMessageNew(topic, pms); pms.clear(); @@ -597,10 +597,10 @@ public class EventsServiceImpl implements EventsService { if (null != evenlen) maxEventBatch = Long.parseLong(evenlen); // final 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>(); Publisher.message m = null; int messageSequence = 1;