From c3391bef9e04c2ad38ed96bd28a5c43ab6d961de Mon Sep 17 00:00:00 2001 From: SravanKumarGunda Date: Thu, 18 Jun 2020 19:05:44 +0530 Subject: Code Improvements-Sonar Issue Fixes Signed-off-by: SravanKumarGunda Issue-ID: CLI-270 Change-Id: Iba00ddc8c471bc5990d87ba3729af373e2bd6711 --- .../cli/fw/http/conf/OnapCommandHttpConstants.java | 2 +- .../onap/cli/fw/http/connect/OnapHttpConnection.java | 3 +-- .../fw/http/error/OnapCommandFailedMocoGenerate.java | 1 - .../fw/http/schema/OnapCommandSchemaHttpLoader.java | 4 ++-- .../onap/cli/fw/http/utils/OnapCommandHttpUtils.java | 4 ++-- .../onap/cli/fw/http/utils/OnapCommandUtilsTest.java | 20 ++++++++++++++++++++ 6 files changed, 26 insertions(+), 8 deletions(-) (limited to 'profiles/http') diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java index 6a87ed13..7ab7928d 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java @@ -94,7 +94,7 @@ public class OnapCommandHttpConstants { //context param public static final String CONTEXT = "context"; public static final String CONTEXT_REMOVE_EMPTY_JSON_NODES = "remove_empty_node"; - public static final String __BODY__ = "__body__"; + public static final String __BODY__ = "__body__"; //NOSONAR // moco server const public static final String VERIFY_MOCO_HOST = "cli.verify.host"; diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java index 3533e92d..732e6c0a 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java @@ -365,11 +365,10 @@ public class OnapHttpConnection { } else { String fileTag = (!input.getMultipartEntityName().isEmpty()) ? input.getMultipartEntityName() : "file"; File file = new File(input.getBody().trim()); - HttpEntity multipartEntity = MultipartEntityBuilder + return MultipartEntityBuilder .create() .addBinaryBody(fileTag, file, ContentType.create("application/octet-stream"), file.getName()) .build(); - return multipartEntity; } } diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/error/OnapCommandFailedMocoGenerate.java b/profiles/http/src/main/java/org/onap/cli/fw/http/error/OnapCommandFailedMocoGenerate.java index 9d6274ac..45da6f69 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/error/OnapCommandFailedMocoGenerate.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/error/OnapCommandFailedMocoGenerate.java @@ -16,7 +16,6 @@ package org.onap.cli.fw.http.error; -import org.onap.cli.fw.error.OnapCommandException; import org.onap.cli.fw.error.OnapCommandWarning; /** diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java index 33f58060..d064547e 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java @@ -138,8 +138,8 @@ public class OnapCommandSchemaHttpLoader { for (Object part: multiparts ) { HttpInput.Part partO = new HttpInput.Part(); Map partMap = (Map) part; - partO.setName((String) partMap.get("name")); - partO.setContent((String)partMap.get("content")); + partO.setName(partMap.get("name")); + partO.setContent(partMap.get("content")); if (partMap.get("type") != null && ((String)partMap.get("type")).equalsIgnoreCase("file")) { partO.setBinary(true); } diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java index fcd25c24..ec2f572a 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java @@ -93,7 +93,7 @@ public class OnapCommandHttpUtils { values.put(param.getKey(), param.getValue().getValue().toString()); } - if (input.getMultiparts().size() > 0) { + if (!input.getMultiparts().isEmpty()) { for (HttpInput.Part part: input.getMultiparts()) { part.setContent(OnapCommandUtils.replaceLineForSpecialValues(part.getContent(), values)); part.setContent(OnapCommandUtils.replaceLineFromInputParameters(part.getContent(), params)); @@ -190,7 +190,7 @@ public class OnapCommandHttpUtils { headerProcessedLine.append(line.substring(currentIdx)); break; } - int idxE = line.indexOf("}", idxS); + int idxE = line.indexOf('}', idxS); String headerName = line.substring(idxS + 3, idxE); headerName = headerName.trim(); if (!resultHttp.getRespHeaders().containsKey(headerName)) { diff --git a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java index 37fc8461..6807321e 100644 --- a/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java +++ b/profiles/http/src/test/java/org/onap/cli/fw/http/utils/OnapCommandUtilsTest.java @@ -53,6 +53,8 @@ import java.util.List; import org.onap.cli.fw.error.OnapCommandResultMapProcessingFailed; import org.onap.cli.fw.error.OnapCommandResultEmpty; import static org.junit.Assert.assertFalse; +import org.onap.cli.fw.http.connect.HttpInput; +import org.onap.cli.fw.http.connect.HttpInput.Part; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class OnapCommandUtilsTest { @@ -205,4 +207,22 @@ public class OnapCommandUtilsTest { + "[\"3a2fb75b52a54e9c8093e7c154210f9e\"]}]}}}"; assertEquals(result, OnapCommandHttpUtils.normalizeJson(sample)); } + + @Test + public void testPopulateParameters() throws OnapCommandException { + List multiparts = new ArrayList (); + Part part = new Part(); + part.setContent("content"); + multiparts.add(part); + Map params = new HashMap (); + OnapCommandParameter onapCommandParameter = new OnapCommandParameter(); + onapCommandParameter.setName("CMD"); + onapCommandParameter.setRawDefaultValue("value"); + params.put("key", onapCommandParameter); + HttpInput httpInput = new HttpInput(); + httpInput.setMultiparts(multiparts); + HttpInput input = OnapCommandHttpUtils.populateParameters(params, httpInput); + assertTrue(input != null); + } + } -- cgit 1.2.3-korg