Merge changes Ic7d570d6,I65961cf0,Ia09070d3

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

diff --combined src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
index 86a6ef8,fd786b7..9ef2139
--- 1/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
--- 2/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
+++ b/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java
@@@ -171,7 -171,7 +171,7 @@@ public class CambriaOutboundEventStrea
                }
  
                // public Builder atOffset ( int pos )
-               // {
+               
                // fOffset = pos;
                // return this;
                // }
@@@ -197,7 -197,7 +197,7 @@@
                fConsumer = builder.fConsumer;
                fLimit = builder.fLimit;
                fTimeoutMs = builder.fTimeoutMs;
-               // fSettings = builder.fSettings;
+               
                fSent = 0;
                fPretty = builder.fPretty;
                fWithMeta = builder.fWithMeta;
@@@ -244,7 -244,7 +244,7 @@@
                 * @param msg
                 * @throws IOException
                 */
-               // void onMessage(int count, Message msg) throws IOException;
+               
                void onMessage(int count, String msg, String transId, long offSet) throws IOException, JSONException;
        }
  
@@@ -263,7 -263,7 +263,7 @@@
         *            throws IOException
         */
        public void write(final OutputStream os) throws IOException {
-               // final boolean transactionEnabled = topic.isTransactionEnabled();
+               
                // final boolean transactionEnabled = isTransEnabled();
                // final boolean transactionEnabled = istransEnable;
                // synchronized(this){
@@@ -282,7 -282,7 +282,7 @@@
                                        entry.put("message", msg);
                                        os.write(entry.toString().getBytes());
                                } else {
-                                       // os.write(message.getBytes());
+                                       
                                                String jsonString = JSONObject.valueToString(msg);
                                        os.write(jsonString.getBytes());
                                }
@@@ -299,7 -299,7 +299,7 @@@
                                        try {
                                                if (istransEnable && istransType) {
                                                        // final String transactionId =
-                                                       // jsonMessage.getString("transactionId");
+                                                       
                                                        // responseTransactionId = transId;
                                                        StringBuilder consumerInfo = new StringBuilder();
                                                        if (null != dmaapContext && null != dmaapContext.getRequest()) {
@@@ -338,7 -338,7 +338,7 @@@
                        }
                });
  
-               // if (null != dmaapContext && isTransactionEnabled()) {
+               
                if (null != dmaapContext && istransEnable && istransType) {
  
                        dmaapContext.getResponse().setHeader("transactionId",
@@@ -353,10 -353,10 +353,10 @@@
                if (null != strclose_out_stream)
                        close_out_stream = Boolean.parseBoolean(strclose_out_stream);
  
-               // if (fSettings.getBoolean("close.output.stream", true)) {
+               
                if (close_out_stream) {
                        os.close();
-                       // }
+                       
                }
        }
  
@@@ -479,10 -479,10 +479,10 @@@
         * 
         * Checks whether filter is initialized
         */
 -      /*private boolean isFilterInitialized() {
 -              return (fHpAlarmFilter != null && fHppe != null);
 -      }
 -*/
 +      
 +              
 +      
 +
        /**
         * 
         * @param msg
@@@ -490,18 -490,18 +490,18 @@@
         */
        private boolean filterMatches(String msg) {
                boolean result = true;
 -              /*if (isFilterInitialized()) {
 -                      try {
 -                              final HpJsonEvent e = new HpJsonEvent("e", new JSONObject(msg));
 -                              result = fHpAlarmFilter.matches(fHppe, e);
 -                      } catch (JSONException x) {
 -                              // the msg may not be JSON
 -                              result = false;
 -                              log.error("Failed due to " + x.getMessage());
 -                      } catch (Exception x) {
 -                              log.error("Error using filter: " + x.getMessage(), x);
 -                      }
 -              }*/
 +              
 +              
 +                              
 +                              
 +                      
 +                      
 +                      
 +                              
 +                      
 +                              
 +              
 +      
  
                return result;
        }
@@@ -534,11 -534,11 +534,11 @@@
        private final Consumer fConsumer;
        private final int fLimit;
        private final int fTimeoutMs;
 -      // private final rrNvReadable fSettings;
 +      
        private final boolean fPretty;
        private final boolean fWithMeta;
        private int fSent;
 -//    private final HpAlarmFilter<HpJsonEvent> fHpAlarmFilter;
 +
        //private final HpProcessingEngine<HpJsonEvent> fHppe;
        private DMaaPContext dmaapContext;
        private String responseTransactionId;
@@@ -548,7 -548,7 +548,7 @@@
        private ArrayList<Consumer> fKafkaConsumerList;
        private boolean istransType = true;
        // private static final Logger log =
 -      // Logger.getLogger(CambriaOutboundEventStream.class);
 +      
  
        private static final EELFLogger log = EELFManager.getInstance().getLogger(CambriaOutboundEventStream.class);
  }