summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorRam Koya <rk541m@att.com>2018-08-27 14:12:17 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-27 14:12:17 +0000
commit1b8d1fb124b3773b4872e26e910099ed369cc2b4 (patch)
treef11744f0c47142af6f961bda4403d450ff8f95d8 /src/main/java
parent60fdbd167f632d86b967ee3124a142791a7d8158 (diff)
parentbe7925558af3d13fa1d2e4707a1ccabdb4cb5aca (diff)
Merge changes I093fde71,I2dffd5df,I2ae6fa62
* changes: Sonar Major issues Sonar Major issues Sonar Major issues
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java4
-rw-r--r--src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java2
-rw-r--r--src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java b/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java
index b6fcbf5..963ff2d 100644
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java
@@ -88,7 +88,7 @@ public class DMaaPNsaApiDb {
// if neither value was provided, don't encrypt api key db
if (keyBase64 == null && initVectorBase64 == null) {
log.info("This server is configured to use an unencrypted API key database. See the settings documentation.");
- return new BaseNsaApiDbImpl<NsaSimpleApiKey>(cdb,
+ return new BaseNsaApiDbImpl<>(cdb,
new NsaSimpleApiKeyFactory());
} else if (keyBase64 == null) {
// neither or both, otherwise something's goofed
@@ -100,7 +100,7 @@ public class DMaaPNsaApiDb {
log.info("This server is configured to use an encrypted API key database.");
final Key key = EncryptingLayer.readSecretKey(keyBase64);
final byte[] iv = rrConvertor.base64Decode(initVectorBase64);
- return new EncryptingApiDbImpl<NsaSimpleApiKey>(cdb,
+ return new EncryptingApiDbImpl<>(cdb,
new NsaSimpleApiKeyFactory(), key, iv);
}
}
diff --git a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java b/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java
index 7f27798..f61b6ea 100644
--- a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java
+++ b/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java
@@ -51,7 +51,7 @@ public class DME2EndPointLoader {
private String protocol;
private String serviceURL;
private static DME2EndPointLoader loader = new DME2EndPointLoader();
-// private static final Logger LOG = LoggerFactory.getLogger(EventsServiceImpl.class);
+
private static final EELFLogger LOG = EELFManager.getInstance().getLogger(EventsServiceImpl.class);
private DME2EndPointLoader() {
}
diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java b/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java
index 0993aa6..4b219b1 100644
--- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java
+++ b/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java
@@ -21,11 +21,11 @@
*******************************************************************************/
package com.att.dmf.mr.metrics.publisher;
-//import org.slf4j.Logger;
+
//
import com.att.eelf.configuration.EELFLogger;
-//import com.att.eelf.configuration.EELFManager;
+
/**
*