diff options
| author |   Ram Koya <rk541m@att.com> | 2018-09-24 14:24:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-24 14:24:10 +0000 |
| commit | eedd2ba50efbad241e3d5009f97f7d9e761af6e1 (patch) | |
| tree | 41ba42529ebee29adeb6e16b6c58e1dcd8609a14 | |
| parent | 02ee0ce4317679d5592cde255af5089b0959cd37 (diff) | |
| parent | 6b7d17de13af62c22e747ad0f0394f9a5503833b (diff) | |
Merge changes Ic282f482,I10fc7c7d,I00d8d5f7
* changes:
Sonar Major issues
Sonar Major issues
Sonar Major issues
| -rw-r--r-- | src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java | 8 | ||||
| -rw-r--r-- | src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java | 4 |
2 files changed, 6 insertions, 6 deletions
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 --- 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 --- 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 |