diff options
author | sunil unnava <su622b@att.com> | 2019-02-11 14:24:03 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-11 14:24:03 +0000 |
commit | ef236590f93ec27bee7e69847696b8e8d14ffeff (patch) | |
tree | ef73e8798e77cafd9cec5ab4aa9e55f19409cc22 /src | |
parent | f2cb6ad898efcce6a6417552090ef53e68e1f0e4 (diff) | |
parent | 280ff3d0c54946dab3a3203d337a63e37f0aa5d0 (diff) |
Merge changes Ie4716415,I6ce7ca81
* changes:
Sonar majior issues
Sonar majior issues
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java | 64 | ||||
-rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java | 16 |
2 files changed, 40 insertions, 40 deletions
diff --git a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java index 19e8e65..f71bda0 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java @@ -46,15 +46,15 @@ import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -/*import com.att.sa.highlandPark.config.HpConfigContext; -import com.att.sa.highlandPark.config.HpReaderException; -import com.att.sa.highlandPark.events.HpJsonEvent; -import com.att.sa.highlandPark.events.HpJsonEventFactory; -import com.att.sa.highlandPark.processor.HpAlarmFilter; -import com.att.sa.highlandPark.processor.HpEvent; -import com.att.sa.highlandPark.processor.HpProcessingEngine; -import com.att.sa.highlandPark.processor.HpProcessingEngine.EventFactory; -*/ + + + + + + + + + /** * class used to write the consumed messages * @@ -173,7 +173,7 @@ public class CambriaOutboundEventStream implements StreamWriter { // public Builder atOffset ( int pos ) - // return this; + // } /** * method returs object of CambriaOutboundEventStream @@ -202,26 +202,26 @@ public class CambriaOutboundEventStream implements StreamWriter { fPretty = builder.fPretty; fWithMeta = builder.fWithMeta; fKafkaConsumerList = builder.fKafkaConsumerList; - /* if (CambriaConstants.kNoFilter.equals(builder.fTopicFilter)) { - fHpAlarmFilter = null; - fHppe = null; - } else { - try { - final JSONObject filter = new JSONObject(new JSONTokener(builder.fTopicFilter)); - HpConfigContext<HpEvent> cc = new HpConfigContext<HpEvent>(); - fHpAlarmFilter = cc.create(HpAlarmFilter.class, filter); - final EventFactory<HpJsonEvent> ef = new HpJsonEventFactory(); - fHppe = new HpProcessingEngine<HpJsonEvent>(ef); - } catch (HpReaderException e) { - // JSON was okay, but the filter engine says it's bogus - throw new CambriaApiException(HttpServletResponse.SC_BAD_REQUEST, - "Couldn't create filter: " + e.getMessage()); - } catch (JSONException e) { - // user sent a bogus JSON object - throw new CambriaApiException(HttpServletResponse.SC_BAD_REQUEST, - "Couldn't parse JSON: " + e.getMessage()); - } - }*/ + + + + + + + + + + + + + + + + + + + + } /** @@ -265,7 +265,7 @@ public class CambriaOutboundEventStream implements StreamWriter { public void write(final OutputStream os) throws IOException { - // final boolean transactionEnabled = istransEnable; + // synchronized(this){ os.write('['); fSent = forEachMessage(new operation() { @@ -539,7 +539,7 @@ public class CambriaOutboundEventStream implements StreamWriter { private final boolean fWithMeta; private int fSent; - //private final HpProcessingEngine<HpJsonEvent> fHppe; + private DMaaPContext dmaapContext; private String responseTransactionId; private Topic topic; diff --git a/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java index 3462567..800bb0f 100644 --- a/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java @@ -188,7 +188,7 @@ public class ConfigurationReader { log.info("Broker Type is:" + CambriaConstants.kBrokerType_Memory); fPublisher = new MemoryQueuePublisher(q, mmb); //Ramkumar remove below - // fMetaBroker = mmb; + fConsumerFactory = new MemoryConsumerFactory(q); } else { throw new IllegalArgumentException( @@ -316,18 +316,18 @@ public class ConfigurationReader { * * @return */ - /*public rrNvReadable getSettings() { - return settings; - }*/ + + + /** * method to set rrNvReadable object * * @param settings */ - /*public void setSettings(rrNvReadable settings) { - this.settings = settings; - }*/ + + + /** * method to get CuratorFramework object @@ -451,7 +451,7 @@ public class ConfigurationReader { * @return */ public static String getMainZookeeperConnectionString() { - //return settings.getString(CambriaConstants.kSetting_ZkConfigDbServers, CambriaConstants.kDefault_ZkConfigDbServers); + String zkServername = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_ZkConfigDbServers); if (zkServername==null) zkServername=CambriaConstants.kDefault_ZkConfigDbServers; |