Merge "removed block of commented-out lines of code"

diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
index ca4c603..3b6e785 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandArtifactStore.java
@@ -233,12 +233,7 @@ public class OnapCommandArtifactStore {
 
         final String SP = searchPattern; //NOSONAR
 
-        for (File file: new File(getBasePath()).listFiles(/*new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-                return name.matches(SP);
-            }
-        }*/)) {
+        for (File file: new File(getBasePath()).listFiles()) {
             try (JsonReader jsonReader = new JsonReader(new FileReader(file))){
                 artifacts.add(gson.fromJson(jsonReader, Artifact.class));
             } catch (Exception e) { // NOSONAR

diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
index 5cbdf86..7365447 100644 (file)
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandProfileStore.java
@@ -73,7 +73,6 @@ public class OnapCommandProfileStore {
             single = new OnapCommandProfileStore();
         }
 
-        //single.load();
         return single;
     }
 
@@ -190,8 +189,6 @@ public class OnapCommandProfileStore {
                 OnapCommandParamEntity[] list = gson.fromJson(jsonReader,
                         OnapCommandParamEntity[].class);
                 params.addAll(Arrays.asList(list));
-//            } else {
-//                throw new OnapCommandProfileNotFound(profileName);
             } catch (Exception e) { // NOSONAR
                 throw new OnapCommandProfileLoadFailed(e);
             }

diff --git a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
index 13d2f97..e3a81e5 100644 (file)
--- a/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
+++ b/grpc/grpc-client/src/main/java/org/open/infc/grpc/client/OpenInterfaceGrpcClient.java
@@ -88,7 +88,6 @@ public class OpenInterfaceGrpcClient {
             result = blockingStub.withDeadlineAfter(timeout, TimeUnit.MILLISECONDS).invoke(input);
         } catch (StatusRuntimeException e) {
           logger.warn("RPC failed: {}", e.getStatus());
-          //Status{code=DEADLINE_EXCEEDED}
           throw new OpenInterfaceGrpcTimeoutExecption(e.getMessage());
         }
         logger.info("Output: {}", result);
@@ -103,7 +102,6 @@ public class OpenInterfaceGrpcClient {
             result = blockingStub.withDeadlineAfter(timeout, TimeUnit.MILLISECONDS).remoteCli(args);
         } catch (StatusRuntimeException e) {
           logger.warn("RPC failed: {}", e.getStatus());
-          //Status{code=DEADLINE_EXCEEDED}
           throw new OpenInterfaceGrpcTimeoutExecption(e.getMessage());
         }
 

diff --git a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
index 3bbdcf6..95ffb9f 100644 (file)
--- a/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
+++ b/profiles/command/src/main/java/org/onap/cli/fw/cmd/cmd/OpenCommandShellCmd.java
@@ -256,7 +256,7 @@ public class OpenCommandShellCmd extends OnapCommand {
                 outputValue = pr.getError();
 
         } else {
-            //remove ${tmp: and closing }
+            //remove $(tmp: and closing )
             String tmpName = this.output.substring(7, this.output.length()-1);
             String tmpFile = tmpFiles.get("tmp:" + tmpName);
             if (tmpFile != null) {

diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
index e17f861..b4654cc 100644 (file)
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/cmd/OnapHttpCommand.java
@@ -254,7 +254,6 @@ public class OnapHttpCommand extends OnapCommand {
         }
 
         Map<String, List<String>> results = OnapCommandHttpUtils.populateOutputs(this.getResultMap(), output);
-        //results = OnapCommandUtils.populateOutputsFromInputParameters(results, this.getParametersMap());
 
         for (OnapCommandResultAttribute attr : this.getResult().getRecords()) {
             attr.setValues(results.get(attr.getName()));