diff options
| author |   koblosz <sandra.koblosz@nokia.com> | 2018-05-22 17:13:35 +0200 |
|---|---|---|
| committer | koblosz <sandra.koblosz@nokia.com> | 2018-06-18 16:07:48 +0200 |
| commit | e0194fbb1f8291ca0c23cc68840097b8d33670e5 (patch) | |
| tree | 428cfe803eb10bdf7098f9a5cd67157d78c8f640 /src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java | |
| parent | cea2e184ff50e91833efd23408d647ccb295e847 (diff) | |
Refactor DmaapPropertyReader
Issue-ID: DCAEGEN2-522
Signed-off-by: KOBLOSZ SANDRA <sandra.koblosz@nokia.com>
Change-Id: I2d9928ff3ffeda0e204480f13e8c8bf91bddf912
Diffstat (limited to 'src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java')
| -rw-r--r-- | src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java b/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java index 35d3e317..41230a14 100644 --- a/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java +++ b/src/main/java/org/onap/dcae/commonFunction/CambriaPublisherFactory.java @@ -23,6 +23,8 @@ import com.att.nsa.cambria.client.CambriaBatchingPublisher; import com.att.nsa.cambria.client.CambriaClientBuilders; import java.net.MalformedURLException; import java.security.GeneralSecurityException; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,21 +35,18 @@ class CambriaPublisherFactory { public CambriaBatchingPublisher createCambriaPublisher(String streamId) throws MalformedURLException, GeneralSecurityException { String authpwd = null; - String ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash - .get(streamId + ".cambria.url"); + DmaapPropertyReader reader = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile); + Map<String, String> dmaapProperties = reader.getDmaapProperties(); + String ueburl = dmaapProperties.get(streamId + ".cambria.url"); if (ueburl == null) { - ueburl = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash - .get(streamId + ".cambria.hosts"); + ueburl = dmaapProperties.get(streamId + ".cambria.hosts"); } - String topic = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile) - .getKeyValue(streamId + ".cambria.topic"); - String authuser = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile) - .getKeyValue(streamId + ".basicAuthUsername"); + String topic = reader.getKeyValue(streamId + ".cambria.topic"); + String authuser = reader.getKeyValue(streamId + ".basicAuthUsername"); if (authuser != null) { - authpwd = DmaapPropertyReader.getInstance(CommonStartup.cambriaConfigFile).dmaap_hash - .get(streamId + ".basicAuthPassword"); + authpwd = dmaapProperties.get(streamId + ".basicAuthPassword"); } if ((authuser != null) && (authpwd != null)) { |