summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorRam Koya <rk541m@att.com>2018-09-10 13:15:46 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-10 13:15:46 +0000
commit4e570d6ff517395035e6d5880a64b7ba6fc16b11 (patch)
treeb0913e74643272178a8f3dc99384d98cacf7d865 /src/main
parentb457fb12230ebf43e350d37e6bed75e85a9d9920 (diff)
parent3ed650dd1999dfcf7a63e42a0feab67c069939e3 (diff)
Merge changes I36a6c4ee,Id16898c8,Id5d8bc10,Ie1b5bfe9,I013247ca, ...
* changes: Sonar major issues Sonar major issues Sonar major issues Sonar major issues Sonar major issues Sonar major issues
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java40
-rw-r--r--src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java14
-rw-r--r--src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java7
-rw-r--r--src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java11
-rw-r--r--src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java4
-rw-r--r--src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java10
6 files changed, 15 insertions, 71 deletions
diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java b/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java
index 8315632..8cbf64f 100644
--- a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java
+++ b/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java
@@ -169,37 +169,7 @@ public class DMaaPCambriaLimiter {
log.info(errRes.toString());
throw new CambriaApiException(errRes);
}
- /*if (fMaxPollsPerMinute <= 0) {
- return;
- }
- final RateInfoCheck ric = getRateInfoCheck(topic, consumerGroup, clientId);
- final double ratevalue = ric.onCall();
- if (ratevalue > fMaxPollsPerMinute) {
- try {
- log.warn(ri.getLabel() + ": " + rate + " empty replies/minute, limit is " + fMaxEmptyPollsPerMinute
- + ".");
- if (fSleepMs1 > fMaxPollsPerMinute) {
- log.warn(ri.getLabel() + ": " + "Slowing response with " + fSleepMs
- + " ms sleep, then responding in error.");
- Thread.sleep(fSleepMs1);
- ric.reset();
- } else {
- log.info(ri.getLabel() + ": " + "No sleep configured, just throwing error.");
- }
- } catch (InterruptedException e) {
- // ignore
- }
-
-
- ErrorResponse errRes = new ErrorResponse(HttpStatusCodes.k429_tooManyRequests,
- DMaaPResponseCode.TOO_MANY_REQUESTS.getResponseCode(),
- "This client is making too many requests "
- + ",decrease the number of requests. ","",Utils.getFormattedDate(new Date()),topic,"","",consumerGroup+"/"+clientId,remoteHost);
-
- log.info(errRes.toString());
- throw new CambriaApiException(errRes);
- }*/
}
@@ -307,15 +277,7 @@ public class DMaaPCambriaLimiter {
}
- /* private RateInfoCheck getRateInfoCheck(String topic, String consumerGroup, String clientId) {
- final String key = makeKey(topic, consumerGroup, clientId);
- RateInfoCheck ri = fRateInfoCheck.get(key);
- if (ri == null) {
- ri = new RateInfoCheck(key, 1);
- fRateInfoCheck.put(key, ri);
- }
- return ri;
- } */
+
diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
index d02438f..9158c96 100644
--- a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
+++ b/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java
@@ -386,12 +386,7 @@ public class DMaaPCambriaClientFactory {
* Your API secret
* @return an identity manager
*/
- /*
- * public static CambriaIdentityManager createIdentityManager (
- * Collection<String> hostSet, String apiKey, String apiSecret ) { final
- * CambriaIdentityManager cim = new CambriaMetaClient ( hostSet );
- * cim.setApiCredentials ( apiKey, apiSecret ); return cim; }
- */
+
/**
* Create a topic manager for working with topics.
@@ -405,12 +400,7 @@ public class DMaaPCambriaClientFactory {
* Your API secret
* @return a topic manager
*/
- /*
- * public static CambriaTopicManager createTopicManager ( Collection<String>
- * hostSet, String apiKey, String apiSecret ) { final CambriaMetaClient tmi
- * = new CambriaMetaClient ( hostSet ); tmi.setApiCredentials ( apiKey,
- * apiSecret ); return tmi; }
- */
+
/**
* Inject a consumer. Used to support unit tests.
diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java b/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java
index 98ddb50..7a67c92 100644
--- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java
+++ b/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java
@@ -81,10 +81,7 @@ public class CambriaJsonStreamReader implements reader {
final int c = fTokens.next();
- /*if (c ==','){
- fCloseCount++;
- System.out.println("fCloseCount=" + fCloseCount +" fCount "+fCount);
- }*/
+
if (fIsList) {
if (c == ']' || (fCount > 0 && c == 10))
return null;
@@ -125,7 +122,7 @@ public class CambriaJsonStreamReader implements reader {
*
* @param o
*/
- //public msg(JSONObject o){}
+
public msg(JSONObject o) {
diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
index b550373..ed0893d 100644
--- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
+++ b/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java
@@ -46,7 +46,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
auth = true;
}
- //System.out.println("role " +role +" user: "+ req.getRemoteUser() +" : auth="+auth);
+
return auth;
}
@@ -57,7 +57,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
String permission = "";
String nameSpace ="";
if(topicName.contains(".") && topicName.contains("com.att")) {
- //String topic = topicName.substring(topicName.lastIndexOf(".")+1);
+
nameSpace = topicName.substring(0,topicName.lastIndexOf("."));
}
else {
@@ -67,12 +67,7 @@ public class DMaaPAAFAuthenticatorImpl implements DMaaPAAFAuthenticator {
if(null==nameSpace)nameSpace="com.att.dmaap.mr.ueb";
- /*ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_FORBIDDEN,
- DMaaPResponseCode.TOPIC_NOT_IN_AAF.getResponseCode(), "Topic does not exist in AAF"
- , null, Utils.getFormattedDate(new Date()), topicName,
- null, null, null, null);
-
- throw new CambriaApiException(errRes);*/
+
}
permission = nameSpace+".mr.topic|:topic."+topicName+"|"+action;
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 33bc2f4..c8bb073 100644
--- a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java
+++ b/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-//import kafka.common.TopicExistsException;
+
import org.apache.kafka.common.errors.TopicExistsException;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -50,7 +50,7 @@ import com.att.nsa.security.db.simple.NsaSimpleApiKey;
@Service
public class UIServiceImpl implements UIService {
- //private static final Logger LOGGER = Logger.getLogger(UIServiceImpl.class);
+
private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(UIServiceImpl.class);
/**
* Returning template of hello page
diff --git a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
index dd1e4eb..e56a2e4 100644
--- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
+++ b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
@@ -55,7 +55,7 @@ import com.att.nsa.drumlin.till.nv.rrNvReadable.invalidSettingValue;
import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;
import com.att.nsa.limits.Blacklist;
import com.att.nsa.security.NsaAuthenticatorService;
-//import com.att.nsa.security.authenticators.OriginalUebAuthenticator;
+
import com.att.nsa.security.db.BaseNsaApiDbImpl;
import com.att.nsa.security.db.NsaApiDb;
import com.att.nsa.security.db.NsaApiDb.KeyExistsException;
@@ -70,7 +70,7 @@ import com.att.nsa.security.db.simple.NsaSimpleApiKeyFactory;
@Component
public class ConfigurationReader {
-// private rrNvReadable settings;
+
private Broker1 fMetaBroker;
private ConsumerFactory fConsumerFactory;
private Publisher fPublisher;
@@ -78,7 +78,7 @@ public class ConfigurationReader {
@Autowired
private DMaaPCambriaLimiter fRateLimiter;
private NsaApiDb<NsaSimpleApiKey> fApiKeyDb;
- /* private DMaaPTransactionObjDB<DMaaPTransactionObj> fTranDb; */
+
private DMaaPAuthenticator<NsaSimpleApiKey> fSecurityManager;
private NsaAuthenticatorService<NsaSimpleApiKey> nsaSecurityManager;
private static CuratorFramework curator;
@@ -90,7 +90,7 @@ public class ConfigurationReader {
private Emailer fEmailer;
private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigurationReader.class);
- //private static final Logger log = Logger.getLogger(ConfigurationReader.class.toString());
+
/**
* constructor to initialize all the values
@@ -129,7 +129,7 @@ public class ConfigurationReader {
@Qualifier("dMaaPAuthenticatorImpl") DMaaPAuthenticator<NsaSimpleApiKey> fSecurityManager
)
throws missingReqdSetting, invalidSettingValue, ServletException, KafkaConsumerCacheException, ConfigDbException {
- //this.settings = settings;
+
this.fMetrics = fMetrics;
this.zk = zk;
this.fConfigDb = fConfigDb;