summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-09-20Sonar major issuesSumapriya Sarvepalli1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WkDwGn37JfbyHyR&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java Line No:L35 Change-Id: I023bfce21fcbb388ff063304b077150c18bc89ea Issue-ID: DMAAP-807 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-20Sonar major issuesSumapriya Sarvepalli1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vad-32hFUzlqc5qp&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/constants/CambriaConstants.java Line No:L78 Change-Id: I097e444124d6139ca772a46ed1144c94abd31f5c Issue-ID: DMAAP-806 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-20Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41Wi2wGn37JfbyHxW&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java Line No-L379 L407 L489 Change-Id: I61fe5ce8021366e497b52e887ff2822d137350a2 Issue-ID: DMAAP-805 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-20Sonar Major issuesSurendra Reddy Katam1-16/+16
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtb&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L482 L493 Change-Id: I897586855c5f6937fc27dadd4639a7bfd7e62629 Issue-ID: DMAAP-803 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-20Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtd&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L537 L541 L551 Change-Id: I6b215d2ace1626b2cb6f22347ff831f51f047e89 Issue-ID: DMAAP-802 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-19Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtV&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L341 L356 L359 Change-Id: Ic7d570d6f9b5ad32608922123f642fe97a150a18 Issue-ID: DMAAP-798 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-19Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtS&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L266 L285 L302 Change-Id: I65961cf0ef580c62663c718f92af406f4490b6bf Issue-ID: DMAAP-797 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-19Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtO&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L174 L200 L247 Change-Id: Ia09070d3dde66fe6a506dc0b25c36fffad0e2fcd Issue-ID: DMAAP-796 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-19Sonar major issuesSumapriya Sarvepalli1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VagX32hFUzlqc5sK&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java Line No:L62 Change-Id: I33953e34ddaea2e6123326202d80510ba3b5528e Issue-ID: DMAAP-795 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-19Sonar major issuesSumapriya Sarvepalli1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vamc32hFUzlqc50h&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java Line No:L49 Change-Id: Ia1d26b43e154e51a64ee0d8fc6fe2c88dc733a04 Issue-ID: DMAAP-794 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-19Sonar major issuesSumapriya Sarvepalli1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vamo32hFUzlqc51F&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/Emailer.java Line No:L111 Change-Id: Iffff1c7660a84a8c1d4f7353116c789cf6f81e69 Issue-ID: DMAAP-793 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-18Merge "Sonar Major issues"1.1.9Ram Koya1-3/+3
2018-09-18Sonar Major issuesSurendra Reddy Katam1-4/+4
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgPwGn37JfbyHtK&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java Line No-L48 L91 L100 L107 Change-Id: Ic73990ff2a9a85fee7c15b21694a42b9aece2d31 Issue-ID: DMAAP-788 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-18Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWWpi8_ixOv3LmQdD2Ei&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java Line No-L621 L658 L669 Change-Id: I67b3b03080781186e18580a240be63bd04542edd Issue-ID: DMAAP-787 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-18Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vakk32hFUzlqc5xz&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java Line No:L117 L141 L147 Change-Id: I219aec5a04bb7196ba03d6c62a890aa57fedc23f Issue-ID: DMAAP-786 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-17Merge changes Iadb3f456,Id963a5fd,Ib053c8e7Ram Koya3-6/+6
* changes: Sonar Major issues Sonar Major issues Sonar Major issues
2018-09-17Changes for Kafka AAF integrationsunil unnava4-7/+15
Issue-ID: DMAAP-772 Change-Id: I60e07746c48967500f744f3fe9632d55197277bb Signed-off-by: sunil unnava <sunil.unnava@att.com>
2018-09-17Sonar Major issuesSurendra Reddy Katam1-4/+4
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWXX4Dp7ligbnTmNIX6R&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java Line No-L350 L355 L505 L515 Change-Id: Iadb3f456fa170c2430704f752eb6b741e2c8e56e Issue-ID: DMAAP-782 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-17Sonar Major issuesSurendra Reddy Katam1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VaiY32hFUzlqc5u4&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java Line No-47 Change-Id: Id963a5fd2a8e0c75effa58e4aebfaadd916e52bf Issue-ID: DMAAP-781 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-17Sonar Major issuesSurendra Reddy Katam1-1/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VaeT32hFUzlqc5rM&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java Line No-49 Change-Id: Ib053c8e75175b7aa62d5ae48ff93852c8749d107 Issue-ID: DMAAP-780 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-14Sonar major issuesSumapriya Sarvepalli1-5/+4
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vamo32hFUzlqc51B&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/Emailer.java Line No:L40 L62 L86 L88 Change-Id: I29269a76d71fe31ba4b48f569ecee3f80eb41bee Issue-ID: DMAAP-776 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-13AAF integration modificationssunil unnava3-52/+42
Issue-ID: DMAAP-772 Change-Id: I84091dc61d6826a206b194b22b75ad5a71b2fc39 Signed-off-by: sunil unnava <sunil.unnava@att.com>
2018-09-12Bumped the pom version3.0.1-ONAP3.0.0-ONAP1.1.8sunil unnava2-2/+2
Issue-ID: DMAAP-772 Change-Id: If76040858d6c15d61f1d4fe965b0f1659959b225 Signed-off-by: sunil unnava <sunil.unnava@att.com>
2018-09-12update the topic name patternsunil unnava1-3/+3
Issue-ID: DMAAP-772 Change-Id: I485c54ce6375ea0ab1f069f130351c5a3ef05615 Signed-off-by: sunil unnava <sunil.unnava@att.com>
2018-09-11Merge "Removing commented line"Ram Koya1-2/+1
2018-09-11Merge "Removing wildcard usage"Ram Koya1-1/+1
2018-09-11Sonar Major issuesSurendra Reddy Katam1-2/+2
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-ValE32hFUzlqc5zY&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java Line No- L55 L80 Change-Id: Ic36f843140d320b7e082652c63fdeef7eb553af8 Issue-ID: DMAAP-767 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-11Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java Line No- L140 L144 L151 Change-Id: Ib3e5f8c610c9d66b24fc4cb09cac085c9c1939d5 Issue-ID: DMAAP-765 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-11Sonar Major issuesSurendra Reddy Katam1-36/+36
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vamy32hFUzlqc51Y&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/PropertyReader.java Line No- L42 L44 L53 L86 Change-Id: Ic1a7aea8b53efa8bfddd0195fa710b1af43c49d2 Issue-ID: DMAAP-724 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-10Merge changes I36a6c4ee,Id16898c8,Id5d8bc10,Ie1b5bfe9,I013247ca, ...Ram Koya6-71/+15
* changes: Sonar major issues Sonar major issues Sonar major issues Sonar major issues Sonar major issues Sonar major issues
2018-09-10Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java Line No- L276 L619 L630 Change-Id: I697b1e3503fc1fe80e501ace74782c272faefc10 Issue-ID: DMAAP-763 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-39/+1
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WhfwGn37JfbyHvc&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java Line No:L172 L310 Change-Id: I36a6c4eed0eede46b8198a4d1f988a53f1737184 Issue-ID: DMAAP-762 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-10Sonar Major issuesSurendra Reddy Katam1-3/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java Line No- L514 L524 L579 Change-Id: Ic54488da6e4114e8942e13dfb257e806faeca886 Issue-ID: DMAAP-761 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-10Sonar Major issuesSurendra Reddy Katam1-19/+19
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=surendraReddy&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java Line No- L219 L238 Change-Id: I8101e70e522991ea66dcc0ce142287ee5a5644e8 Issue-ID: DMAAP-759 Signed-off-by: Surendra Reddy Katam <SK00524980@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-2/+2
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WilwGn37JfbyHvv&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java Line No:L30 L53 Change-Id: Id16898c8300929a25c6bc2cc6fddc7e06982d422 Issue-ID: DMAAP-760 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-5/+5
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VamI32hFUzlqc5z3&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java Line No:L58 L73 L81 L93 L132 Change-Id: Id5d8bc10162e7e6dab6f8dacfb4f8dc34fb702a5 Issue-ID: DMAAP-757 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-8/+3
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AWU41WgpwGn37JfbyHt0&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java Line No:L49 L60 L73 Change-Id: Ie1b5bfe9d8741140757355fa92525dd92d677d75 Issue-ID: DMAAP-756 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-5/+2
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vahb32hFUzlqc5t-&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java Line No:L84 L128 Change-Id: I013247ca962a79490cc458a6cac6427612de54f3 Issue-ID: DMAAP-755 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-10Sonar major issuesSumapriya Sarvepalli1-12/+2
This block of commented-out lines of code should be removed Sonar Link: https://sonar.onap.org/project/issues?assignees=sumapriya&id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-VagH32hFUzlqc5r8&resolved=false&severities=MAJOR Location: src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java Line No:L392 L412 Change-Id: Ifa4f01adbcb59f31d3a332b8137fb56b3faa551f Issue-ID: DMAAP-754 Signed-off-by: Sumapriya Sarvepalli <ss00493505@techmahindra.com>
2018-09-07Merge "MemoryMetaBroker.java: Fixed sonar issues"Ram Koya1-14/+17
2018-09-07MemoryMetaBroker.java: Fixed sonar issuesArundathi Patil1-14/+17
Sonar Link : https://sonar.onap.org/project/issues?id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&open=AV4-Vabv32hFUzlqc5oG&resolved=false&types=CODE_SMELL Issue-ID: DMAAP-752 Change-Id: I54df6fc0fc73252bba1e3a2a453138d79e23adff Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-07Merge "KafkaLiveLockAvoider2.java: fixed sonar issues"Ram Koya1-3/+1
2018-09-07DMaapCambriaLimiter.java: Fixed sonar issuesArundathi Patil1-37/+34
Sonar Link : https://sonar.onap.org/code?id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&selected=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr%3Asrc%2Fmain%2Fjava%2Fcom%2Fatt%2Fdmf%2Fmr%2Fbeans%2FDMaaPCambriaLimiter.java Issue-ID: DMAAP-753 Change-Id: I291ebff9b717ef8fe64bc129eeb17948dbfccd70 Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-07KafkaLiveLockAvoider2.java: fixed sonar issuesArundathi Patil1-3/+1
Sonar Link : https://sonar.onap.org/code?id=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr&selected=org.onap.dmaap.messagerouter.msgrtr%3Amsgrtr%3Asrc%2Fmain%2Fjava%2Fcom%2Fatt%2Fdmf%2Fmr%2Fbackends%2Fkafka%2FKafkaLiveLockAvoider2.java Issue-ID: DMAAP-751 Change-Id: I7151abc740771e7750c91e5666fc661e4a9aa68a Signed-off-by: Arundathi Patil <arundpil@in.ibm.com>
2018-09-07Merge "Fix NPE issue in msgrt"Ram Koya2-23/+18
2018-09-07Merge "CambriaApiException.java: Fixed sonar issues"Ram Koya1-5/+5
2018-09-07Merge "Fixed blocker issue in DMaaPResponseBuilder.java"Ram Koya1-4/+4
2018-09-07Merge "Sonar Major issues"Ram Koya1-7/+7
2018-09-07Merge "Sonar Major issues"Ram Koya1-1/+1
2018-09-07Merge "Sonar Major issues"Ram Koya1-1/+1