diff options
author | 2018-08-28 13:01:00 +0000 | |
---|---|---|
committer | 2018-08-28 13:01:00 +0000 | |
commit | fb72fac2fb0fab47ac83238b81336c238205bc45 (patch) | |
tree | 8a4e8f578be2341e574366463639492adf21849d | |
parent | b016813490eaa86c18e326b8494e2422e21150da (diff) | |
parent | cfa1698d38b15b276c647ebb6e1e6da999d92e9c (diff) |
Merge changes I64225953,If4fc0644
* changes:
Sonar Major issues
Sonar Major issues
-rw-r--r-- | src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java | 10 | ||||
-rw-r--r-- | src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java | 4 |
2 files changed, 7 insertions, 7 deletions
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 08b2fd1..ebdf3ed 100644 --- 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 @@ -31,7 +31,7 @@ import org.json.JSONArray; import org.json.JSONException; import com.att.dmf.mr.constants.CambriaConstants; -//import org.slf4j.Logger; + //import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -52,12 +52,12 @@ public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metr public CambriaBaseClient ( Collection<String> hosts, String clientSignature ) throws MalformedURLException { - /*super ( hosts, CambriaConstants.kStdCambriaServicePort, clientSignature, - CacheUse.NONE, 1, 1, TimeUnit.MILLISECONDS );*/ + + super(ConnectionType.HTTP, hosts, CambriaConstants.kStdCambriaServicePort, clientSignature, CacheUse.NONE, 1, 1L, TimeUnit.MILLISECONDS, 32, 32, 600000); - //fLog = LoggerFactory.getLogger ( this.getClass().getName () ); + fLog = EELFManager.getInstance().getLogger(this.getClass().getName()); //( this.getClass().getName () ); } @@ -85,7 +85,7 @@ public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metr { fLog = log; - //replaceLogger ( log ); + } public EELFLogger getLog () diff --git a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java b/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java index e9f28ae..64dbc14 100644 --- a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java +++ b/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest; import com.att.dmf.mr.beans.DMaaPContext; import com.att.dmf.mr.security.DMaaPAuthenticator; -//import com.att.nsa.security.db.NsaApiDb; + import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.security.NsaApiKey; @@ -65,7 +65,7 @@ public class DMaaPMechIdAuthenticator <K extends NsaApiKey> implements DMaaPAuth log.info ( "AUTH-LOG(" + remoteAddr + "): " + msg ); } -// private final NsaApiDb<K> fDb; + //private static final Logger log = Logger.getLogger( MechIdAuthenticator.class.toString()); private static final EELFLogger log = EELFManager.getInstance().getLogger(MechIdAuthenticator.class); /** |