Code Improvements-Sonar Issue Fixes

Signed-off-by: SravanKumarGunda <sravan.kumar1@huawei.com>
Issue-ID: CLI-270
Change-Id: Iba00ddc8c471bc5990d87ba3729af373e2bd6711

2 files changed, 5 insertions, 8 deletions

diff --git a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenRemoteCli.java b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenRemoteCli.java
index 724267e8..1875a761 100644
--- a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenRemoteCli.java
+++ b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenRemoteCli.java
@@ -44,8 +44,7 @@ public class OpenRemoteCli {
         OpenInterfaceGrpcClient client = new OpenInterfaceGrpcClient(
                 host, port, timeout);
         try {
-            Result result = client.remoteCli(Args.newBuilder().setRequestId(this.requestId).addAllArgs(args).build());
-            return result;
+            return client.remoteCli(Args.newBuilder().setRequestId(this.requestId).addAllArgs(args).build());
         } finally {
           client.shutdown();
         }
@@ -63,8 +62,7 @@ public class OpenRemoteCli {
             params.put("format", "json");
             Input input = Input.newBuilder().setAction(action).setRequestId(requestId).putAllOptions(options).putAllParams(params).build();
 
-            Output output = client.invoke(input);
-            return output;
+            return client.invoke(input);
         } finally {
           client.shutdown();
         }
@@ -86,8 +84,7 @@ public class OpenRemoteCli {
                   host, port);
 
           try {
-              Result result = client.remoteCli(Args.newBuilder().setRequestId(reqId).addAllArgs(args).build());
-              return result;
+              return client.remoteCli(Args.newBuilder().setRequestId(reqId).addAllArgs(args).build());
           } finally {
             client.shutdown();
           }
@@ -117,8 +114,7 @@ public class OpenRemoteCli {
             params.put("format", "json");
             Input input = Input.newBuilder().setAction(action).setRequestId(reqId).putAllOptions(options).putAllParams(params).build();
 
-            Output output = client.invoke(input);
-            return output;
+            return client.invoke(input);
         } finally {
           client.shutdown();
         }
diff --git a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
index 9f236e5c..6bca7b38 100644
--- a/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
+++ b/grpc/grpc-server/src/main/java/org/open/infc/grpc/server/OpenInterfaceGrpcServer.java
@@ -126,6 +126,7 @@ public class OpenInterfaceGrpcServer {
 
         private String outputs = "";
 
+          @Override
           public void print(String msg) {
               outputs += msg + "\n";
           }