aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/src/main/java/org/onap/cli/fw/cmd/OnapCommand.java1
-rw-r--r--framework/src/main/java/org/onap/cli/fw/cmd/schema/OnapSchemaValidateCommand.java2
-rw-r--r--framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java3
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java7
4 files changed, 3 insertions, 10 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommand.java
index dbd24630..b814ba82 100644
--- a/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommand.java
+++ b/framework/src/main/java/org/onap/cli/fw/cmd/OnapCommand.java
@@ -179,6 +179,7 @@ public abstract class OnapCommand {
try {
return new ObjectMapper().writeValueAsString(args);
} catch (JsonProcessingException e) {
+ log.error("exception occured {}", e.getMessage());
return "{}";
}
}
diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/schema/OnapSchemaValidateCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/schema/OnapSchemaValidateCommand.java
index 71267ec3..f6ace6d5 100644
--- a/framework/src/main/java/org/onap/cli/fw/cmd/schema/OnapSchemaValidateCommand.java
+++ b/framework/src/main/java/org/onap/cli/fw/cmd/schema/OnapSchemaValidateCommand.java
@@ -16,10 +16,8 @@
package org.onap.cli.fw.cmd.schema;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import org.onap.cli.fw.cmd.OnapCommand;
import org.onap.cli.fw.conf.OnapCommandConstants;
import org.onap.cli.fw.error.OnapCommandException;
diff --git a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java
index ca0f04e7..bbe33594 100644
--- a/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java
+++ b/framework/src/main/java/org/onap/cli/fw/output/OnapCommandResult.java
@@ -20,14 +20,11 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.onap.cli.fw.conf.OnapCommandConstants;
import org.onap.cli.fw.error.OnapCommandException;
import org.onap.cli.fw.error.OnapCommandOutputFormatNotsupported;
import org.onap.cli.fw.error.OnapCommandOutputPrintingFailed;
-import org.onap.cli.fw.input.OnapCommandParameterType;
import org.onap.cli.fw.output.print.OnapCommandPrint;
-import org.onap.cli.fw.utils.OnapCommandUtils;
/**
* Oclip Command result holds the final output of the command.
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 aa37e839..a2da0706 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
@@ -27,11 +27,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
-
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -56,7 +54,6 @@ import org.apache.http.conn.ssl.X509HostnameVerifier;
import org.apache.http.cookie.Cookie;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
-import org.apache.http.entity.mime.MultipartEntity;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.HttpClients;
@@ -294,7 +291,7 @@ public class OnapHttpConnection {
HttpRequestBase requestBase = null;
if ("post".equals(input.getMethod())) {
HttpPost httpPost = new HttpPost();
- if (input.isBinaryData() || input.getMultiparts().size() > 0) {
+ if (input.isBinaryData() || !(input.getMultiparts().isEmpty())) {
httpPost.setEntity(getMultipartEntity(input));
} else {
httpPost.setEntity(this.getStringEntity(input));
@@ -367,7 +364,7 @@ public class OnapHttpConnection {
}
private HttpEntity getMultipartEntity(HttpInput input) {
- if (input.getMultiparts().size() > 0) {
+ if (!input.getMultiparts().isEmpty()) {
MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
for (HttpInput.Part part: input.getMultiparts()) {
if (part.isBinary()) {