1 files changed, 8 insertions, 9 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
index 9e230ff3..b0ebbda5 100644
--- a/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
+++ b/framework/src/main/java/org/onap/cli/fw/store/OnapCommandExecutionStore.java
@@ -59,17 +59,17 @@ public class OnapCommandExecutionStore {
     private static String SEPARATOR = "__";
 
     private enum SearchMode {
-        find,
-        file //for developer mode
+        FIND,
+        FILE //for developer mode
 
 
     }
 
-    private static SearchMode SEARCH_MODE = SearchMode.file;
+    private static SearchMode SEARCH_MODE = SearchMode.FILE;
     static {
         String mode = OnapCommandConfig.getPropertyValue(OnapCommandConstants.OPEN_CLI_EXECUTION_SEARCH_MODE);
-        if (mode.equalsIgnoreCase(SearchMode.find.name()))
-            SEARCH_MODE = SearchMode.find;
+        if (mode.equalsIgnoreCase(SearchMode.FIND.name()))
+            SEARCH_MODE = SearchMode.FIND;
     }
 
     public static class ExecutionStoreContext {
@@ -334,7 +334,7 @@ public class OnapCommandExecutionStore {
 
         try {
             List <String> dirs = new ArrayList<>();
-            if (System.getProperty("os.name").toLowerCase().startsWith("windows") || SEARCH_MODE.equals(SearchMode.file)) {
+            if (System.getProperty("os.name").toLowerCase().startsWith("windows") || SEARCH_MODE.equals(SearchMode.FILE)) {
                 for (File f: new File(getBasePath()).listFiles()) {
                     if(search.containsKey(EXECUTIONID)) {
                         if (f.getName().startsWith(search.get(EXECUTIONID)))
@@ -379,7 +379,7 @@ public class OnapCommandExecutionStore {
                     searchString.append("*");
                 }
 
-                for (String term: Arrays.asList(new String []{"product", "service", "command", "profile"})) {
+                for (String term: Arrays.asList("product", "service", "command", "profile")) {
                     searchString.append("__");
                     if (search.get(term) != null && !search.get(term).isEmpty()) {
                         searchString.append(search.get(term));
@@ -453,8 +453,7 @@ public class OnapCommandExecutionStore {
 
             @Override
             public boolean accept(File dir, String name) {
-                if (name.startsWith(executionId)) return true;
-                return false;
+                return name.startsWith(executionId);
             }
         });