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/resources/CambriaOutboundEventStream.java b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
index 97d1fa5..aae15fb 100644 (file)
--- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
+++ b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
@@ -105,7 +105,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
                        fPretty = false;
                        fWithMeta = false;
                        
-                       // fOffset = CambriaEvents.kNextOffset;
+       
                }
 
                /**
@@ -172,7 +172,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
 
                // public Builder atOffset ( int pos )
                
-               // fOffset = pos;
+       
                // return this;
                // }
                /**
@@ -264,7 +264,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
         */
        public void write(final OutputStream os) throws IOException {
                
-               // final boolean transactionEnabled = isTransEnabled();
+       
                // final boolean transactionEnabled = istransEnable;
                // synchronized(this){
                os.write('[');
@@ -300,7 +300,7 @@ public class CambriaOutboundEventStream implements StreamWriter {
                                                if (istransEnable && istransType) {
                                                        // final String transactionId =
                                                        
-                                                       // responseTransactionId = transId;
+                                                       
                                                        StringBuilder consumerInfo = new StringBuilder();
                                                        if (null != dmaapContext && null != dmaapContext.getRequest()) {
                                                                final HttpServletRequest request = dmaapContext.getRequest();

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 fdf2d28..ab74e9c 100644 (file)
--- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
+++ b/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java
@@ -164,9 +164,9 @@ public class ConfigurationReader {
                        fMetrics.toJson();
                        fMetrics.setupCambriaSender();
                        // add the admin authenticator
-                               //              final String adminSecret = settings.getString ( CambriaConstants.kSetting_AdminSecret, null );
+                       
                                                final String adminSecret = com.att.ajsc.filemonitor.AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,CambriaConstants.kSetting_AdminSecret);
-                                               //adminSecret = "fe3cCompound";
+                                               
                                                if ( adminSecret != null && adminSecret.length () > 0 )
                                                {
                                                        try