Merge changes Ic282f482,I10fc7c7d,I00d8d5f7

* changes:
  Sonar Major issues
  Sonar Major issues
  Sonar Major issues

diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java b/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java
index ea9407b..271b155 100644 (file)
--- a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java
+++ b/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java
@@ -25,8 +25,7 @@ import java.util.ArrayList;
 
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
+
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;

diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java b/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java
index 8ab4619..25cb2df 100644 (file)
--- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java
+++ b/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java
@@ -44,7 +44,7 @@ public class MemoryQueue {
         */
        public MemoryQueue() {
                fQueue = new HashMap<>();
-               fOffsets = new HashMap<String, HashMap<String, Integer>>();
+               fOffsets = new HashMap<>();
        }
 
        /**

diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java b/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
index 80904ea..84576fc 100644 (file)
--- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
+++ b/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java
@@ -71,7 +71,7 @@ public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metr
        {
                if ( a == null ) return null;
 
-               final TreeSet<String> set = new TreeSet<String> ();
+               final TreeSet<String> set = new TreeSet<>();
                for ( int i=0; i<a.length (); i++ )
                {
                        set.add ( a.getString ( i ));

diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java b/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java
index 4a83a1c..0ae0839 100644 (file)
--- a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java
+++ b/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java
@@ -71,7 +71,7 @@ public class DMaaPAuthenticatorImpl<K extends NsaApiKey> implements DMaaPAuthent
         *            the size of the time window for request authentication
         */
        public DMaaPAuthenticatorImpl(NsaApiDb<K> db, long authTimeWindowMs) {
-               fAuthenticators = new LinkedList<DMaaPAuthenticator<K>>();
+               fAuthenticators = new LinkedList<>();
 
                fAuthenticators.add(new DMaaPOriginalUebAuthenticator<K>(db, authTimeWindowMs));
        }

diff --git a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java b/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java
index a847f5f..104d7de 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java
@@ -143,7 +143,7 @@ public class BaseTransactionDbImpl<K extends DMaaPTransactionObj> implements DMa
         * @throws ConfigDbException
         */
        public synchronized Set<String> loadAllTransactionObjs() throws ConfigDbException {
-               final TreeSet<String> result = new TreeSet<String>();
+               final TreeSet<String> result = new TreeSet<>();
                for (ConfigPath cp : fDb.loadChildrenNames(fBasePath)) {
                        result.add(cp.getName());
                }

diff --git a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java b/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java
index c8bb073..b624a39 100644 (file)
--- a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java
@@ -76,7 +76,7 @@ public class UIServiceImpl implements UIService {
                LOGGER.info("Fetching list of all api keys and returning in a templated form for display.");
                Map<String, NsaSimpleApiKey> keyMap = getApiKeyDb(dmaapContext).loadAllKeyRecords();
 
-               LinkedList<JSONObject> keyList = new LinkedList<JSONObject>();
+               LinkedList<JSONObject> keyList = new LinkedList<>();
 
                JSONObject jsonList = new JSONObject();