From d85e766c5538de762820132ac723d928f5a9bf89 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 21 Sep 2018 09:31:25 -0400 Subject: new sonar issues in drools-applications Don't return null lists from AAI. Transient TargetLock. Extract aai.url, et. al., constants. Don't allocate extra unneeded variable. Re-order fields in xacml attributes. Extract "vserver" constant from simulator. Replace thread sleep with join. Change-Id: Iee1bd182862632af1f131cca5db5b526f5865b9f Issue-ID: POLICY-1129 Signed-off-by: Jim Hahn --- .../main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'controlloop/common/simulators/src/main/java/org') diff --git a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java index f5a4f6e53..3dd8347f2 100644 --- a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java +++ b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java @@ -42,6 +42,8 @@ import org.onap.policy.aai.util.Serialization; @Path("/aai") public class AaiSimulatorJaxRs { + private static final String VSERVER = "vserver"; + /** * A&AI get query. * @@ -72,12 +74,12 @@ public class AaiSimulatorJaxRs { public String aaiPostQuery(final String req) throws IOException { final AaiNqRequest request = Serialization.gsonPretty.fromJson(req, AaiNqRequest.class); - if (request.getInstanceFilters().getInstanceFilter().get(0).containsKey("vserver")) { + if (request.getInstanceFilters().getInstanceFilter().get(0).containsKey(VSERVER)) { final String vserverName = - request.getInstanceFilters().getInstanceFilter().get(0).get("vserver").get("vserver-name"); + request.getInstanceFilters().getInstanceFilter().get(0).get(VSERVER).get("vserver-name"); if ("error".equals(vserverName)) { Map params = new TreeMap<>(); - params.put("type", "vserver"); + params.put("type", VSERVER); return load("aai/AaiNqResponse-Error.json", params); } else { // vll format - new -- cgit 1.2.3-korg