Fixed string literal comparision issue 87/15487/2
authorshashikanth <shashikanth.vh@huawei.com>
Tue, 26 Sep 2017 11:57:15 +0000 (17:27 +0530)
committerShashikanth VH <shashikanth.vh@huawei.com>
Wed, 27 Sep 2017 05:05:20 +0000 (05:05 +0000)
Fix major sonar issues in so module
https://sonar.onap.org/component_issues?id=org.openecomp.so%3Aso#resolved=false|severities=BLOCKER%2CMAJOR|rules=squid%3AS1132%2Csquid%3AS1143

Move the "GetLayer3ServiceDetailsRequest" string literal on the left side of this string comparison.

Issue-Id: APPC-186
Change-Id: I927555425a3a6294eee56f9c7377abc9f4a9ad05
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
mso-api-handlers/mso-requests-db/src/main/java/org/openecomp/mso/requestsdb/MockRequestsDatabase.java

index c4ded17..e3c7cda 100644 (file)
@@ -60,10 +60,10 @@ public class MockRequestsDatabase {
                InfraActiveRequests returnRecord = null;
                if (record != null) {
                        String requestAction = record.getRequestAction();
-                       if (requestAction == null || !requestAction.equals("GetLayer3ServiceDetailsRequest")) {
+                       if (!"GetLayer3ServiceDetailsRequest".equals(requestAction)) {
                                String status = record.getRequestStatus();
-                               if (status != null && status.equals("COMPLETED")) {
-                                       return returnRecord = record;
+                               if ("COMPLETED".equals(status)) {
+                                       returnRecord = record;
                                }
                        }
                }