diff options
author | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-04-11 16:29:30 +0200 |
---|---|---|
committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-04-12 14:44:29 +0200 |
commit | 17859bdd1f24904d2a9162a1a43f9db222750f4a (patch) | |
tree | 30b10e32d2554807065c7679f56a86f2831e60b3 /src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java | |
parent | 88d7666478e5e98e24ef32637a7580c9809f9458 (diff) |
Optimize and refactor EventPublisher class in VES
* Remove need for having sendEvent synchronized by means of using
Guava LoadingCache. The only thing that made it synchronized was the
creation of new entries in the map but the synchronization was made
on each incoming event.
* Split the class to smaller classes which conform to SRP. This makes us
able to...
* ... write unit tests for affected classes
* TODO: upgrade to Java8 so lambdas will simplify the code even more
Change-Id: I14cf4cfab0570ce5aecc9a5e5dc9f541c499f9d7
Issue-ID: DCAEGEN2-440
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java')
-rw-r--r-- | src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java b/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java new file mode 100644 index 00000000..35d3e317 --- /dev/null +++ b/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java @@ -0,0 +1,69 @@ +package org.onap.dcae.commonFunction; +/*- + * ============LICENSE_START======================================================= + * org.onap.dcaegen2.collectors.ves + * ================================================================================ + * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +import com.att.nsa.cambria.client.CambriaBatchingPublisher; +import com.att.nsa.cambria.client.CambriaClientBuilders; +import java.net.MalformedURLException; +import java.security.GeneralSecurityException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class CambriaPublisherFactory { + + private static Logger log = LoggerFactory.getLogger(CambriaPublisherFactory.class); + + public CambriaBatchingPublisher createCambriaPublisher(String streamId) + throws MalformedURLException, GeneralSecurityException { + String authpwd = null; + String ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash + .get(streamId + ".cambria.url"); + + if (ueburl == null) { + ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash + .get(streamId + ".cambria.hosts"); + } + String topic = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile) + .getKeyValue(streamId + ".cambria.topic"); + String authuser = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile) + .getKeyValue(streamId + ".basicAuthUsername"); + + if (authuser != null) { + authpwd = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash + .get(streamId + ".basicAuthPassword"); + } + + if ((authuser != null) && (authpwd != null)) { + log.debug(String.format("URL:%sTOPIC:%sAuthUser:%sAuthpwd:%s", ueburl, topic, authuser, authpwd)); + return new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic).usingHttps() + .authenticatedByHttp(authuser, authpwd).logSendFailuresAfter(5) + // .logTo(log) + // .limitBatch(100, 10) + .build(); + } else { + log.debug(String.format("URL:%sTOPIC:%s", ueburl, topic)); + return new CambriaClientBuilders.PublisherBuilder().usingHosts(ueburl).onTopic(topic) + // .logTo(log) + .logSendFailuresAfter(5) + // .limitBatch(100, 10) + .build(); + } + } +} |